summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authordongwenjuan <dong.wenjuan@zte.com.cn>2017-05-15 15:31:31 +0800
committerdongwenjuan <dong.wenjuan@zte.com.cn>2017-05-15 15:31:31 +0800
commitf77107087079caa9b1602be6308d98107c9639b8 (patch)
tree542d852b6e53c4c9604e1b50228f820512cb6cff /tests
parentd5918a87f12fdef9bd7408c4554c42606c4896d8 (diff)
use password_plugin_loader for auth
Change-Id: Ifb650f52fed641a7146358eada571e5c4beaf3d6 Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
Diffstat (limited to 'tests')
-rw-r--r--tests/identity_auth.py25
1 files changed, 11 insertions, 14 deletions
diff --git a/tests/identity_auth.py b/tests/identity_auth.py
index 0031caec..a40c41cf 100644
--- a/tests/identity_auth.py
+++ b/tests/identity_auth.py
@@ -9,8 +9,7 @@
import os
-from keystoneauth1.identity import v2
-from keystoneauth1.identity import v3
+from keystoneauth1 import loading
from keystoneauth1 import session
@@ -21,18 +20,16 @@ def get_identity_auth():
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)
+
+ loader = loading.get_plugin_loader('password')
+ return loader.load_from_options(
+ auth_url=auth_url,
+ username=username,
+ password=password,
+ user_domain_name=user_domain_name,
+ project_name=project_name,
+ tenant_name=project_name,
+ project_domain_name=project_domain_name)
def get_session(auth=None):