diff --git a/nova/api/openstack/compute/plugins/v3/flavor_access.py b/nova/api/openstack/compute/plugins/v3/flavor_access.py index 4baa8bf37fb2..848009ed581e 100644 --- a/nova/api/openstack/compute/plugins/v3/flavor_access.py +++ b/nova/api/openstack/compute/plugins/v3/flavor_access.py @@ -95,7 +95,7 @@ class FlavorAccessController(object): authorize(context) try: - flavor = flavors.get_flavor_by_flavor_id(flavor_id) + flavor = flavors.get_flavor_by_flavor_id(flavor_id, ctxt=context) except exception.FlavorNotFound as e: raise webob.exc.HTTPNotFound(explanation=e.format_message()) diff --git a/nova/api/openstack/compute/plugins/v3/flavors.py b/nova/api/openstack/compute/plugins/v3/flavors.py index bf15ba81a664..9250d9b68e49 100644 --- a/nova/api/openstack/compute/plugins/v3/flavors.py +++ b/nova/api/openstack/compute/plugins/v3/flavors.py @@ -93,8 +93,9 @@ class FlavorsController(wsgi.Controller): @wsgi.serializers(xml=FlavorTemplate) def show(self, req, id): """Return data about the given flavor id.""" + context = req.environ['nova.context'] try: - flavor = flavors.get_flavor_by_flavor_id(id) + flavor = flavors.get_flavor_by_flavor_id(id, ctxt=context) req.cache_db_flavor(flavor) except exception.FlavorNotFound as e: raise webob.exc.HTTPNotFound(explanation=e.format_message()) diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_flavor_access.py b/nova/tests/api/openstack/compute/plugins/v3/test_flavor_access.py index c2455d327ef8..f4c750829985 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_flavor_access.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_flavor_access.py @@ -68,7 +68,7 @@ def fake_get_flavor_access_by_flavor_id(flavorid): return res -def fake_get_flavor_by_flavor_id(flavorid): +def fake_get_flavor_by_flavor_id(flavorid, ctxt=None): return INSTANCE_TYPES[flavorid] diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py b/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py index 223b9850c954..c600b29642e3 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py @@ -58,7 +58,7 @@ FAKE_FLAVORS = { } -def fake_flavor_get_by_flavor_id(flavorid): +def fake_flavor_get_by_flavor_id(flavorid, ctxt=None): return FAKE_FLAVORS['flavor %s' % flavorid] @@ -98,7 +98,7 @@ def empty_get_all_flavors_sorted_list(context=None, inactive=False, return [] -def return_flavor_not_found(flavor_id): +def return_flavor_not_found(flavor_id, ctxt=None): raise exception.FlavorNotFound(flavor_id=flavor_id)