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 <r-mibu@cq.jp.nec.com>

1 files changed, 3 insertions, 7 deletions

diff --git a/tests/inspector.py b/tests/inspector.py
index 27c969e5..ba00f40e 100644
--- a/tests/inspector.py
+++ b/tests/inspector.py
@@ -17,10 +17,11 @@ import os
 import threading
 import time
 
-from keystoneauth1.identity import v3
 from keystoneauth1 import session
 import novaclient.client as novaclient
 
+import identity_auth
+
 LOG = doctor_log.Logger('doctor_inspector').getLogger()
 
 
@@ -49,12 +50,7 @@ class DoctorInspectorSample(object):
     def __init__(self):
         self.servers = collections.defaultdict(list)
         self.novaclients = list()
-        auth = v3.Password(auth_url=os.environ['OS_AUTH_URL'],
-                           username=os.environ['OS_USERNAME'],
-                           password=os.environ['OS_PASSWORD'],
-                           user_domain_name=os.environ['OS_USER_DOMAIN_NAME'],
-                           project_name=os.environ['OS_PROJECT_NAME'],
-                           project_domain_name=os.environ['OS_PROJECT_DOMAIN_NAME'])
+        auth=identity_auth.get_identity_auth()
         sess=session.Session(auth=auth)
         # Pool of novaclients for redundant usage
         for i in range(self.NUMBER_OF_CLIENTS):