diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-20 07:00:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-20 07:00:10 +0000 |
| commit | f67ae704012ec49bb937131b2c3dd7e467e055a4 (patch) | |
| tree | 8a0f66a00c002440727c321bf3d8d4fbe3d8c3e9 | |
| parent | 8f1e12eabf1d9541e1a26751401c0712bdfa246b (diff) | |
| parent | 2b5bd9e685a57e8cd9a794fd04312fb44a99ad87 (diff) | |
| download | python-barbicanclient-f67ae704012ec49bb937131b2c3dd7e467e055a4.tar.gz | |
Merge "Re-merge CLI test update for auth URL and version"
| -rw-r--r-- | functionaltests/cli/v1/behaviors/base_behaviors.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/functionaltests/cli/v1/behaviors/base_behaviors.py b/functionaltests/cli/v1/behaviors/base_behaviors.py index bc19d03..3514e6c 100644 --- a/functionaltests/cli/v1/behaviors/base_behaviors.py +++ b/functionaltests/cli/v1/behaviors/base_behaviors.py @@ -46,20 +46,22 @@ class BaseBehaviors(object): :return: the argument list is updated with the authentication and endpoint args """ + if 'v3' in CONF.identity.auth_version.lower(): arg_list.extend(['--os-auth-url', CONF.identity.uri_v3]) - arg_list.extend( - ['--os-project-name', CONF.keymanager.project_name]) + arg_list.extend(['--os-project-name', CONF.keymanager.project_name]) # NOTE(jaosorior): Should we add the user_domain_name to the - # config? + # config? arg_list.extend( ['--os-user-domain-name', CONF.keymanager.project_domain_name]) 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]) |