openstack/python-glanceclient
Code Issues Proposed changes

Merge "Make non-boolean check strict"

Browse Source
This commit is contained in:
Jenkins
2015-01-23 14:40:27 +00:00
committed by Gerrit Code Review
parent aebbcff100 6eaaad532a
commit 88f6319b7b
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
glanceclient/v1/shell.py
View File

@@ -16,6 +16,7 @@
from __future__ import print_function from __future__ import print_function
import copy import copy
import functools
import six import six
import sys import sys
@@ -29,6 +30,8 @@ CONTAINER_FORMATS = 'Acceptable formats: ami, ari, aki, bare, and ovf.'
DISK_FORMATS = ('Acceptable formats: ami, ari, aki, vhd, vmdk, raw, ' DISK_FORMATS = ('Acceptable formats: ami, ari, aki, vhd, vmdk, raw, '
'qcow2, vdi, and iso.') 'qcow2, vdi, and iso.')
_bool_strict = functools.partial(strutils.bool_from_string, strict=True)
@utils.arg('--name', metavar='<NAME>', @utils.arg('--name', metavar='<NAME>',
help='Filter images to those that have this name.') help='Filter images to those that have this name.')
@@ -58,7 +61,7 @@ DISK_FORMATS = ('Acceptable formats: ami, ari, aki, vhd, vmdk, raw, '
choices=glanceclient.v1.images.SORT_DIR_VALUES, choices=glanceclient.v1.images.SORT_DIR_VALUES,
help='Sort image list in specified direction.') help='Sort image list in specified direction.')
@utils.arg('--is-public', @utils.arg('--is-public',
type=strutils.bool_from_string, metavar='{True,False}', type=_bool_strict, metavar='{True,False}',
help=('Allows the user to select a listing of public or non ' help=('Allows the user to select a listing of public or non '
'public images.')) 'public images.'))
@utils.arg('--owner', default=None, metavar='<TENANT_ID>', @utils.arg('--owner', default=None, metavar='<TENANT_ID>',
@@ -188,10 +191,10 @@ def do_image_download(gc, args):
' the Glance server should immediately copy the data and' ' the Glance server should immediately copy the data and'
' store it in its configured image store.')) ' store it in its configured image store.'))
@utils.arg('--is-public', @utils.arg('--is-public',
type=strutils.bool_from_string, metavar='{True,False}', type=_bool_strict, metavar='{True,False}',
help='Make image accessible to the public.') help='Make image accessible to the public.')
@utils.arg('--is-protected', @utils.arg('--is-protected',
type=strutils.bool_from_string, metavar='{True,False}', type=_bool_strict, metavar='{True,False}',
help='Prevent image from being deleted.') help='Prevent image from being deleted.')
@utils.arg('--property', metavar="<key=value>", action='append', default=[], @utils.arg('--property', metavar="<key=value>", action='append', default=[],
help=("Arbitrary property to associate with image. " help=("Arbitrary property to associate with image. "
@@ -265,10 +268,10 @@ def do_image_create(gc, args):
' the Glance server should immediately copy the data and' ' the Glance server should immediately copy the data and'
' store it in its configured image store.')) ' store it in its configured image store.'))
@utils.arg('--is-public', @utils.arg('--is-public',
type=strutils.bool_from_string, metavar='{True,False}', type=_bool_strict, metavar='{True,False}',
help='Make image accessible to the public.') help='Make image accessible to the public.')
@utils.arg('--is-protected', @utils.arg('--is-protected',
type=strutils.bool_from_string, metavar='{True,False}', type=_bool_strict, metavar='{True,False}',
help='Prevent image from being deleted.') help='Prevent image from being deleted.')
@utils.arg('--property', metavar="<key=value>", action='append', default=[], @utils.arg('--property', metavar="<key=value>", action='append', default=[],
help=("Arbitrary property to associate with image. " help=("Arbitrary property to associate with image. "