openstack
/
cinder
Code Issues Proposed changes

Allow display_name for v2 snapshot-update 

According to the comment in the source code, the snapshot-update of
v2 would be able to allow either "name" or "display_name" parameter.
And if both paramters are specified, "name" parameter is effective
over "display_name" like "description" parameter.
However "display_name" parameter is ignored now, because cinder writes
over empty dict(update_dict['display_name']).

This patch fixes the problem.

Fixes bug #1226398

Change-Id: Icd48556a26b9346f73b7c1b82ffbcdd469c4d28d
This commit is contained in:
Ken'ichi Ohmichi 2013-09-17 13:29:51 +09:00
parent 2a725ef15d
commit 622f10e87f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,9 +232,15 @@ class SnapshotsController(wsgi.Controller):
valid_update_keys = (
'name',
'description',
'display_name',
'display_description',
)
# NOTE(thingee): v2 API allows name instead of display_name
if 'name' in snapshot:
snapshot['display_name'] = snapshot['name']
del snapshot['name']
# NOTE(thingee): v2 API allows description instead of
# display_description
if 'description' in snapshot:
@ -245,11 +251,6 @@ class SnapshotsController(wsgi.Controller):
if key in snapshot:
update_dict[key] = snapshot[key]
# NOTE(thingee): v2 API allows name instead of display_name
if 'name' in update_dict:
update_dict['display_name'] = update_dict['name']
del update_dict['name']
try:
snapshot = self.volume_api.get_snapshot(context, id)
self.volume_api.update_snapshot(context, snapshot, update_dict)