Filtering attachment doesn't support 'instance_id'

Use method 'pop' to replace 'instance_id' with 'instance_uuid'.

Change-Id: I8bcb31c3bdba98e0024d001024ca1504e9263608
Closes-Bug: #1683701
This commit is contained in:
TommyLike
2017-04-18 18:59:24 +08:00
parent 5deca037e4
commit d1e3b6b82e
2 changed files with 7 additions and 3 deletions

View File

@@ -70,10 +70,10 @@ class AttachmentsController(wsgi.Controller):
sort_keys, sort_dirs = common.get_sort_params(search_opts)
marker, limit, offset = common.get_pagination_params(search_opts)
if search_opts.get('instance_id', None):
search_opts['instance_uuid'] = search_opts.get('instance_id')
utils.remove_invalid_filter_options(context, search_opts,
self.allowed_filters)
if search_opts.get('instance_id', None):
search_opts['instance_uuid'] = search_opts.pop('instance_id', None)
if context.is_admin and 'all_tenants' in search_opts:
del search_opts['all_tenants']
return objects.VolumeAttachmentList.get_all(