openstack/cinder
Code Issues Proposed changes

Fix TypeError for workers cleanup api incase of invalid resource_type value

Browse Source 
Workers cleanup API fails to build exception message if invalid resource_type
value other than ['snapshot', 'volume'] is passed and raises TypeError
which gets wrapped into BadRequest at wsgi level.

This patch modifies exception message to fix TypeError issue.

Closes-Bug: #1734252
Change-Id: I5823547c88edb4a1cc9ea5a51c9bf301daf41257
This commit is contained in:
Neha Alhat 2017-11-24 14:56:24 +05:30
parent adbe9b4f02
commit 72b96ee9df
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