summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Heyman <steve.heyman@rackspace.com>2015-05-11 14:11:29 -0500
committerSteve Heyman <steve.heyman@rackspace.com>2015-05-11 14:11:29 -0500
commit70da0d01f1da50c76231565548f730d3141c76e5 (patch)
tree1a5bac44a5c7a062fb659deab2169ce0352c2699
parent988c1380ff49b3d267bb64c71699708794966fd5 (diff)
downloadpython-barbicanclient-70da0d01f1da50c76231565548f730d3141c76e5.tar.gz
Pass in keystone version and correct v2 URL to CLI
CLI tests for auth v2 were using the wrong URL, should be CONF.identity.uri and not CONF.identity.auth_uri. Also the CLI requires the keystone version to be pass in (ie "3.0" for keystone v3). Change-Id: I7fd3994022bf4f4575cbffb75f48042d889792a9
-rw-r--r--functionaltests/cli/base.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/functionaltests/cli/base.py b/functionaltests/cli/base.py
index 22b9b4f..6f7384b 100644
--- a/functionaltests/cli/base.py
+++ b/functionaltests/cli/base.py
@@ -60,9 +60,11 @@ class CmdLineTestCase(BaseTestCase):
arg_list.extend(
['--os-project-domain-name',
CONF.keymanager.project_domain_name])
+ arg_list.extend(['--os-identity-api-version', '3.0'])
else:
- arg_list.extend(['--os-auth-url', CONF.identity.auth_uri])
+ arg_list.extend(['--os-auth-url', CONF.identity.uri])
arg_list.extend(['--os-tenant-name', CONF.keymanager.project_name])
+ arg_list.extend(['--os-identity-api-version', '2.0'])
arg_list.extend(['--os-username', CONF.keymanager.username,
'--os-password', CONF.keymanager.password])