openstack
/
cinder
Code Issues Proposed changes

Replace functions 'Dict.get' and 'del' with 'Dict.pop' 

Refactoring code: Making volume dict to use single instruction: pop()
rather than two instructions: get() and del, giving the codes a format
that carries through.

Change-Id: Ic889dac330eac24d15bd73186fc504402cddd861
Closes-Bug:#1571548
This commit is contained in:
Xu Ao 2016-04-18 16:49:03 +08:00
parent cbc5d499bd
commit dced19aec3
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/api/contrib/backups.py
View File

@ -97,8 +97,7 @@ class BackupsController(wsgi.Controller):
self._get_backup_filter_options())
if 'name' in filters:
filters['display_name'] = filters['name']
del filters['name']
filters['display_name'] = filters.pop('name')
backups = self.backup_api.get_all(context, search_opts=filters,
marker=marker,

3
cinder/api/v2/snapshots.py
View File

@ -94,8 +94,7 @@ class SnapshotsController(wsgi.Controller):
# NOTE(thingee): v2 API allows name instead of display_name
if 'name' in search_opts:
search_opts['display_name'] = search_opts['name']
del search_opts['name']
search_opts['display_name'] = search_opts.pop('name')
snapshots = self.volume_api.get_all_snapshots(context,
search_opts=search_opts,

6
cinder/api/v2/volumes.py
View File

@ -109,8 +109,7 @@ class VolumeController(wsgi.Controller):
sort_keys[sort_keys.index('name')] = 'display_name'
if 'name' in filters:
filters['display_name'] = filters['name']
del filters['name']
filters['display_name'] = filters.pop('name')
self.volume_api.check_volume_filters(filters)
volumes = self.volume_api.get_all(context, marker, limit,
@ -196,8 +195,7 @@ class VolumeController(wsgi.Controller):
volume['display_description'] = volume.pop('description')
if 'image_id' in volume:
volume['imageRef'] = volume.get('image_id')
del volume['image_id']
volume['imageRef'] = volume.pop('image_id')
req_volume_type = volume.get('volume_type', None)
if req_volume_type:

3
cinder/api/v3/volumes.py
View File

@ -43,8 +43,7 @@ class VolumeController(volumes_v2.VolumeController):
sort_keys[sort_keys.index('name')] = 'display_name'
if 'name' in filters:
filters['display_name'] = filters['name']
del filters['name']
filters['display_name'] = filters.pop('name')
strict = req.api_version_request.matches("3.2", None)
self.volume_api.check_volume_filters(filters, strict)