Merge "Migrate block_device_mapping to use instance uuids."

4 files changed, 54 insertions, 48 deletions

diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py
index 1611871db..7b6fb34c2 100644
--- a/nova/tests/api/ec2/test_cloud.py
+++ b/nova/tests/api/ec2/test_cloud.py
@@ -945,42 +945,43 @@ class CloudTestCase(test.TestCase):
                                    'root_device_name': '/dev/sdc1'})
 
         instance_id = inst1['id']
+        instance_uuid = inst1['uuid']
         mappings0 = [
-            {'instance_id': instance_id,
+            {'instance_uuid': instance_uuid,
              'device_name': '/dev/sdb1',
              'snapshot_id': '1',
              'volume_id': '2'},
-            {'instance_id': instance_id,
+            {'instance_uuid': instance_uuid,
              'device_name': '/dev/sdb2',
              'volume_id': '3',
              'volume_size': 1},
-            {'instance_id': instance_id,
+            {'instance_uuid': instance_uuid,
              'device_name': '/dev/sdb3',
              'delete_on_termination': True,
              'snapshot_id': '4',
              'volume_id': '5'},
-            {'instance_id': instance_id,
+            {'instance_uuid': instance_uuid,
              'device_name': '/dev/sdb4',
              'delete_on_termination': False,
              'snapshot_id': '6',
              'volume_id': '7'},
-            {'instance_id': instance_id,
+            {'instance_uuid': instance_uuid,
              'device_name': '/dev/sdb5',
              'snapshot_id': '8',
              'volume_id': '9',
              'volume_size': 0},
-            {'instance_id': instance_id,
+            {'instance_uuid': instance_uuid,
              'device_name': '/dev/sdb6',
              'snapshot_id': '10',
              'volume_id': '11',
              'volume_size': 1},
-            {'instance_id': instance_id,
+            {'instance_uuid': instance_uuid,
              'device_name': '/dev/sdb7',
              'no_device': True},
-            {'instance_id': instance_id,
+            {'instance_uuid': instance_uuid,
              'device_name': '/dev/sdb8',
              'virtual_name': 'swap'},
-            {'instance_id': instance_id,
+            {'instance_uuid': instance_uuid,
              'device_name': '/dev/sdb9',
              'virtual_name': 'ephemeral3'}]
 
@@ -990,9 +991,9 @@ class CloudTestCase(test.TestCase):
     def _tearDownBlockDeviceMapping(self, inst1, inst2, volumes):
         for vol in volumes:
             db.volume_destroy(self.context, vol['id'])
-        for id in (inst1['id'], inst2['id']):
+        for uuid in (inst1['uuid'], inst2['uuid']):
             for bdm in db.block_device_mapping_get_all_by_instance(
-                self.context, id):
+                self.context, uuid):
                 db.block_device_mapping_destroy(self.context, bdm['id'])
         db.instance_destroy(self.context, inst2['id'])
         db.instance_destroy(self.context, inst1['id'])
@@ -1043,8 +1044,8 @@ class CloudTestCase(test.TestCase):
         (inst1, inst2, volumes) = self._setUpBlockDeviceMapping()
 
         result = {}
-        self.cloud._format_instance_bdm(self.context, inst1['id'], '/dev/sdb1',
-                                        result)
+        self.cloud._format_instance_bdm(self.context, inst1['uuid'],
+                                        '/dev/sdb1', result)
         self.assertSubDictMatch(
             {'rootDeviceType': self._expected_instance_bdm1['rootDeviceType']},
             result)
@@ -1052,8 +1053,8 @@ class CloudTestCase(test.TestCase):
             self._expected_block_device_mapping0, result['blockDeviceMapping'])
 
         result = {}
-        self.cloud._format_instance_bdm(self.context, inst2['id'], '/dev/sdc1',
-                                        result)
+        self.cloud._format_instance_bdm(self.context, inst2['uuid'],
+                                        '/dev/sdc1', result)
         self.assertSubDictMatch(
             {'rootDeviceType': self._expected_instance_bdm2['rootDeviceType']},
             result)
@@ -2166,6 +2167,7 @@ class CloudTestCase(test.TestCase):
         def fake_get(ctxt, instance_id):
             return {
                 'id': 0,
+                'uuid': 'e5fe5518-0288-4fa3-b0c4-c79764101b85',
                 'root_device_name': '/dev/sdh',
                 'security_groups': [{'name': 'fake0'}, {'name': 'fake1'}],
                 'vm_state': vm_states.STOPPED,
diff --git a/nova/tests/api/ec2/test_ec2_validate.py b/nova/tests/api/ec2/test_ec2_validate.py
index ec8f09387..3765c9425 100644
--- a/nova/tests/api/ec2/test_ec2_validate.py
+++ b/nova/tests/api/ec2/test_ec2_validate.py
@@ -124,7 +124,7 @@ class EC2ValidateTestCase(test.TestCase):
                               instance_id='i-1234',
                               device='/dev/vdc')
 
-    def test_describe_instance_ttribute(self):
+    def test_describe_instance_attribute(self):
         for ec2_id, e in self.ec2_id_exception_map:
             self.assertRaises(e,
                               self.cloud.describe_instance_attribute,
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 0fae2d48f..ca159c891 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -1403,37 +1403,38 @@ class ComputeTestCase(BaseTestCase):
         """Confirm exception when pre_live_migration fails."""
         # creating instance testdata
         inst_ref = self._create_fake_instance({'host': 'dummy'})
-        instance_id = inst_ref['id']
+
         c = context.get_admin_context()
         topic = db.queue_get_for(c, FLAGS.compute_topic, inst_ref['host'])
         # creating volume testdata
         volume_id = 1
         db.volume_create(c, {'id': volume_id})
-        values = {'instance_id': instance_id, 'device_name': '/dev/vdc',
-            'delete_on_termination': False, 'volume_id': volume_id}
+        values = {'instance_uuid': inst_ref['uuid'], 'device_name': '/dev/vdc',
+                  'delete_on_termination': False, 'volume_id': volume_id}
         db.block_device_mapping_create(c, values)
 
         # creating mocks
         self.mox.StubOutWithMock(rpc, 'call')
-        rpc.call(c, FLAGS.volume_topic, {"method": "check_for_export",
-                                         "args": {'instance_id': instance_id}})
+        rpc.call(c, FLAGS.volume_topic,
+                 {"method": "check_for_export",
+                  "args": {'instance_id': inst_ref['id']}})
 
         self.mox.StubOutWithMock(self.compute.driver, 'get_instance_disk_info')
         self.compute.driver.get_instance_disk_info(inst_ref.name)
 
         rpc.call(c, topic,
                  {"method": "pre_live_migration",
-                  "args": {'instance_id': instance_id,
+                  "args": {'instance_id': inst_ref['id'],
                            'block_migration': True,
                            'disk': None}
                  }).AndRaise(rpc.common.RemoteError('', '', ''))
         # mocks for rollback
         rpc.call(c, 'network', {'method': 'setup_networks_on_host',
-                                'args': {'instance_id': instance_id,
+                                'args': {'instance_id': inst_ref['id'],
                                          'host': self.compute.host,
                                          'teardown': False}})
         rpc.call(c, topic, {"method": "remove_volume_connection",
-                            "args": {'instance_id': instance_id,
+                            "args": {'instance_id': inst_ref['id'],
                                      'volume_id': volume_id}})
         rpc.cast(c, topic, {"method": "rollback_live_migration_at_destination",
                             "args": {'instance_id': inst_ref['id']}})
@@ -1442,11 +1443,11 @@ class ComputeTestCase(BaseTestCase):
         self.mox.ReplayAll()
         self.assertRaises(rpc_common.RemoteError,
                           self.compute.live_migration,
-                          c, instance_id, inst_ref['host'], True)
+                          c, inst_ref['id'], inst_ref['host'], True)
 
         # cleanup
-        for bdms in db.block_device_mapping_get_all_by_instance(c,
-                                                                instance_id):
+        for bdms in db.block_device_mapping_get_all_by_instance(
+            c, inst_ref['uuid']):
             db.block_device_mapping_destroy(c, bdms['id'])
         db.volume_destroy(c, volume_id)
         db.instance_destroy(c, inst_ref['id'])
@@ -1676,7 +1677,7 @@ class ComputeTestCase(BaseTestCase):
 
         self.mox.StubOutWithMock(self.compute, "_cleanup_volumes")
         self.compute._cleanup_volumes(admin_context,
-                                      instance['id']).AndReturn(None)
+                                      instance['uuid']).AndReturn(None)
 
         self.mox.ReplayAll()
         self.compute._cleanup_running_deleted_instances(admin_context)
@@ -3096,11 +3097,11 @@ class ComputeAPITestCase(BaseTestCase):
                  'no_device': True}]
 
         self.compute_api._update_image_block_device_mapping(
-            self.context, instance_type, instance['id'], mappings)
+            self.context, instance_type, instance['uuid'], mappings)
 
         bdms = [self._parse_db_block_device_mapping(bdm_ref)
                 for bdm_ref in db.block_device_mapping_get_all_by_instance(
-                    self.context, instance['id'])]
+                    self.context, instance['uuid'])]
         expected_result = [
             {'virtual_name': 'swap', 'device_name': '/dev/sdb1',
              'volume_size': swap_size},
@@ -3117,10 +3118,10 @@ class ComputeAPITestCase(BaseTestCase):
 
         self.compute_api._update_block_device_mapping(
             self.context, instance_types.get_default_instance_type(),
-            instance['id'], block_device_mapping)
+            instance['uuid'], block_device_mapping)
         bdms = [self._parse_db_block_device_mapping(bdm_ref)
                 for bdm_ref in db.block_device_mapping_get_all_by_instance(
-                    self.context, instance['id'])]
+                    self.context, instance['uuid'])]
         expected_result = [
             {'snapshot_id': 0x12345678, 'device_name': '/dev/sda1'},
 
@@ -3144,7 +3145,7 @@ class ComputeAPITestCase(BaseTestCase):
         self.assertDictListMatch(bdms, expected_result)
 
         for bdm in db.block_device_mapping_get_all_by_instance(
-            self.context, instance['id']):
+            self.context, instance['uuid']):
             db.block_device_mapping_destroy(self.context, bdm['id'])
         instance = db.instance_get_by_uuid(self.context, instance['uuid'])
         self.compute.terminate_instance(self.context, instance['uuid'])
diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py
index 7bd3ebcdd..4a54d55ce 100644
--- a/nova/tests/test_metadata.py
+++ b/nova/tests/test_metadata.py
@@ -47,20 +47,21 @@ class MetadataTestCase(test.TestCase):
     def setUp(self):
         super(MetadataTestCase, self).setUp()
         self.instance = ({'id': 1,
-                         'name': 'fake',
-                         'project_id': 'test',
-                         'key_name': None,
-                         'host': 'test',
-                         'launch_index': 1,
-                         'instance_type': {'name': 'm1.tiny'},
-                         'reservation_id': 'r-xxxxxxxx',
-                         'user_data': '',
-                         'image_ref': 7,
-                         'vcpus': 1,
-                         'fixed_ips': [],
-                         'root_device_name': '/dev/sda1',
-                         'info_cache': {'network_info': []},
-                         'hostname': 'test'})
+                          'uuid': 'b65cee2f-8c69-4aeb-be2f-f79742548fc2',
+                          'name': 'fake',
+                          'project_id': 'test',
+                          'key_name': None,
+                          'host': 'test',
+                          'launch_index': 1,
+                          'instance_type': {'name': 'm1.tiny'},
+                          'reservation_id': 'r-xxxxxxxx',
+                          'user_data': '',
+                          'image_ref': 7,
+                          'vcpus': 1,
+                          'fixed_ips': [],
+                          'root_device_name': '/dev/sda1',
+                          'info_cache': {'network_info': []},
+                          'hostname': 'test'})
 
         def fake_get_floating_ips_by_fixed_address(self, context, fixed_ip):
             return ['1.2.3.4', '5.6.7.8']
@@ -144,11 +145,13 @@ class MetadataTestCase(test.TestCase):
         """Make sure that _get_instance_mapping works"""
         ctxt = None
         instance_ref0 = {'id': 0,
+                         'uuid': 'e5fe5518-0288-4fa3-b0c4-c79764101b85',
                          'root_device_name': None}
         instance_ref1 = {'id': 0,
+                         'uuid': 'b65cee2f-8c69-4aeb-be2f-f79742548fc2',
                          'root_device_name': '/dev/sda1'}
 
-        def fake_bdm_get(ctxt, id):
+        def fake_bdm_get(ctxt, uuid):
             return [{'volume_id': 87654321,
                      'snapshot_id': None,
                      'no_device': None,