openstack/cinder
Code Issues Proposed changes

Merge "Fix TypeError for workers cleanup api incase of invalid resource_type value"

Browse Source
This commit is contained in:
Zuul 2017-12-23 17:52:09 +00:00 committed by Gerrit Code Review
commit 42ed288eb7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cinder/api/v3/workers.py
View File

@ -59,9 +59,11 @@ class WorkerController(wsgi.Controller):
resource_type = resource_type.title() resource_type = resource_type.title()
types = cleanable.CinderCleanableObject.cleanable_resource_types types = cleanable.CinderCleanableObject.cleanable_resource_types
if resource_type not in types: if resource_type not in types:
msg = (_('Resource type %s not valid, must be ') % valid_types = utils.build_or_str(types)
resource_type) msg = _('Resource type %(resource_type)s not valid,'
msg = utils.build_or_str(types, msg + '%s.') ' must be %(valid_types)s')
msg = msg % {"resource_type": resource_type,
"valid_types": valid_types}
raise exception.InvalidInput(reason=msg) raise exception.InvalidInput(reason=msg)
params['resource_type'] = resource_type params['resource_type'] = resource_type