Fix host status grep bug and Remove connection_pool argument

[doctor.git] / tests / inspector.py

diff --git a/tests/inspector.py b/tests/inspector.py
index 27c969e..a61051f 100644 (file)
--- a/tests/inspector.py
+++ b/tests/inspector.py
@@ -13,14 +13,14 @@ from flask import Flask
 from flask import request
 import json
 import logger as doctor_log
-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,18 +49,12 @@ 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):
             self.novaclients.append(
-                novaclient.Client(self.NOVA_API_VERSION, session=sess,
-                                  connection_pool=True))
+                novaclient.Client(self.NOVA_API_VERSION, session=sess))
         # Normally we use this client for non redundant API calls
         self.nova=self.novaclients[0]
         self.nova.servers.list(detailed=False)