openstack
/
python-novaclient
Code Issues Proposed changes

Merge "Turn multiple hints with the same key into a list"

This commit is contained in:
Jenkins 2012-06-27 16:51:51 +00:00 committed by Gerrit Code Review
parent 24ad114d3b 7546198cb0
commit b7c51840b9
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
novaclient/v1_1/shell.py
View File

@ -97,12 +97,16 @@ def _boot(cs, args, reservation_id=None, min_count=None, max_count=None):
hints = {}
if args.scheduler_hints:
parsed_hints = [hint.split('=', 1) for hint in args.scheduler_hints]
hint_set = [dict({hint[0]: hint[1]}) for hint in parsed_hints]
for hint in hint_set:
hints.update(hint.items())
else:
hints = {}
for hint in args.scheduler_hints:
key, _sep, value = hint.partition('=')
# NOTE(vish): multiple copies of the same hint will
# result in a list of values
if key in hints:
if isinstance(hints[key], basestring):
hints[key] = [hints[key]]
hints[key] += [value]
else:
hints[key] = value
boot_args = [args.name, image, flavor]
if str(args.config_drive).lower() in ("true", "1"):