openstack
/
nova
Code Issues Proposed changes

Merge "Remove old flavor_extra_specs_delete db api method"

This commit is contained in:
Zuul 2018-03-20 00:04:11 +00:00 committed by Gerrit Code Review
parent 2a83f333b1 0eca044521
commit b38a330256
3 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/db/api.py
View File

@ -1567,11 +1567,6 @@ 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)
def flavor_extra_specs_delete(context, flavor_id, key):
"""Delete the given extra specs item."""
IMPL.flavor_extra_specs_delete(context, flavor_id, key)
####################

12
nova/db/sqlalchemy/api.py
View File

@ -4835,18 +4835,6 @@ def flavor_extra_specs_get(context, flavor_id):
return {row['key']: row['value'] for row in rows}
@require_context
@pick_context_manager_writer
def flavor_extra_specs_delete(context, flavor_id, key):
result = _flavor_extra_specs_get_query(context, flavor_id).\
filter(models.InstanceTypeExtraSpecs.key == key).\
soft_delete(synchronize_session=False)
# did not find the extra spec
if result == 0:
raise exception.FlavorExtraSpecsNotFound(
extra_specs_key=key, flavor_id=flavor_id)
####################

15
nova/tests/unit/db/test_db_api.py
View File

@ -4379,21 +4379,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_delete(self):
for it in self.flavors:
specs = it['extra_specs']
key = list(specs.keys())[0]
del specs[key]
db.flavor_extra_specs_delete(self.ctxt, it['flavorid'], key)
real_specs = db.flavor_extra_specs_get(self.ctxt, it['flavorid'])
self._assertEqualObjects(it['extra_specs'], real_specs)
def test_flavor_extra_specs_delete_failed(self):
for it in self.flavors:
self.assertRaises(exception.FlavorExtraSpecsNotFound,
db.flavor_extra_specs_delete,
self.ctxt, it['flavorid'], 'dummy')
class InstanceTypeAccessTestCase(BaseInstanceTypeTestCase):