openstack/python-keystoneclient
Code Issues Proposed changes

Merge "check creds before token/endpoint (bug 1076233)"

Browse Source
This commit is contained in:
Jenkins
2012-11-16 17:29:05 +00:00
committed by Gerrit Code Review
parent 332a13396d 8508b3e859
commit 677ff3c520
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
keystoneclient/shell.py
View File

@@ -299,20 +299,6 @@ class OpenStackIdentityShell(object):
'ignored).') 'ignored).')
print msg print msg
# if it looks like the user wants to provide a service token
# but is missing something
if args.os_token or args.os_endpoint and not (
args.os_token and args.os_endpoint):
if not args.os_token:
raise exc.CommandError(
'Expecting a token provided via either --os-token or '
'env[OS_SERVICE_TOKEN]')
if not args.os_endpoint:
raise exc.CommandError(
'Expecting an endpoint provided via either '
'--os-endpoint or env[OS_SERVICE_ENDPOINT]')
# if it looks like the user wants to provide a credentials # if it looks like the user wants to provide a credentials
# but is missing something # but is missing something
if (not (args.os_token and args.os_endpoint) if (not (args.os_token and args.os_endpoint)
@@ -345,6 +331,20 @@ class OpenStackIdentityShell(object):
'Expecting an auth URL via either --os-auth-url or ' 'Expecting an auth URL via either --os-auth-url or '
'env[OS_AUTH_URL]') 'env[OS_AUTH_URL]')
# if it looks like the user wants to provide a service token
# but is missing something
if args.os_token or args.os_endpoint and not (
args.os_token and args.os_endpoint):
if not args.os_token:
raise exc.CommandError(
'Expecting a token provided via either --os-token or '
'env[OS_SERVICE_TOKEN]')
if not args.os_endpoint:
raise exc.CommandError(
'Expecting an endpoint provided via either '
'--os-endpoint or env[OS_SERVICE_ENDPOINT]')
if utils.isunauthenticated(args.func): if utils.isunauthenticated(args.func):
self.cs = shell_generic.CLIENT_CLASS(endpoint=args.os_auth_url, self.cs = shell_generic.CLIENT_CLASS(endpoint=args.os_auth_url,
cacert=args.os_cacert, cacert=args.os_cacert,