openstack/python-keystoneclient
Code Issues Proposed changes

check creds before token/endpoint (bug 1076233)

Browse Source 
Change-Id: I09894b3fd94d18b192efca8742b09c3ceaad9895
This commit is contained in:
Dolph Mathews
2012-11-07 23:26:31 -06:00
parent f9a7d9f3a8
commit 8508b3e859
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

@@ -289,20 +289,6 @@ class OpenStackIdentityShell(object):
'ignored).')
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
# but is missing something
if (not (args.os_token and args.os_endpoint)
@@ -335,6 +321,20 @@ class OpenStackIdentityShell(object):
'Expecting an auth URL via either --os-auth-url or '
'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):
self.cs = shell_generic.CLIENT_CLASS(endpoint=args.os_auth_url,
cacert=args.os_cacert,