openstack/zun
Code Issues Proposed changes

Merge "admin cannot operate ordinary tenant's container"

Browse Source
This commit is contained in:
Zuul 2018-04-09 02:39:50 +00:00 committed by Gerrit Code Review
commit c24d3fd068
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zun/api/utils.py
View File

@ -85,11 +85,13 @@ def get_resource(resource, resource_ident):
:returns: The resource. :returns: The resource.
""" """
resource = getattr(objects, resource) resource = getattr(objects, resource)
context = pecan.request.context
if context.is_admin:
context.all_projects = True
if uuidutils.is_uuid_like(resource_ident): if uuidutils.is_uuid_like(resource_ident):
return resource.get_by_uuid(pecan.request.context, resource_ident) return resource.get_by_uuid(context, resource_ident)
return resource.get_by_name(pecan.request.context, resource_ident) return resource.get_by_name(context, resource_ident)
def _do_enforce_content_types(pecan_req, valid_content_types): def _do_enforce_content_types(pecan_req, valid_content_types):