Merge "Remove old flavor_get db api method"
This commit is contained in:
commit
af5e3eb610
@ -1527,11 +1527,6 @@ def flavor_get_all(context, inactive=False, filters=None, sort_key='flavorid',
|
||||
context, inactive=inactive, filters=filters, sort_key=sort_key,
|
||||
sort_dir=sort_dir, limit=limit, marker=marker)
|
||||
|
||||
|
||||
def flavor_get(context, id):
|
||||
"""Get instance type by id."""
|
||||
return IMPL.flavor_get(context, id)
|
||||
|
||||
####################
|
||||
|
||||
|
||||
|
@ -4704,18 +4704,6 @@ def flavor_get_all(context, inactive=False, filters=None,
|
||||
return [_dict_with_extra_specs(i) for i in inst_types]
|
||||
|
||||
|
||||
@require_context
|
||||
@pick_context_manager_reader
|
||||
def flavor_get(context, id):
|
||||
"""Returns a dict describing specific flavor."""
|
||||
result = _flavor_get_query(context).\
|
||||
filter_by(id=id).\
|
||||
first()
|
||||
if not result:
|
||||
raise exception.FlavorNotFound(flavor_id=id)
|
||||
return _dict_with_extra_specs(result)
|
||||
|
||||
|
||||
####################
|
||||
|
||||
|
||||
|
@ -224,11 +224,6 @@ def fake_fixed_ip_update(context, address, values):
|
||||
fif['virtual_interface'] = FakeModel(vif[0])
|
||||
|
||||
|
||||
def fake_flavor_get(context, id):
|
||||
if flavor_fields['id'] == id:
|
||||
return FakeModel(flavor_fields)
|
||||
|
||||
|
||||
def fake_virtual_interface_create(context, values):
|
||||
vif = dict(virtual_interface_fields)
|
||||
vif['id'] = max([m['id'] for m in virtual_interfaces] or [-1]) + 1
|
||||
@ -323,7 +318,6 @@ def stub_out_db_network_api(test):
|
||||
fake_fixed_ip_get_by_instance,
|
||||
fake_fixed_ip_get_by_address,
|
||||
fake_fixed_ip_update,
|
||||
fake_flavor_get,
|
||||
fake_virtual_interface_create,
|
||||
fake_virtual_interface_delete_by_instance,
|
||||
fake_virtual_interface_get_by_instance,
|
||||
|
@ -4203,28 +4203,6 @@ class InstanceTypeTestCase(BaseInstanceTypeTestCase):
|
||||
self.assertRaises(exception.MarkerNotFound,
|
||||
db.flavor_get_all, self.ctxt, marker='invalid')
|
||||
|
||||
def test_flavor_get(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:
|
||||
flavor_by_id = db.flavor_get(self.ctxt, flavor['id'])
|
||||
self._assertEqualObjects(flavor, flavor_by_id)
|
||||
|
||||
def test_flavor_get_non_public(self):
|
||||
flavor = self._create_flavor({'name': 'abc', 'flavorid': '123',
|
||||
'is_public': False})
|
||||
|
||||
# Admin can see it
|
||||
flavor_by_id = db.flavor_get(self.ctxt, flavor['id'])
|
||||
self._assertEqualObjects(flavor, flavor_by_id)
|
||||
|
||||
# Regular user can not
|
||||
self.assertRaises(exception.FlavorNotFound, db.flavor_get,
|
||||
self.user_ctxt, flavor['id'])
|
||||
|
||||
|
||||
@mock.patch('time.sleep', new=lambda x: None)
|
||||
class FixedIPTestCase(BaseInstanceTypeTestCase):
|
||||
|
Loading…
Reference in New Issue
Block a user