openstack/python-barbicanclient
Code Issues Proposed changes

Re-merge CLI test update for auth URL and version

Browse Source 
A merge/move lost these changes.  Restoring them.

Change-Id: I2948ad881109a444bfba7772d303187cdb3a1a89
This commit is contained in:
Steve Heyman
2015-05-14 12:26:19 -05:00
parent 82daee29fb
commit 2b5bd9e685
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
functionaltests/cli/v1/behaviors/base_behaviors.py
View File

@@ -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])