Remove old flavor_extra_specs_get db api method
We haven't used this since the flavor migration compat code was removed in: I4107af592448e20fe929f8fa3112929e3685b581 Change-Id: Ibbd620c5ebcfc7b923a20db9e0f74575f5335c36
This commit is contained in:
parent
0eca044521
commit
cf6a2688b9
|
@ -1568,11 +1568,6 @@ def flavor_access_remove(context, flavor_id, project_id):
|
|||
"""Remove flavor access for project."""
|
||||
return IMPL.flavor_access_remove(context, flavor_id, project_id)
|
||||
|
||||
|
||||
def flavor_extra_specs_get(context, flavor_id):
|
||||
"""Get all extra specs for an instance type."""
|
||||
return IMPL.flavor_extra_specs_get(context, flavor_id)
|
||||
|
||||
####################
|
||||
|
||||
|
||||
|
|
|
@ -4834,22 +4834,6 @@ def flavor_access_remove(context, flavor_id, project_id):
|
|||
project_id=project_id)
|
||||
|
||||
|
||||
def _flavor_extra_specs_get_query(context, flavor_id):
|
||||
instance_type_id_subq = _flavor_get_id_from_flavor_query(context,
|
||||
flavor_id)
|
||||
|
||||
return model_query(context, models.InstanceTypeExtraSpecs,
|
||||
read_deleted="no").\
|
||||
filter_by(instance_type_id=instance_type_id_subq)
|
||||
|
||||
|
||||
@require_context
|
||||
@pick_context_manager_reader
|
||||
def flavor_extra_specs_get(context, flavor_id):
|
||||
rows = _flavor_extra_specs_get_query(context, flavor_id).all()
|
||||
return {row['key']: row['value'] for row in rows}
|
||||
|
||||
|
||||
####################
|
||||
|
||||
|
||||
|
|
|
@ -4463,8 +4463,6 @@ class InstanceTypeTestCase(BaseInstanceTypeTestCase):
|
|||
|
||||
self.assertRaises(exception.FlavorNotFound,
|
||||
db.flavor_get, self.ctxt, flavor1['id'])
|
||||
real_specs1 = db.flavor_extra_specs_get(self.ctxt, flavor1['flavorid'])
|
||||
self._assertEqualObjects(real_specs1, {})
|
||||
|
||||
r_flavor2 = db.flavor_get(self.ctxt, flavor2['id'])
|
||||
self._assertEqualObjects(flavor2, r_flavor2, 'extra_specs')
|
||||
|
@ -4747,25 +4745,6 @@ class InstanceTypeTestCase(BaseInstanceTypeTestCase):
|
|||
self.assertEqual(flavor['id'], flavor_by_fid['id'])
|
||||
|
||||
|
||||
class InstanceTypeExtraSpecsTestCase(BaseInstanceTypeTestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(InstanceTypeExtraSpecsTestCase, self).setUp()
|
||||
values = ({'name': 'n1', 'flavorid': 'f1',
|
||||
'extra_specs': dict(a='a', b='b', c='c')},
|
||||
{'name': 'n2', 'flavorid': 'f2',
|
||||
'extra_specs': dict(d='d', e='e', f='f')})
|
||||
|
||||
# NOTE(boris-42): We have already tested flavor_create method
|
||||
# with extra_specs in InstanceTypeTestCase.
|
||||
self.flavors = [self._create_flavor(v) for v in values]
|
||||
|
||||
def test_flavor_extra_specs_get(self):
|
||||
for it in self.flavors:
|
||||
real_specs = db.flavor_extra_specs_get(self.ctxt, it['flavorid'])
|
||||
self._assertEqualObjects(it['extra_specs'], real_specs)
|
||||
|
||||
|
||||
class InstanceTypeAccessTestCase(BaseInstanceTypeTestCase):
|
||||
|
||||
def _create_flavor_access(self, flavor_id, project_id):
|
||||
|
|
Loading…
Reference in New Issue