openstack/python-cinderclient
Code Issues Proposed changes

Merge "python3: iteration order of dict is unpredictable"

Browse Source
This commit is contained in:
Jenkins
2013-10-17 03:42:02 +00:00
committed by Gerrit Code Review
parent 873bed99a8 68fe7735c0
commit 342022b5cf
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cinderclient/v1/shell.py
View File

@@ -352,7 +352,9 @@ def do_metadata(cs, args):
if args.action == 'set':
cs.volumes.set_metadata(volume, metadata)
elif args.action == 'unset':
cs.volumes.delete_metadata(volume, list(metadata))
# NOTE(zul): Make sure py2/py3 sorting is the same
cs.volumes.delete_metadata(volume, sorted(metadata.keys(),
reverse=True))
@utils.arg(

4
cinderclient/v2/shell.py
View File

@@ -390,7 +390,9 @@ def do_metadata(cs, args):
if args.action == 'set':
cs.volumes.set_metadata(volume, metadata)
elif args.action == 'unset':
cs.volumes.delete_metadata(volume, list(metadata))
# NOTE(zul): Make sure py2/py3 sorting is the same
cs.volumes.delete_metadata(volume, sorted(metadata.keys(),
reverse=True))
@utils.arg('--all-tenants',