openstack
/
deb-python-cinderclient
Code Issues Proposed changes

Fix attribute errors in os-auth-* settings 

This fixes some wording and formatting issues with the help
text that is printed for CLI arguments.

The duplication of default values for os-auth-system appears
to lead to attribute errors requiring explicitly unsetting
OS_AUTH_TYPE.

Closes-bug: #1695054
Change-Id: I0263ef2fb15744f7e352c7365e7d9e61c1ebc974
This commit is contained in:
Sean McGinnis 2017-05-31 05:57:45 -05:00
parent 4f13909239
commit 7a0694084f
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinderclient/shell.py
View File

@ -143,9 +143,8 @@ class OpenStackCinderShell(object):
parser.add_argument('--os-auth-system',
metavar='<os-auth-system>',
dest='os_auth_type',
default=utils.env('OS_AUTH_SYSTEM',
default=utils.env('OS_AUTH_TYPE')),
help=_('DEPRECATED! Use --os-auth-type.'
default=utils.env('OS_AUTH_SYSTEM'),
help=_('DEPRECATED! Use --os-auth-type. '
'Defaults to env[OS_AUTH_SYSTEM].'))
parser.add_argument('--os_auth_system',
help=argparse.SUPPRESS)

8
cinderclient/v3/shell.py
View File

@ -214,14 +214,14 @@ def do_list(cs, args):
"exercise caution when using. Default=None, that means the "
"state is unchanged."))
@utils.arg('--attach-status', metavar='<attach-status>', default=None,
help=('This only used in volume entity. The attach status to '
'assign to the volume in the DataBase, with no regard to '
'the actual status. Valid values are "attached" and '
help=('This is only used for a volume entity. The attach status '
'to assign to the volume in the database, with no regard '
'to the actual status. Valid values are "attached" and '
'"detached". Default=None, that means the status '
'is unchanged.'))
@utils.arg('--reset-migration-status',
action='store_true',
help=('This only used in volume entity. Clears the migration '
help=('This is only used for a volume entity. Clears the migration '
'status of the volume in the DataBase that indicates the '
'volume is source or destination of volume migration, '
'with no regard to the actual status.'))