From ae39f4f9c4529208b80c080de51a2fca93263139 Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Sun, 9 Nov 2014 07:00:21 -0800 Subject: [PATCH] Metadata service: remove check for the instance object type The method now receives an instance object. There is no longer any need to convert it to an instance object. Change-Id: I87fc41cc9dd2c2576a75f343817558849f6f1413 --- nova/api/metadata/base.py | 9 --------- nova/tests/unit/test_metadata.py | 5 ----- 2 files changed, 14 deletions(-) diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py index f938e68b11..03b9844f18 100644 --- a/nova/api/metadata/base.py +++ b/nova/api/metadata/base.py @@ -113,15 +113,6 @@ class InstanceMetadata(): ctxt = context.get_admin_context() - # NOTE(danms): This should be removed after bp:compute-manager-objects - if not isinstance(instance, obj_base.NovaObject): - expected = ['metadata', 'system_metadata'] - if 'info_cache' in instance: - expected.append('info_cache') - instance = objects.Instance._from_db_object( - ctxt, objects.Instance(), instance, - expected_attrs=expected) - # The default value of mimeType is set to MIME_TYPE_TEXT_PLAIN self.set_mimetype(MIME_TYPE_TEXT_PLAIN) self.instance = instance diff --git a/nova/tests/unit/test_metadata.py b/nova/tests/unit/test_metadata.py index 90f57f1af2..cb9cf7ec3c 100644 --- a/nova/tests/unit/test_metadata.py +++ b/nova/tests/unit/test_metadata.py @@ -356,11 +356,6 @@ class OpenStackMetadataTestCase(test.TestCase): self.flags(use_local=True, group='conductor') fake_network.stub_out_nw_api_get_instance_nw_info(self.stubs) - def test_with_primitive_instance(self): - mdinst = fake_InstanceMetadata(self.stubs, INSTANCE) - result = mdinst.lookup('/openstack') - self.assertIn('latest', result) - def test_top_level_listing(self): # request for /openstack// should show metadata.json inst = self.instance.obj_clone()