From 183dee7dc0d1c5086ad5d919b7eba955d1d011e9 Mon Sep 17 00:00:00 2001 From: dongwenjuan Date: Wed, 10 May 2017 15:21:38 +0800 Subject: Add create instances JIRA: DOCTOR-93 Change-Id: I7645c1cc0c76ff86b9fbcc01c19038469fc9b9b4 Signed-off-by: dongwenjuan --- tests/identity_auth.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tests/identity_auth.py') diff --git a/tests/identity_auth.py b/tests/identity_auth.py index ffecc68a..c94893f4 100644 --- a/tests/identity_auth.py +++ b/tests/identity_auth.py @@ -13,13 +13,14 @@ from keystoneauth1 import loading from keystoneauth1 import session -def get_identity_auth(): +def get_identity_auth(username=None, password=None, project=None): auth_url = os.environ['OS_AUTH_URL'] - username = os.environ['OS_USERNAME'] - password = os.environ['OS_PASSWORD'] + username = username or os.environ['OS_USERNAME'] + password = password or os.environ['OS_PASSWORD'] user_domain_name = os.environ.get('OS_USER_DOMAIN_NAME') or 'default' user_domain_id = os.environ.get('OS_USER_DOMAIN_ID') or 'default' - project_name = os.environ.get('OS_PROJECT_NAME') or os.environ.get('OS_TENANT_NAME') + project_name = project or os.environ.get('OS_PROJECT_NAME') \ + or os.environ.get('OS_TENANT_NAME') project_domain_name = os.environ.get('OS_PROJECT_DOMAIN_NAME') or 'default' project_domain_id = os.environ.get('OS_PROJECT_DOMAIN_ID') or 'default' -- cgit 1.2.3-korg