Fix glanceclient usage inconsistences for options

Enumerated options should have the same format for all enumerated options.

This commit moves all options to the {option1,option2} format.

fixes bug: #1155171

Change-Id: I8e0ecf3896c76021cb027cbbbb3b5564a04aacec
This commit is contained in:
Gabe Westmaas 2013-08-25 01:14:07 +00:00
parent b15c57c4a2
commit b6e117f151

@ -64,7 +64,7 @@ DISK_FORMATS = ('Acceptable formats: ami, ari, aki, vhd, vmdk, raw, '
@utils.arg('--sort-dir', default='asc',
choices=glanceclient.v1.images.SORT_DIR_VALUES,
help='Sort image list in specified direction.')
@utils.arg('--is-public', type=utils.string_to_bool, metavar='{True|False}',
@utils.arg('--is-public', type=utils.string_to_bool, metavar='{True,False}',
help=('Allows the user to select a listing of public or non '
'public images.'))
@utils.arg('--owner', default=None, metavar='<TENANT_ID>',
@ -215,9 +215,9 @@ def do_image_download(gc, args):
# to use --is-public
@utils.arg('--public', action='store_true', default=False,
help=argparse.SUPPRESS)
@utils.arg('--is-public', type=utils.string_to_bool, metavar='[True|False]',
@utils.arg('--is-public', type=utils.string_to_bool, metavar='{True,False}',
help='Make image accessible to the public.')
@utils.arg('--is-protected', type=utils.string_to_bool, metavar='[True|False]',
@utils.arg('--is-protected', type=utils.string_to_bool, metavar='{True,False}',
help='Prevent image from being deleted.')
@utils.arg('--property', metavar="<key=value>", action='append', default=[],
help=("Arbitrary property to associate with image. "
@ -287,9 +287,9 @@ def do_image_create(gc, args):
help=('Similar to \'--location\' in usage, but this indicates that'
' the Glance server should immediately copy the data and'
' store it in its configured image store.'))
@utils.arg('--is-public', type=utils.string_to_bool, metavar='[True|False]',
@utils.arg('--is-public', type=utils.string_to_bool, metavar='{True,False}',
help='Make image accessible to the public.')
@utils.arg('--is-protected', type=utils.string_to_bool, metavar='[True|False]',
@utils.arg('--is-protected', type=utils.string_to_bool, metavar='{True,False}',
help='Prevent image from being deleted.')
@utils.arg('--property', metavar="<key=value>", action='append', default=[],
help=("Arbitrary property to associate with image. "