openstack/python-glanceclient
Code Issues Proposed changes

Merge "Use common identity parameters fro keystone client"

Browse Source
This commit is contained in:
Jenkins 2015-11-05 14:50:55 +00:00 committed by Gerrit Code Review
commit fcd9ab5769
1 changed files with 6 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
glanceclient/shell.py
View File

@ -52,101 +52,21 @@ SUPPORTED_VERSIONS = [1, 2]
class OpenStackImagesShell(object): class OpenStackImagesShell(object):
def _append_global_identity_args(self, parser): def _append_global_identity_args(self, parser):
# FIXME(bobt): these are global identity (Keystone) arguments which # register common identity args
# should be consistent and shared by all service clients. Therefore, session.Session.register_cli_options(parser)
# they should be provided by python-keystoneclient. We will need to v3_auth.Password.register_argparse_arguments(parser)
# refactor this code once this functionality is avaible in
# python-keystoneclient. See
#
# https://bugs.launchpad.net/python-keystoneclient/+bug/1332337
#
parser.add_argument('-k', '--insecure',
default=False,
action='store_true',
help='Explicitly allow glanceclient to perform '
'\"insecure SSL\" (https) requests. The server\'s '
'certificate will not be verified against any '
'certificate authorities. This option should '
'be used with caution.')
parser.add_argument('--os-cert',
help='Path of certificate file to use in SSL '
'connection. This file can optionally be '
'prepended with the private key.')
parser.add_argument('--cert-file',
dest='os_cert',
help='DEPRECATED! Use --os-cert.')
parser.add_argument('--os-key',
help='Path of client key to use in SSL '
'connection. This option is not necessary '
'if your key is prepended to your cert file.')
parser.add_argument('--key-file', parser.add_argument('--key-file',
dest='os_key', dest='os_key',
help='DEPRECATED! Use --os-key.') help='DEPRECATED! Use --os-key.')
parser.add_argument('--os-cacert',
metavar='<ca-certificate-file>',
dest='os_cacert',
default=utils.env('OS_CACERT'),
help='Path of CA TLS certificate(s) used to '
'verify the remote server\'s certificate. '
'Without this option glance looks for the '
'default system CA certificates.')
parser.add_argument('--ca-file', parser.add_argument('--ca-file',
dest='os_cacert', dest='os_cacert',
help='DEPRECATED! Use --os-cacert.') help='DEPRECATED! Use --os-cacert.')
parser.add_argument('--os-username', parser.add_argument('--cert-file',
default=utils.env('OS_USERNAME'), dest='os_cert',
help='Defaults to env[OS_USERNAME].') help='DEPRECATED! Use --os-cert.')
parser.add_argument('--os_username',
help=argparse.SUPPRESS)
parser.add_argument('--os-user-id',
default=utils.env('OS_USER_ID'),
help='Defaults to env[OS_USER_ID].')
parser.add_argument('--os-user-domain-id',
default=utils.env('OS_USER_DOMAIN_ID'),
help='Defaults to env[OS_USER_DOMAIN_ID].')
parser.add_argument('--os-user-domain-name',
default=utils.env('OS_USER_DOMAIN_NAME'),
help='Defaults to env[OS_USER_DOMAIN_NAME].')
parser.add_argument('--os-project-id',
default=utils.env('OS_PROJECT_ID'),
help='Another way to specify tenant ID. '
'This option is mutually exclusive with '
' --os-tenant-id. '
'Defaults to env[OS_PROJECT_ID].')
parser.add_argument('--os-project-name',
default=utils.env('OS_PROJECT_NAME'),
help='Another way to specify tenant name. '
'This option is mutually exclusive with '
' --os-tenant-name. '
'Defaults to env[OS_PROJECT_NAME].')
parser.add_argument('--os-project-domain-id',
default=utils.env('OS_PROJECT_DOMAIN_ID'),
help='Defaults to env[OS_PROJECT_DOMAIN_ID].')
parser.add_argument('--os-project-domain-name',
default=utils.env('OS_PROJECT_DOMAIN_NAME'),
help='Defaults to env[OS_PROJECT_DOMAIN_NAME].')
parser.add_argument('--os-password',
default=utils.env('OS_PASSWORD'),
help='Defaults to env[OS_PASSWORD].')
parser.add_argument('--os_password',
help=argparse.SUPPRESS)
parser.add_argument('--os-tenant-id', parser.add_argument('--os-tenant-id',
default=utils.env('OS_TENANT_ID'), default=utils.env('OS_TENANT_ID'),
@ -162,13 +82,6 @@ class OpenStackImagesShell(object):
parser.add_argument('--os_tenant_name', parser.add_argument('--os_tenant_name',
help=argparse.SUPPRESS) help=argparse.SUPPRESS)
parser.add_argument('--os-auth-url',
default=utils.env('OS_AUTH_URL'),
help='Defaults to env[OS_AUTH_URL].')
parser.add_argument('--os_auth_url',
help=argparse.SUPPRESS)
parser.add_argument('--os-region-name', parser.add_argument('--os-region-name',
default=utils.env('OS_REGION_NAME'), default=utils.env('OS_REGION_NAME'),
help='Defaults to env[OS_REGION_NAME].') help='Defaults to env[OS_REGION_NAME].')
@ -233,10 +146,6 @@ class OpenStackImagesShell(object):
'of schema that generates portions of the ' 'of schema that generates portions of the '
'help text. Ignored with API version 1.') 'help text. Ignored with API version 1.')
parser.add_argument('--timeout',
default=600,
help='Number of seconds to wait for a response.')
parser.add_argument('--no-ssl-compression', parser.add_argument('--no-ssl-compression',
dest='ssl_compression', dest='ssl_compression',
default=True, action='store_false', default=True, action='store_false',
@ -285,7 +194,6 @@ class OpenStackImagesShell(object):
'the profiling will not be triggered even ' 'the profiling will not be triggered even '
'if osprofiler is enabled on server side.') 'if osprofiler is enabled on server side.')
# FIXME(bobt): this method should come from python-keystoneclient
self._append_global_identity_args(parser) self._append_global_identity_args(parser)
return parser return parser