Merge "Avoid db lookup in info_from_instance()."

3 files changed, 15 insertions, 12 deletions

diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 9ff1ed031..dc381d800 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -5341,7 +5341,7 @@ class ComputeAPITestCase(BaseTestCase):
 
         _context = context.get_admin_context()
         instance = self._create_fake_instance({'metadata': {'key1': 'value1'}})
-        instance = dict(instance)
+        instance = dict(instance.iteritems())
 
         metadata = self.compute_api.get_instance_metadata(_context, instance)
         self.assertEqual(metadata, {'key1': 'value1'})
diff --git a/nova/tests/compute/test_compute_utils.py b/nova/tests/compute/test_compute_utils.py
index 6e7227d4c..4372039e0 100644
--- a/nova/tests/compute/test_compute_utils.py
+++ b/nova/tests/compute/test_compute_utils.py
@@ -359,6 +359,9 @@ class UsageInfoTestCase(test.TestCase):
         extra_usage_info = {'image_name': 'fake_name'}
         db.instance_system_metadata_update(self.context, instance['uuid'],
                 sys_metadata, False)
+        # NOTE(russellb) Make sure our instance has the latest system_metadata
+        # in it.
+        instance = db.instance_get(self.context, instance_id)
         compute_utils.notify_about_instance_usage(self.context, instance,
         'create.start', extra_usage_info=extra_usage_info)
         self.assertEquals(len(test_notifier.NOTIFICATIONS), 1)
@@ -382,14 +385,3 @@ class UsageInfoTestCase(test.TestCase):
         image_ref_url = "%s/images/1" % glance.generate_glance_url()
         self.assertEquals(payload['image_ref_url'], image_ref_url)
         self.compute.terminate_instance(self.context, instance)
-
-
-class MetadataToDictTestCase(test.TestCase):
-    def test_metadata_to_dict(self):
-        self.assertEqual(compute_utils.metadata_to_dict(
-                [{'key': 'foo1', 'value': 'bar'},
-                 {'key': 'foo2', 'value': 'baz'}]),
-                         {'foo1': 'bar', 'foo2': 'baz'})
-
-    def test_metadata_to_dict_empty(self):
-        self.assertEqual(compute_utils.metadata_to_dict([]), {})
diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py
index 9eab72c5b..84d56cadf 100644
--- a/nova/tests/test_utils.py
+++ b/nova/tests/test_utils.py
@@ -778,3 +778,14 @@ class IntLikeTestCase(test.TestCase):
         self.assertFalse(
             utils.is_int_like("0cc3346e-9fef-4445-abe6-5d2b2690ec64"))
         self.assertFalse(utils.is_int_like("a1"))
+
+
+class MetadataToDictTestCase(test.TestCase):
+    def test_metadata_to_dict(self):
+        self.assertEqual(utils.metadata_to_dict(
+                [{'key': 'foo1', 'value': 'bar'},
+                 {'key': 'foo2', 'value': 'baz'}]),
+                         {'foo1': 'bar', 'foo2': 'baz'})
+
+    def test_metadata_to_dict_empty(self):
+        self.assertEqual(utils.metadata_to_dict([]), {})