openstack/zun
Code Issues Proposed changes

Merge "Support --all-tenant in server side"

Browse Source
This commit is contained in:
Jenkins 2017-03-06 19:31:33 +00:00 committed by Gerrit Code Review
commit d5278254c0
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zun/api/controllers/v1/containers.py
View File

@ -17,6 +17,7 @@ from oslo_log import log as logging
from oslo_utils import strutils from oslo_utils import strutils
import pecan import pecan
from pecan import rest from pecan import rest
import six
from zun.api.controllers import link from zun.api.controllers import link
from zun.api.controllers.v1 import collection from zun.api.controllers.v1 import collection
@ -108,6 +109,17 @@ class ContainersController(rest.RestController):
def _get_containers_collection(self, **kwargs): def _get_containers_collection(self, **kwargs):
context = pecan.request.context context = pecan.request.context
all_tenants = kwargs.get('all_tenants')
if all_tenants:
try:
all_tenants = strutils.bool_from_string(all_tenants, True)
except ValueError as err:
raise exception.InvalidInput(six.text_type(err))
else:
# If no value, it's considered to disable all_tenants
all_tenants = False
if all_tenants:
context.all_tenants = True
compute_api = pecan.request.compute_api compute_api = pecan.request.compute_api
limit = api_utils.validate_limit(kwargs.get('limit')) limit = api_utils.validate_limit(kwargs.get('limit'))
sort_dir = api_utils.validate_sort_dir(kwargs.get('sort_dir', 'asc')) sort_dir = api_utils.validate_sort_dir(kwargs.get('sort_dir', 'asc'))