/ - Diff - Synnefo - Greek Research and Technology Network's projects

Revision 9c74cc19

         network = util.get_network(net_id, user_id, non_deleted=True)
         ipaddress = None
         if network.public:
             raise api.faults.Forbidden('forbidden')
             fixed_ips = api.utils.get_attribute(port_dict, "fixed_ips",
                                                 required=True)
             fip_address = api.utils.get_attribute(fixed_ips[0], 'ip_address',
                                                   required=True)
             ipaddress = util.get_floating_ip_by_address(user_id, fip_address,
                                                           for_update=True)
             if ipaddress.network.id != network.id:
                 raise api.faults.Conflict("The given ip is not on the \
                                            given network")
         vm = util.get_vm(dev_id, user_id, non_deleted=True, non_suspended=True)
-...
                 sg = util.get_security_group(int(gid))
                 sg_list.append(sg)
         new_port = ports.create(network, vm, security_groups=sg_list)
         new_port = ports.create(network, vm, ipaddress, security_groups=sg_list)
         response = render_port(request, port_to_dict(new_port), status=201)

             response = self.post(PORTS_URL, params=json.dumps(request))
             self.assertEqual(response.status_code, 404)
         def test_create_port(self):
             net = dbmf.NetworkFactory.create()
         def test_create_port_private_net(self):
             net = dbmf.NetworkFactory.create(public=False)
             subnet1 = dbmf.IPv4SubnetFactory.create(network=net)
             subnet2 = dbmf.IPv6SubnetFactory.create(network=net)
             sg1 = dbmf.SecurityGroupFactory.create()
-...
                                  user=net.userid)
             self.assertEqual(response.status_code, 201)
         def test_create_port_public_net_no_ip(self):
             net = dbmf.NetworkFactory.create(public=True)
             vm = dbmf.VirtualMachineFactory.create(userid=net.userid)
             request = {
                 "port": {
                     "name": "port1",
                     "network_id": str(net.id),
                     "device_id": str(vm.id),
+                }
+            }
             response = self.post(PORTS_URL, params=json.dumps(request),
                                  user=net.userid)
             self.assertEqual(response.status_code, 400)
         def test_create_port_public_net_wrong_ip(self):
             net = dbmf.NetworkFactory.create(public=True)
             vm = dbmf.VirtualMachineFactory.create(userid=net.userid)
             request = {
                 "port": {
                     "name": "port1",
                     "network_id": str(net.id),
                     "device_id": str(vm.id),
                     "fixed_ips" : [{"ip_address":"8.8.8.8"}]
+                }
+            }
             response = self.post(PORTS_URL, params=json.dumps(request),
                                  user=net.userid)
             self.assertEqual(response.status_code, 404)
         def test_create_port_public_net_conflict(self):
             net = dbmf.NetworkFactory.create(public=True)
             fip = dbmf.FloatingIPFactory(nic=None, userid=net.userid)
             vm = dbmf.VirtualMachineFactory.create(userid=net.userid)
             request = {
                 "port": {
                     "name": "port1",
                     "network_id": str(net.id),
                     "device_id": str(vm.id),
                     "fixed_ips" : [{"ip_address":fip.address}]
+                }
+            }
             response = self.post(PORTS_URL, params=json.dumps(request),
                                  user=net.userid)
             self.assertEqual(response.status_code, 409)
         def test_create_port_public_net_taken_ip(self):
             net = dbmf.NetworkFactory.create(public=True)
             fip = dbmf.FloatingIPFactory(network=net, userid=net.userid)
             vm = dbmf.VirtualMachineFactory.create(userid=net.userid)
             request = {
                 "port": {
                     "name": "port1",
                     "network_id": str(net.id),
                     "device_id": str(vm.id),
                     "fixed_ips" : [{"ip_address":fip.address}]
+                }
+            }
             response = self.post(PORTS_URL, params=json.dumps(request),
                                  user=net.userid)
             self.assertEqual(response.status_code, 400)
         def test_create_port_public_net(self):
             net = dbmf.NetworkFactory.create(public=True)
             fip = dbmf.FloatingIPFactory(network=net, nic=None, userid=net.userid)
             vm = dbmf.VirtualMachineFactory.create(userid=net.userid)
             request = {
                 "port": {
                     "name": "port1",
                     "network_id": str(net.id),
                     "device_id": str(vm.id),
                     "fixed_ips" : [{"ip_address":fip.address}]
+                }
+            }
             response = self.post(PORTS_URL, params=json.dumps(request),
                                  user=net.userid)
             print response.content
             self.assertEqual(response.status_code, 200)
         def test_add_nic_to_deleted_network(self):
             user = 'userr'
             vm = dbmf.VirtualMachineFactory(name='yo', userid=user,

Also available in: Unified diff