From 7c34d9ecbd17053ca9d14cc518b11e501b66cbeb Mon Sep 17 00:00:00 2001 From: Ryota MIBU Date: Sun, 5 Mar 2017 03:48:38 +0000 Subject: urgent bug fixes for danube (2) - use relevant identity version estimated from OS_AUTH_URL - (apex) unset OS_PROJECT_ID Change-Id: I7e51c7d5510baaa4d14b16600f9efa6fcfc011b9 Signed-off-by: Ryota MIBU --- tests/identity_auth.py | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 tests/identity_auth.py (limited to 'tests/identity_auth.py') diff --git a/tests/identity_auth.py b/tests/identity_auth.py new file mode 100644 index 00000000..4726ca37 --- /dev/null +++ b/tests/identity_auth.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2017 NEC Corporation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +import os + +from keystoneauth1.identity import v2 +from keystoneauth1.identity import v3 + + +def get_identity_auth(): + auth_url = os.environ['OS_AUTH_URL'] + username = os.environ['OS_USERNAME'] + password = os.environ['OS_PASSWORD'] + user_domain_name = os.environ.get('OS_USER_DOMAIN_NAME') + project_name = os.environ.get('OS_PROJECT_NAME') or os.environ.get('OS_TENANT_NAME') + project_domain_name = os.environ.get('OS_PROJECT_DOMAIN_NAME') + if auth_url.endswith('v3'): + return v3.Password(auth_url=auth_url, + username=username, + password=password, + user_domain_name=user_domain_name, + project_name=project_name, + project_domain_name=project_domain_name) + else: + return v2.Password(auth_url=auth_url, + username=username, + password=password, + tenant_name=project_name) -- cgit 1.2.3-korg