From 8508b3e859af5806dc87af6a90b35877eb3c12ff Mon Sep 17 00:00:00 2001 From: Dolph Mathews Date: Wed, 7 Nov 2012 23:26:31 -0600 Subject: [PATCH] check creds before token/endpoint (bug 1076233) Change-Id: I09894b3fd94d18b192efca8742b09c3ceaad9895 --- keystoneclient/shell.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/keystoneclient/shell.py b/keystoneclient/shell.py index bccef7ba1..56e8a9229 100644 --- a/keystoneclient/shell.py +++ b/keystoneclient/shell.py @@ -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,