openstack/python-cinderclient
Code Issues Proposed changes

Use shared shell arguments provided by Session

Browse Source 
The cinderclient implemented it's own version of the CLI arguments that
are now provided by keystoneclient's session object. This changeset
converts cinder over to utilizing the shared argument registration.

Closes-Bug: 1434105
Change-Id: I72b16aab909d72a47097434436093e616667634a
This commit is contained in:
Michal Dulko
2015-03-19 15:27:16 +01:00
parent f32684747f
commit 891ef3e71e
1 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
cinderclient/shell.py
View File

@@ -361,18 +361,6 @@ class OpenStackCinderShell(object):
default=utils.env('OS_PROJECT_DOMAIN_NAME'),
help='Defaults to env[OS_PROJECT_DOMAIN_NAME].')
parser.add_argument(
'--os-cert',
metavar='<certificate>',
default=utils.env('OS_CERT'),
help='Defaults to env[OS_CERT].')
parser.add_argument(
'--os-key',
metavar='<key>',
default=utils.env('OS_KEY'),
help='Defaults to env[OS_KEY].')
parser.add_argument('--os-region-name',
metavar='<region-name>',
default=utils.env('OS_REGION_NAME',
@@ -398,19 +386,10 @@ class OpenStackCinderShell(object):
'--os_url',
help=argparse.SUPPRESS)
parser.add_argument(
'--os-cacert',
metavar='<ca-certificate>',
default=utils.env('OS_CACERT', default=None),
help=_("Specify a CA bundle file to use in "
"verifying a TLS (https) server certificate. "
"Defaults to env[OS_CACERT]"))
parser.add_argument('--insecure',
default=utils.env('CINDERCLIENT_INSECURE',
default=False),
action='store_true',
help=argparse.SUPPRESS)
# Register the CLI arguments that have moved to the session object.
session.Session.register_cli_options(parser)
parser.set_defaults(insecure=utils.env('CINDERCLIENT_INSECURE',
default=False))
def get_subcommand_parser(self, version):
parser = self.get_base_parser()