Merge "Performance optimization for contrib.flavorextraspecs"

2 files changed, 16 insertions, 2 deletions

diff --git a/nova/tests/api/openstack/compute/contrib/test_flavors_extra_specs.py b/nova/tests/api/openstack/compute/contrib/test_flavors_extra_specs.py
index 269937b82..f0f064f4f 100644
--- a/nova/tests/api/openstack/compute/contrib/test_flavors_extra_specs.py
+++ b/nova/tests/api/openstack/compute/contrib/test_flavors_extra_specs.py
@@ -32,6 +32,10 @@ def return_flavor_extra_specs(context, flavor_id):
     return stub_flavor_extra_specs()
 
 
+def return_flavor_extra_specs_item(context, flavor_id, key):
+    return {key: stub_flavor_extra_specs()[key]}
+
+
 def return_empty_flavor_extra_specs(context, flavor_id):
     return {}
 
@@ -76,8 +80,8 @@ class FlavorsExtraSpecsTest(test.TestCase):
         self.assertEqual(0, len(res_dict['extra_specs']))
 
     def test_show(self):
-        self.stubs.Set(nova.db, 'instance_type_extra_specs_get',
-                       return_flavor_extra_specs)
+        self.stubs.Set(nova.db, 'instance_type_extra_specs_get_item',
+                       return_flavor_extra_specs_item)
 
         req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs' +
                                       '/key5')
diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py
index 5f9a8a038..efdba9b78 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -2241,6 +2241,16 @@ class InstanceTypeExtraSpecsTestCase(BaseInstanceTypeTestCase):
                                                           it['flavorid'])
             self._assertEqualObjects(it['extra_specs'], real_specs)
 
+    def test_instance_type_extra_specs_get_item(self):
+        expected = dict(f1=dict(a='a', b='b', c='c'),
+                        f2=dict(d='d', e='e', f='f'))
+
+        for flavor, specs in expected.iteritems():
+            for key, val in specs.iteritems():
+                spec = db.instance_type_extra_specs_get_item(self.ctxt, flavor,
+                                                             key)
+                self.assertEqual(spec[key], val)
+
     def test_instance_type_extra_specs_delete(self):
         for it in self.inst_types:
             specs = it['extra_specs']