openstack
/
nova
Code Issues Proposed changes

Revert "API users should not see deleted flavors." 

This reverts commit f6e62c6120. We
need to be able to query deleted flavors for instances that may
be running on deleted flavors.

Change-Id: I9ae80c525c9bc1e3172bd4e7ffe50fe74f2d3a51
This commit is contained in:
Josh Kearney 2012-05-29 16:42:26 -05:00
parent dab262af0d
commit 16d26af6ef
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/compute/instance_types.py
View File

@ -144,5 +144,5 @@ def get_instance_type_by_flavor_id(flavorid):
:raises: FlavorNotFound
"""
ctxt = context.get_admin_context()
ctxt = context.get_admin_context(read_deleted="yes")
return db.instance_type_get_by_flavor_id(ctxt, flavorid)

16
nova/tests/test_instance_types.py
View File

@ -201,6 +201,22 @@ class InstanceTypeTestCase(test.TestCase):
fetched = instance_types.get_instance_type_by_flavor_id(flavorid)
self.assertEqual(default_instance_type, fetched)
def test_can_read_deleted_types_using_flavor_id(self):
"""Ensure deleted instance types can be read when querying flavor_id"""
inst_type_name = "test"
inst_type_flavor_id = "test1"
inst_type = instance_types.create(inst_type_name, 256, 1, 120, 100,
inst_type_flavor_id)
self.assertEqual(inst_type_name, inst_type["name"])
# NOTE(jk0): The deleted flavor will show up here because the context
# in get_instance_type_by_flavor_id() is set to use read_deleted.
instance_types.destroy(inst_type["name"])
deleted_inst_type = instance_types.get_instance_type_by_flavor_id(
inst_type_flavor_id)
self.assertEqual(inst_type_name, deleted_inst_type["name"])
def test_will_list_deleted_type_for_active_instance(self):
"""Ensure deleted instance types with active instances can be read"""
ctxt = context.get_admin_context()