Remove old flavor_get_by_flavor_id db api method
We haven't used this since the flavor migration compat code was removed: I4107af592448e20fe929f8fa3112929e3685b581 Change-Id: I7481e53edbbf2439e38c61f75bd71d381565636b
This commit is contained in:
parent
b0b2370893
commit
f74651e718
|
@ -1543,11 +1543,6 @@ def flavor_get_by_name(context, name):
|
|||
"""Get instance type by name."""
|
||||
return IMPL.flavor_get_by_name(context, name)
|
||||
|
||||
|
||||
def flavor_get_by_flavor_id(context, id, read_deleted=None):
|
||||
"""Get instance type by flavor id."""
|
||||
return IMPL.flavor_get_by_flavor_id(context, id, read_deleted)
|
||||
|
||||
####################
|
||||
|
||||
|
||||
|
|
|
@ -4743,20 +4743,6 @@ def flavor_get_by_name(context, name):
|
|||
return _dict_with_extra_specs(result)
|
||||
|
||||
|
||||
@require_context
|
||||
@pick_context_manager_reader
|
||||
def flavor_get_by_flavor_id(context, flavor_id, read_deleted):
|
||||
"""Returns a dict describing specific flavor_id."""
|
||||
result = _flavor_get_query(context, read_deleted=read_deleted).\
|
||||
filter_by(flavorid=flavor_id).\
|
||||
order_by(asc(models.InstanceTypes.deleted),
|
||||
asc(models.InstanceTypes.id)).\
|
||||
first()
|
||||
if not result:
|
||||
raise exception.FlavorNotFound(flavor_id=flavor_id)
|
||||
return _dict_with_extra_specs(result)
|
||||
|
||||
|
||||
####################
|
||||
|
||||
|
||||
|
|
|
@ -60,9 +60,6 @@ class FlavorObjectTestCase(test.NoDBTestCase):
|
|||
# Make sure we don't find it in the main database
|
||||
self.assertRaises(exception.FlavorNotFoundByName,
|
||||
db.flavor_get_by_name, self.context, flavor.name)
|
||||
self.assertRaises(exception.FlavorNotFound,
|
||||
db.flavor_get_by_flavor_id, self.context,
|
||||
flavor.flavorid)
|
||||
|
||||
def test_get_with_no_projects(self):
|
||||
fields = dict(fake_api_flavor, projects=[])
|
||||
|
|
|
@ -4639,37 +4639,6 @@ class InstanceTypeTestCase(BaseInstanceTypeTestCase):
|
|||
db.flavor_get_by_name, self.user_ctxt,
|
||||
flavor['name'])
|
||||
|
||||
def test_flavor_get_by_flavor_id(self):
|
||||
flavors = [{'name': 'abc', 'flavorid': '123'},
|
||||
{'name': 'def', 'flavorid': '456'},
|
||||
{'name': 'ghi', 'flavorid': '789'}]
|
||||
flavors = [self._create_flavor(t) for t in flavors]
|
||||
|
||||
for flavor in flavors:
|
||||
params = (self.ctxt, flavor['flavorid'])
|
||||
flavor_by_flavorid = db.flavor_get_by_flavor_id(*params)
|
||||
self._assertEqualObjects(flavor, flavor_by_flavorid)
|
||||
|
||||
def test_flavor_get_by_flavor_not_found(self):
|
||||
self._create_flavor({})
|
||||
self.assertRaises(exception.FlavorNotFound,
|
||||
db.flavor_get_by_flavor_id,
|
||||
self.ctxt, 'nonexists')
|
||||
|
||||
def test_flavor_get_by_flavor_id_non_public(self):
|
||||
flavor = self._create_flavor({'name': 'abc', 'flavorid': '123',
|
||||
'is_public': False})
|
||||
|
||||
# Admin can see it
|
||||
flavor_by_fid = db.flavor_get_by_flavor_id(self.ctxt,
|
||||
flavor['flavorid'])
|
||||
self._assertEqualObjects(flavor, flavor_by_fid)
|
||||
|
||||
# Regular user can not
|
||||
self.assertRaises(exception.FlavorNotFound,
|
||||
db.flavor_get_by_flavor_id, self.user_ctxt,
|
||||
flavor['flavorid'])
|
||||
|
||||
|
||||
@mock.patch('time.sleep', new=lambda x: None)
|
||||
class FixedIPTestCase(BaseInstanceTypeTestCase):
|
||||
|
|
Loading…
Reference in New Issue