Added uuid for networks and made changes to the Create server API format to accept network as uuid instead of id

3 files changed, 95 insertions, 90 deletions

diff --git a/nova/tests/api/openstack/contrib/test_createserverext.py b/nova/tests/api/openstack/contrib/test_createserverext.py
index 33a1eec50..38415179a 100644
--- a/nova/tests/api/openstack/contrib/test_createserverext.py
+++ b/nova/tests/api/openstack/contrib/test_createserverext.py
@@ -43,6 +43,14 @@ FLAGS.verbose = True
 
 FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
 
+FAKE_NETWORKS = [('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', '10.0.1.12'),
+                 ('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', '10.0.2.12')]
+
+DUPLICATE_NETWORKS = [('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', '10.0.1.12'),
+                      ('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', '10.0.1.12')]
+
+INVALID_NETWORKS = [('invalid', 'invalid-ip-address')]
+
 
 class CreateserverextTest(test.TestCase):
 
@@ -106,8 +114,8 @@ class CreateserverextTest(test.TestCase):
         server['flavorRef'] = 1
         if networks is not None:
             network_list = []
-            for id, fixed_ip in networks:
-                network_list.append({'id': id, 'fixed_ip': fixed_ip})
+            for uuid, fixed_ip in networks:
+                network_list.append({'uuid': uuid, 'fixed_ip': fixed_ip})
             server['networks'] = network_list
         return {'server': server}
 
@@ -148,8 +156,8 @@ class CreateserverextTest(test.TestCase):
             networks = server['networks']
             body_parts.append('<networks>')
             for network in networks:
-                item = (network['id'], network['fixed_ip'])
-                body_parts.append('<network id="%s" fixed_ip="%s"></network>'
+                item = (network['uuid'], network['fixed_ip'])
+                body_parts.append('<network uuid="%s" fixed_ip="%s"></network>'
                                   % item)
             body_parts.append('</networks>')
         body_parts.append('</server>')
@@ -190,55 +198,44 @@ class CreateserverextTest(test.TestCase):
         self.assertEquals(networks, None)
 
     def test_create_instance_with_one_network(self):
-        id = 1
-        fixed_ip = '10.0.1.12'
-        networks = [(id, fixed_ip)]
         request, response, networks = \
-            self._create_instance_with_networks_json(networks)
+            self._create_instance_with_networks_json([FAKE_NETWORKS[0]])
         self.assertEquals(response.status_int, 202)
-        self.assertEquals(networks, [(id, fixed_ip)])
+        self.assertEquals(networks, [FAKE_NETWORKS[0]])
 
     def test_create_instance_with_one_network_xml(self):
-        id = 1
-        fixed_ip = '10.0.1.12'
-        networks = [(id, fixed_ip)]
         request, response, networks = \
-            self._create_instance_with_networks_xml(networks)
+            self._create_instance_with_networks_xml([FAKE_NETWORKS[0]])
         self.assertEquals(response.status_int, 202)
-        self.assertEquals(networks, [(id, fixed_ip)])
+        self.assertEquals(networks, [FAKE_NETWORKS[0]])
 
     def test_create_instance_with_two_networks(self):
-        networks = [(1, '10.0.1.12'), (2, '10.0.2.12')]
         request, response, networks = \
-            self._create_instance_with_networks_json(networks)
+            self._create_instance_with_networks_json(FAKE_NETWORKS)
         self.assertEquals(response.status_int, 202)
-        self.assertEquals(networks, [(1, '10.0.1.12'), (2, '10.0.2.12')])
+        self.assertEquals(networks, FAKE_NETWORKS)
 
     def test_create_instance_with_two_networks_xml(self):
-        networks = [(1, '10.0.1.12'), (2, '10.0.2.12')]
         request, response, networks = \
-            self._create_instance_with_networks_xml(networks)
+            self._create_instance_with_networks_xml(FAKE_NETWORKS)
         self.assertEquals(response.status_int, 202)
-        self.assertEquals(networks, [(1, '10.0.1.12'), (2, '10.0.2.12')])
+        self.assertEquals(networks, FAKE_NETWORKS)
 
     def test_create_instance_with_duplicate_networks(self):
-        networks = [(1, '10.0.1.12'), (1, '10.0.2.12')]
         request, response, networks = \
-            self._create_instance_with_networks_json(networks)
+            self._create_instance_with_networks_json(DUPLICATE_NETWORKS)
         self.assertEquals(response.status_int, 400)
         self.assertEquals(networks, None)
 
     def test_create_instance_with_duplicate_networks_xml(self):
-        networks = [(1, '10.0.1.12'), (1, '10.0.2.12')]
         request, response, networks = \
-            self._create_instance_with_networks_xml(networks)
+            self._create_instance_with_networks_xml(DUPLICATE_NETWORKS)
         self.assertEquals(response.status_int, 400)
         self.assertEquals(networks, None)
 
     def test_create_instance_with_network_no_id(self):
-        networks = [(1, '10.0.1.12')]
-        body_dict = self._create_networks_request_dict(networks)
-        del body_dict['server']['networks'][0]['id']
+        body_dict = self._create_networks_request_dict([FAKE_NETWORKS[0]])
+        del body_dict['server']['networks'][0]['uuid']
         request = self._get_create_request_json(body_dict)
         compute_api, response = \
             self._run_create_instance_with_mock_compute_api(request)
@@ -246,26 +243,24 @@ class CreateserverextTest(test.TestCase):
         self.assertEquals(compute_api.networks, None)
 
     def test_create_instance_with_network_no_id_xml(self):
-        networks = [(1, '10.0.1.12')]
-        body_dict = self._create_networks_request_dict(networks)
+        body_dict = self._create_networks_request_dict([FAKE_NETWORKS[0]])
         request = self._get_create_request_xml(body_dict)
-        request.body = request.body.replace(' id="1"', '')
+        uuid = ' uuid="aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"'
+        request.body = request.body.replace(uuid, '')
         compute_api, response = \
             self._run_create_instance_with_mock_compute_api(request)
         self.assertEquals(response.status_int, 400)
         self.assertEquals(compute_api.networks, None)
 
     def test_create_instance_with_network_invalid_id(self):
-        networks = [('asd123', '10.0.1.12')]
         request, response, networks = \
-            self._create_instance_with_networks_json(networks)
+            self._create_instance_with_networks_json(INVALID_NETWORKS)
         self.assertEquals(response.status_int, 400)
         self.assertEquals(networks, None)
 
     def test_create_instance_with_network_invalid_id_xml(self):
-        networks = [('asd123', '10.0.1.12')]
         request, response, networks = \
-            self._create_instance_with_networks_xml(networks)
+            self._create_instance_with_networks_xml(INVALID_NETWORKS)
         self.assertEquals(response.status_int, 400)
         self.assertEquals(networks, None)
 
@@ -291,21 +286,21 @@ class CreateserverextTest(test.TestCase):
         self.assertEquals(networks, None)
 
     def test_create_instance_with_network_no_fixed_ip(self):
-        networks = [(1, '10.0.1.12')]
-        body_dict = self._create_networks_request_dict(networks)
+        body_dict = self._create_networks_request_dict([FAKE_NETWORKS[0]])
         del body_dict['server']['networks'][0]['fixed_ip']
         request = self._get_create_request_json(body_dict)
         compute_api, response = \
             self._run_create_instance_with_mock_compute_api(request)
         self.assertEquals(response.status_int, 202)
-        self.assertEquals(compute_api.networks, [(1, None)])
+        self.assertEquals(compute_api.networks,
+                          [('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', None)])
 
     def test_create_instance_with_network_no_fixed_ip_xml(self):
-        networks = [(1, '10.0.1.12')]
-        body_dict = self._create_networks_request_dict(networks)
+        body_dict = self._create_networks_request_dict([FAKE_NETWORKS[0]])
         request = self._get_create_request_xml(body_dict)
         request.body = request.body.replace(' fixed_ip="10.0.1.12"', '')
         compute_api, response = \
             self._run_create_instance_with_mock_compute_api(request)
         self.assertEquals(response.status_int, 202)
-        self.assertEquals(compute_api.networks, [(1, None)])
+        self.assertEquals(compute_api.networks,
+                          [('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', None)])
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 08eb1eb3c..4cfe18c40 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -2662,7 +2662,7 @@ class TestServerCreateRequestXMLDeserializerV11(test.TestCase):
 <server xmlns="http://docs.openstack.org/compute/api/v1.1"
  name="new-server-test" imageRef="1" flavorRef="1">
     <networks>
-       <network id="1" fixed_ip="10.0.1.12"/>
+       <network uuid="1" fixed_ip="10.0.1.12"/>
     </networks>
 </server>"""
         request = self.deserializer.deserialize(serial_request, 'create')
@@ -2670,7 +2670,7 @@ class TestServerCreateRequestXMLDeserializerV11(test.TestCase):
                 "name": "new-server-test",
                 "imageRef": "1",
                 "flavorRef": "1",
-                "networks": [{"id": "1", "fixed_ip": "10.0.1.12"}],
+                "networks": [{"uuid": "1", "fixed_ip": "10.0.1.12"}],
                 }}
         self.assertEquals(request['body'], expected)
 
@@ -2679,8 +2679,8 @@ class TestServerCreateRequestXMLDeserializerV11(test.TestCase):
 <server xmlns="http://docs.openstack.org/compute/api/v1.1"
  name="new-server-test" imageRef="1" flavorRef="1">
     <networks>
-       <network id="1" fixed_ip="10.0.1.12"/>
-       <network id="2" fixed_ip="10.0.2.12"/>
+       <network uuid="1" fixed_ip="10.0.1.12"/>
+       <network uuid="2" fixed_ip="10.0.2.12"/>
     </networks>
 </server>"""
         request = self.deserializer.deserialize(serial_request, 'create')
@@ -2688,8 +2688,8 @@ class TestServerCreateRequestXMLDeserializerV11(test.TestCase):
                 "name": "new-server-test",
                 "imageRef": "1",
                 "flavorRef": "1",
-                "networks": [{"id": "1", "fixed_ip": "10.0.1.12"},
-                             {"id": "2", "fixed_ip": "10.0.2.12"}],
+                "networks": [{"uuid": "1", "fixed_ip": "10.0.1.12"},
+                             {"uuid": "2", "fixed_ip": "10.0.2.12"}],
                 }}
         self.assertEquals(request['body'], expected)
 
@@ -2698,10 +2698,10 @@ class TestServerCreateRequestXMLDeserializerV11(test.TestCase):
 <server xmlns="http://docs.openstack.org/compute/api/v1.1"
  name="new-server-test" imageRef="1" flavorRef="1">
     <networks>
-       <network id="1" fixed_ip="10.0.1.12"/>
+       <network uuid="1" fixed_ip="10.0.1.12"/>
     </networks>
     <networks>
-       <network id="2" fixed_ip="10.0.2.12"/>
+       <network uuid="2" fixed_ip="10.0.2.12"/>
     </networks>
 </server>"""
         request = self.deserializer.deserialize(serial_request, 'create')
@@ -2709,7 +2709,7 @@ class TestServerCreateRequestXMLDeserializerV11(test.TestCase):
                 "name": "new-server-test",
                 "imageRef": "1",
                 "flavorRef": "1",
-                "networks": [{"id": "1", "fixed_ip": "10.0.1.12"}],
+                "networks": [{"uuid": "1", "fixed_ip": "10.0.1.12"}],
                 }}
         self.assertEquals(request['body'], expected)
 
@@ -2735,7 +2735,7 @@ class TestServerCreateRequestXMLDeserializerV11(test.TestCase):
 <server xmlns="http://docs.openstack.org/compute/api/v1.1"
  name="new-server-test" imageRef="1" flavorRef="1">
     <networks>
-       <network id="1"/>
+       <network uuid="1"/>
     </networks>
 </server>"""
         request = self.deserializer.deserialize(serial_request, 'create')
@@ -2743,7 +2743,7 @@ class TestServerCreateRequestXMLDeserializerV11(test.TestCase):
                 "name": "new-server-test",
                 "imageRef": "1",
                 "flavorRef": "1",
-                "networks": [{"id": "1"}],
+                "networks": [{"uuid": "1"}],
                 }}
         self.assertEquals(request['body'], expected)
 
@@ -2752,7 +2752,7 @@ class TestServerCreateRequestXMLDeserializerV11(test.TestCase):
     <server xmlns="http://docs.openstack.org/compute/api/v1.1"
      name="new-server-test" imageRef="1" flavorRef="1">
         <networks>
-           <network id="" fixed_ip="10.0.1.12"/>
+           <network uuid="" fixed_ip="10.0.1.12"/>
         </networks>
     </server>"""
         request = self.deserializer.deserialize(serial_request, 'create')
@@ -2760,7 +2760,7 @@ class TestServerCreateRequestXMLDeserializerV11(test.TestCase):
                 "name": "new-server-test",
                 "imageRef": "1",
                 "flavorRef": "1",
-                "networks": [{"id": "", "fixed_ip": "10.0.1.12"}],
+                "networks": [{"uuid": "", "fixed_ip": "10.0.1.12"}],
                 }}
         self.assertEquals(request['body'], expected)
 
@@ -2769,7 +2769,7 @@ class TestServerCreateRequestXMLDeserializerV11(test.TestCase):
     <server xmlns="http://docs.openstack.org/compute/api/v1.1"
      name="new-server-test" imageRef="1" flavorRef="1">
         <networks>
-           <network id="1" fixed_ip=""/>
+           <network uuid="1" fixed_ip=""/>
         </networks>
     </server>"""
         request = self.deserializer.deserialize(serial_request, 'create')
@@ -2777,7 +2777,7 @@ class TestServerCreateRequestXMLDeserializerV11(test.TestCase):
                 "name": "new-server-test",
                 "imageRef": "1",
                 "flavorRef": "1",
-                "networks": [{"id": "1", "fixed_ip": ""}],
+                "networks": [{"uuid": "1", "fixed_ip": ""}],
                 }}
         self.assertEquals(request['body'], expected)
 
@@ -2786,8 +2786,8 @@ class TestServerCreateRequestXMLDeserializerV11(test.TestCase):
     <server xmlns="http://docs.openstack.org/compute/api/v1.1"
      name="new-server-test" imageRef="1" flavorRef="1">
         <networks>
-           <network id="1" fixed_ip="10.0.1.12"/>
-           <network id="1" fixed_ip="10.0.2.12"/>
+           <network uuid="1" fixed_ip="10.0.1.12"/>
+           <network uuid="1" fixed_ip="10.0.2.12"/>
         </networks>
     </server>"""
         request = self.deserializer.deserialize(serial_request, 'create')
@@ -2795,8 +2795,8 @@ class TestServerCreateRequestXMLDeserializerV11(test.TestCase):
                 "name": "new-server-test",
                 "imageRef": "1",
                 "flavorRef": "1",
-                "networks": [{"id": "1", "fixed_ip": "10.0.1.12"},
-                             {"id": "1", "fixed_ip": "10.0.2.12"}],
+                "networks": [{"uuid": "1", "fixed_ip": "10.0.1.12"},
+                             {"uuid": "1", "fixed_ip": "10.0.2.12"}],
                 }}
         self.assertEquals(request['body'], expected)
 
diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
index f5ab5ae5a..1f01695a8 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/test_network.py
@@ -41,6 +41,7 @@ class FakeModel(dict):
 
 
 networks = [{'id': 0,
+             'uuid': "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
              'label': 'test0',
              'injected': False,
              'multi_host': False,
@@ -60,6 +61,7 @@ networks = [{'id': 0,
              'project_id': 'fake_project',
              'vpn_public_address': '192.168.0.2'},
             {'id': 1,
+             'uuid': "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb",
              'label': 'test1',
              'injected': False,
              'multi_host': False,
@@ -179,15 +181,18 @@ class FlatNetworkTestCase(test.TestCase):
             self.assertDictListMatch(nw[1]['ips'], check)
 
     def test_validate_networks(self):
-        self.mox.StubOutWithMock(db, 'network_get_networks_by_ids')
-        self.mox.StubOutWithMock(db, "fixed_ip_validate_by_network_address")
+        self.mox.StubOutWithMock(db, 'network_get_networks_by_uuids')
+        self.mox.StubOutWithMock(db, "fixed_ip_get_by_address")
 
-        requested_networks = [(1, "192.168.0.100")]
-        db.network_get_networks_by_ids(mox.IgnoreArg(),
+        requested_networks = [("bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb",
+                               "192.168.1.100")]
+        db.network_get_networks_by_uuids(mox.IgnoreArg(),
                                     mox.IgnoreArg()).AndReturn(networks)
-        db.fixed_ip_validate_by_network_address(mox.IgnoreArg(),
-                                    mox.IgnoreArg(),
-                                    mox.IgnoreArg()).AndReturn(fixed_ips[0])
+
+        fixed_ips[1]['network'] = FakeModel(**networks[1])
+        fixed_ips[1]['instance'] = None
+        db.fixed_ip_get_by_address(mox.IgnoreArg(),
+                                    mox.IgnoreArg()).AndReturn(fixed_ips[1])
 
         self.mox.ReplayAll()
         self.network.validate_networks(None, requested_networks)
@@ -202,9 +207,9 @@ class FlatNetworkTestCase(test.TestCase):
         self.network.validate_networks(None, requested_networks)
 
     def test_validate_networks_invalid_fixed_ip(self):
-        self.mox.StubOutWithMock(db, 'network_get_networks_by_ids')
+        self.mox.StubOutWithMock(db, 'network_get_networks_by_uuids')
         requested_networks = [(1, "192.168.0.100.1")]
-        db.network_get_networks_by_ids(mox.IgnoreArg(),
+        db.network_get_networks_by_uuids(mox.IgnoreArg(),
                                     mox.IgnoreArg()).AndReturn(networks)
         self.mox.ReplayAll()
 
@@ -213,10 +218,10 @@ class FlatNetworkTestCase(test.TestCase):
                           requested_networks)
 
     def test_validate_networks_empty_fixed_ip(self):
-        self.mox.StubOutWithMock(db, 'network_get_networks_by_ids')
+        self.mox.StubOutWithMock(db, 'network_get_networks_by_uuids')
 
         requested_networks = [(1, "")]
-        db.network_get_networks_by_ids(mox.IgnoreArg(),
+        db.network_get_networks_by_uuids(mox.IgnoreArg(),
                                     mox.IgnoreArg()).AndReturn(networks)
         self.mox.ReplayAll()
 
@@ -225,10 +230,10 @@ class FlatNetworkTestCase(test.TestCase):
                           None, requested_networks)
 
     def test_validate_networks_none_fixed_ip(self):
-        self.mox.StubOutWithMock(db, 'network_get_networks_by_ids')
+        self.mox.StubOutWithMock(db, 'network_get_networks_by_uuids')
 
         requested_networks = [(1, None)]
-        db.network_get_networks_by_ids(mox.IgnoreArg(),
+        db.network_get_networks_by_uuids(mox.IgnoreArg(),
                                     mox.IgnoreArg()).AndReturn(networks)
         self.mox.ReplayAll()
 
@@ -271,7 +276,8 @@ class VlanNetworkTestCase(test.TestCase):
         db.instance_get(mox.IgnoreArg(),
                         mox.IgnoreArg()).AndReturn({'security_groups':
                                                              [{'id': 0}]})
-        db.fixed_ip_associate_pool(mox.IgnoreArg(),
+        db.fixed_ip_associate_by_address(mox.IgnoreArg(),
+                                   mox.IgnoreArg(),
                                    mox.IgnoreArg(),
                                    mox.IgnoreArg()).AndReturn('192.168.0.1')
         db.fixed_ip_update(mox.IgnoreArg(),
@@ -295,17 +301,20 @@ class VlanNetworkTestCase(test.TestCase):
                           cidr='192.168.0.1/24', network_size=100)
 
     def test_validate_networks(self):
-        self.mox.StubOutWithMock(db, 'project_get_networks_by_ids')
-        self.mox.StubOutWithMock(db, "fixed_ip_validate_by_network_address")
+        self.mox.StubOutWithMock(db, 'project_get_networks_by_uuids')
+        self.mox.StubOutWithMock(db, "fixed_ip_get_by_address")
 
-        requested_networks = [(1, "192.168.0.100")]
-        db.project_get_networks_by_ids(mox.IgnoreArg(),
+        requested_networks = [("bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb",
+                               "192.168.1.100")]
+        db.project_get_networks_by_uuids(mox.IgnoreArg(),
                                     mox.IgnoreArg()).AndReturn(networks)
-        db.fixed_ip_validate_by_network_address(mox.IgnoreArg(),
-                                    mox.IgnoreArg(),
-                                    mox.IgnoreArg()).AndReturn(fixed_ips[0])
-        self.mox.ReplayAll()
 
+        fixed_ips[1]['network'] = FakeModel(**networks[1])
+        fixed_ips[1]['instance'] = None
+        db.fixed_ip_get_by_address(mox.IgnoreArg(),
+                                    mox.IgnoreArg()).AndReturn(fixed_ips[1])
+
+        self.mox.ReplayAll()
         self.network.validate_networks(None, requested_networks)
 
     def test_validate_networks_none_requested_networks(self):
@@ -313,25 +322,26 @@ class VlanNetworkTestCase(test.TestCase):
 
     def test_validate_networks_empty_requested_networks(self):
         requested_networks = []
+        self.mox.ReplayAll()
+
         self.network.validate_networks(None, requested_networks)
 
     def test_validate_networks_invalid_fixed_ip(self):
-        self.mox.StubOutWithMock(db, 'project_get_networks_by_ids')
-
+        self.mox.StubOutWithMock(db, 'project_get_networks_by_uuids')
         requested_networks = [(1, "192.168.0.100.1")]
-        db.project_get_networks_by_ids(mox.IgnoreArg(),
+        db.project_get_networks_by_uuids(mox.IgnoreArg(),
                                     mox.IgnoreArg()).AndReturn(networks)
         self.mox.ReplayAll()
 
         self.assertRaises(exception.FixedIpInvalid,
-                          self.network.validate_networks,
-                          None, requested_networks)
+                          self.network.validate_networks, None,
+                          requested_networks)
 
     def test_validate_networks_empty_fixed_ip(self):
-        self.mox.StubOutWithMock(db, 'project_get_networks_by_ids')
+        self.mox.StubOutWithMock(db, 'project_get_networks_by_uuids')
 
         requested_networks = [(1, "")]
-        db.project_get_networks_by_ids(mox.IgnoreArg(),
+        db.project_get_networks_by_uuids(mox.IgnoreArg(),
                                     mox.IgnoreArg()).AndReturn(networks)
         self.mox.ReplayAll()
 
@@ -340,10 +350,10 @@ class VlanNetworkTestCase(test.TestCase):
                           None, requested_networks)
 
     def test_validate_networks_none_fixed_ip(self):
-        self.mox.StubOutWithMock(db, 'project_get_networks_by_ids')
+        self.mox.StubOutWithMock(db, 'project_get_networks_by_uuids')
 
         requested_networks = [(1, None)]
-        db.project_get_networks_by_ids(mox.IgnoreArg(),
+        db.project_get_networks_by_uuids(mox.IgnoreArg(),
                                     mox.IgnoreArg()).AndReturn(networks)
         self.mox.ReplayAll()