openstack
/
manila
Code Issues Proposed changes

Remove name and description from the search_options list. 

Since the "name", "name~" and "description", "description~" are both
converted to "display_name", "display_name~" and "display_description",
"display_description~" beforehand,So I think there is no need to keep
the param "name" and "description" in the share search option list and
snapshot search option list.

Change-Id: If4dc3c6b978193f2f4be68a46b9dbe4e2b79fa9a
Closes-bug: #1715290
This commit is contained in:
junboli 2017-08-28 18:45:14 +08:00 committed by junbo.li
parent 1bd85a4683
commit 4263bc20e2
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manila/api/v1/share_snapshots.py
View File

@ -135,9 +135,8 @@ class ShareSnapshotMixin(object):
def _get_snapshots_search_options(self):
"""Return share snapshot search options allowed by non-admin."""
return ('display_name', 'name', 'status', 'share_id', 'size',
'display_name~', 'display_description~', 'description',
'display_description')
return ('display_name', 'status', 'share_id', 'size', 'display_name~',
'display_description~', 'display_description')
def update(self, req, id, body):
"""Update a snapshot."""

6
manila/api/v1/shares.py
View File

@ -179,9 +179,9 @@ class ShareMixin(object):
'display_name', 'status', 'share_server_id', 'volume_type_id',
'share_type_id', 'snapshot_id', 'host', 'share_network_id',
'is_public', 'metadata', 'extra_specs', 'sort_key', 'sort_dir',
'share_group_id', 'share_group_snapshot_id',
'export_location_id', 'export_location_path', 'display_name~',
'display_description~', 'description', 'display_description'
'share_group_id', 'share_group_snapshot_id', 'export_location_id',
'export_location_path', 'display_name~', 'display_description~',
'display_description'
)
def update(self, req, id, body):