diff --git a/nova/db/api.py b/nova/db/api.py index 08abe9baed..b972061069 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -1507,11 +1507,6 @@ def flavor_extra_specs_get(context, flavor_id): return IMPL.flavor_extra_specs_get(context, flavor_id) -def flavor_extra_specs_get_item(context, flavor_id, key): - """Get extra specs by key and flavor_id.""" - return IMPL.flavor_extra_specs_get_item(context, flavor_id, key) - - def flavor_extra_specs_delete(context, flavor_id, key): """Delete the given extra specs item.""" IMPL.flavor_extra_specs_delete(context, flavor_id, key) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index b3209c9719..3915aa2095 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -4682,18 +4682,6 @@ def flavor_extra_specs_get(context, flavor_id): return dict([(row['key'], row['value']) for row in rows]) -@require_context -def flavor_extra_specs_get_item(context, flavor_id, key): - result = _flavor_extra_specs_get_query(context, flavor_id).\ - filter(models.InstanceTypeExtraSpecs.key == key).\ - first() - if not result: - raise exception.FlavorExtraSpecsNotFound( - extra_specs_key=key, flavor_id=flavor_id) - - return {result["key"]: result["value"]} - - @require_context def flavor_extra_specs_delete(context, flavor_id, key): result = _flavor_extra_specs_get_query(context, flavor_id).\ diff --git a/nova/tests/unit/db/test_db_api.py b/nova/tests/unit/db/test_db_api.py index f103dd49ce..d8be0c15ae 100644 --- a/nova/tests/unit/db/test_db_api.py +++ b/nova/tests/unit/db/test_db_api.py @@ -3176,15 +3176,6 @@ class InstanceTypeExtraSpecsTestCase(BaseInstanceTypeTestCase): real_specs = db.flavor_extra_specs_get(self.ctxt, it['flavorid']) self._assertEqualObjects(it['extra_specs'], real_specs) - def test_flavor_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.flavor_extra_specs_get_item(self.ctxt, flavor, key) - self.assertEqual(spec[key], val) - def test_flavor_extra_specs_delete(self): for it in self.flavors: specs = it['extra_specs']