Merge "Remove old flavor_get_by_name db api method"
This commit is contained in:
commit
b41a0f2031
|
@ -1532,11 +1532,6 @@ def flavor_get(context, id):
|
|||
"""Get instance type by id."""
|
||||
return IMPL.flavor_get(context, id)
|
||||
|
||||
|
||||
def flavor_get_by_name(context, name):
|
||||
"""Get instance type by name."""
|
||||
return IMPL.flavor_get_by_name(context, name)
|
||||
|
||||
####################
|
||||
|
||||
|
||||
|
|
|
@ -4716,18 +4716,6 @@ def flavor_get(context, id):
|
|||
return _dict_with_extra_specs(result)
|
||||
|
||||
|
||||
@require_context
|
||||
@pick_context_manager_reader
|
||||
def flavor_get_by_name(context, name):
|
||||
"""Returns a dict describing specific flavor."""
|
||||
result = _flavor_get_query(context).\
|
||||
filter_by(name=name).\
|
||||
first()
|
||||
if not result:
|
||||
raise exception.FlavorNotFoundByName(flavor_name=name)
|
||||
return _dict_with_extra_specs(result)
|
||||
|
||||
|
||||
####################
|
||||
|
||||
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
# under the License.
|
||||
|
||||
from nova import context
|
||||
from nova import db
|
||||
from nova.db.sqlalchemy import api as db_api
|
||||
from nova.db.sqlalchemy import api_models
|
||||
from nova import exception
|
||||
|
@ -57,10 +56,6 @@ class FlavorObjectTestCase(test.NoDBTestCase):
|
|||
flavor2 = objects.Flavor._flavor_get_from_db(self.context, flavor.id)
|
||||
self.assertEqual(flavor.id, flavor2['id'])
|
||||
|
||||
# Make sure we don't find it in the main database
|
||||
self.assertRaises(exception.FlavorNotFoundByName,
|
||||
db.flavor_get_by_name, self.context, flavor.name)
|
||||
|
||||
def test_get_with_no_projects(self):
|
||||
fields = dict(fake_api_flavor, projects=[])
|
||||
flavor = objects.Flavor(context=self.context, **fields)
|
||||
|
|
|
@ -4225,34 +4225,6 @@ class InstanceTypeTestCase(BaseInstanceTypeTestCase):
|
|||
self.assertRaises(exception.FlavorNotFound, db.flavor_get,
|
||||
self.user_ctxt, flavor['id'])
|
||||
|
||||
def test_flavor_get_by_name(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_name = db.flavor_get_by_name(self.ctxt, flavor['name'])
|
||||
self._assertEqualObjects(flavor, flavor_by_name)
|
||||
|
||||
def test_flavor_get_by_name_not_found(self):
|
||||
self._create_flavor({})
|
||||
self.assertRaises(exception.FlavorNotFoundByName,
|
||||
db.flavor_get_by_name, self.ctxt, 'nonexists')
|
||||
|
||||
def test_flavor_get_by_name_non_public(self):
|
||||
flavor = self._create_flavor({'name': 'abc', 'flavorid': '123',
|
||||
'is_public': False})
|
||||
|
||||
# Admin can see it
|
||||
flavor_by_name = db.flavor_get_by_name(self.ctxt, flavor['name'])
|
||||
self._assertEqualObjects(flavor, flavor_by_name)
|
||||
|
||||
# Regular user can not
|
||||
self.assertRaises(exception.FlavorNotFoundByName,
|
||||
db.flavor_get_by_name, self.user_ctxt,
|
||||
flavor['name'])
|
||||
|
||||
|
||||
@mock.patch('time.sleep', new=lambda x: None)
|
||||
class FixedIPTestCase(BaseInstanceTypeTestCase):
|
||||
|
|
|
@ -64,11 +64,12 @@ def get_test_flavor(context=None, options=None):
|
|||
'swap': 1024}
|
||||
|
||||
test_flavor.update(options)
|
||||
|
||||
flavor_ref = objects.Flavor(context, **test_flavor)
|
||||
try:
|
||||
flavor_ref = nova.db.flavor_create(context, test_flavor)
|
||||
flavor_ref.create()
|
||||
except (exception.FlavorExists, exception.FlavorIdExists):
|
||||
flavor_ref = nova.db.flavor_get_by_name(context, 'kinda.big')
|
||||
flavor_ref = objects.Flavor.get_by_flavor_id(
|
||||
context, test_flavor['flavorid'])
|
||||
return flavor_ref
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue