openstack/zun
Code Issues Proposed changes

Merge "Remove unncessary 'None' params in dict.get calls"

Browse Source
This commit is contained in:
Jenkins 2017-01-07 04:21:50 +00:00 committed by Gerrit Code Review
commit 0767cc4e13
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,11 +37,10 @@ LOG = logging.getLogger(__name__)
def _get_container(container_id): def _get_container(container_id):
container = api_utils.get_resource('Container', container = api_utils.get_resource('Container', container_id)
container_id)
if not container: if not container:
pecan.abort(404, _LE('Not Found. Container you requested ' pecan.abort(404, _LE('Not found; the container you requested '
'for does not exist.')) 'does not exist.'))
return container return container
@ -195,15 +194,15 @@ class ContainersController(rest.RestController):
def _get_containers_collection(self, **kwargs): def _get_containers_collection(self, **kwargs):
context = pecan.request.context context = pecan.request.context
limit = api_utils.validate_limit(kwargs.get('limit', None)) 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'))
sort_key = kwargs.get('sort_key', 'id') sort_key = kwargs.get('sort_key', 'id')
resource_url = kwargs.get('resource_url', None) resource_url = kwargs.get('resource_url')
expand = kwargs.get('expand', None) expand = kwargs.get('expand')
filters = None filters = None
marker_obj = None marker_obj = None
marker = kwargs.get('marker', None) marker = kwargs.get('marker')
if marker: if marker:
marker_obj = objects.Container.get_by_uuid(context, marker_obj = objects.Container.get_by_uuid(context,
marker) marker)
@ -419,8 +418,8 @@ class ContainersController(rest.RestController):
container = _get_container(container_id) container = _get_container(container_id)
check_policy_on_container(container.as_dict(), "container:kill") check_policy_on_container(container.as_dict(), "container:kill")
LOG.debug('Calling compute.container_kill with %s signal %s' LOG.debug('Calling compute.container_kill with %s signal %s'
% (container.uuid, kw.get('signal', kw.get('signal', None)))) % (container.uuid, kw.get('signal', kw.get('signal'))))
context = pecan.request.context context = pecan.request.context
container = pecan.request.rpcapi.container_kill(context, container, container = pecan.request.rpcapi.container_kill(context, container,
kw.get('signal', None)) kw.get('signal'))
return Container.convert_with_links(container.as_dict()) return Container.convert_with_links(container.as_dict())

8
zun/api/controllers/v1/images.py
View File

@ -153,14 +153,14 @@ class ImagesController(rest.RestController):
def _get_images_collection(self, **kwargs): def _get_images_collection(self, **kwargs):
context = pecan.request.context context = pecan.request.context
limit = api_utils.validate_limit(kwargs.get('limit', None)) 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'))
sort_key = kwargs.get('sort_key', 'id') sort_key = kwargs.get('sort_key', 'id')
resource_url = kwargs.get('resource_url', None) resource_url = kwargs.get('resource_url')
expand = kwargs.get('expand', None) expand = kwargs.get('expand')
filters = None filters = None
marker_obj = None marker_obj = None
marker = kwargs.get('marker', None) marker = kwargs.get('marker')
if marker: if marker:
marker_obj = objects.Image.get_by_uuid(context, marker) marker_obj = objects.Image.get_by_uuid(context, marker)
images = objects.Image.list(context, images = objects.Image.list(context,

2
zun/tests/unit/api/utils.py
View File

@ -26,7 +26,7 @@ def zservice_get_data(**kw):
'id': kw.get('id', 13), 'id': kw.get('id', 13),
'report_count': kw.get('report_count', 13), 'report_count': kw.get('report_count', 13),
'disabled': kw.get('disabled', False), 'disabled': kw.get('disabled', False),
'disabled_reason': kw.get('disabled_reason', None), 'disabled_reason': kw.get('disabled_reason'),
'forced_down': kw.get('forced_down', False), 'forced_down': kw.get('forced_down', False),
'last_seen_at': kw.get('last_seen_at', faketime), 'last_seen_at': kw.get('last_seen_at', faketime),
'created_at': kw.get('created_at', faketime), 'created_at': kw.get('created_at', faketime),