X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Finspector.py;h=ba00f40e657b3ea0d925b2c3eddd82c07291f154;hb=7c34d9ecbd17053ca9d14cc518b11e501b66cbeb;hp=129a386af4744f11969faa3184c97c9cd783ad2c;hpb=e1df30c97affb902f651b31910e2aff2e1874bc5;p=doctor.git

diff --git a/tests/inspector.py b/tests/inspector.py
index 129a386a..ba00f40e 100644
--- a/tests/inspector.py
+++ b/tests/inspector.py
@@ -14,28 +14,51 @@ from flask import request
 import json
 import logger as doctor_log
 import os
+import threading
 import time
 
+from keystoneauth1 import session
 import novaclient.client as novaclient
 
-import nova_force_down
+import identity_auth
 
 LOG = doctor_log.Logger('doctor_inspector').getLogger()
 
 
+class ThreadedResetState(threading.Thread):
+
+    def __init__(self, nova, state, server):
+        threading.Thread.__init__(self)
+        self.nova = nova
+        self.state = state
+        self.server = server
+
+    def run(self):
+        self.nova.servers.reset_state(self.server, self.state)
+        LOG.info('doctor mark vm(%s) error at %s' % (self.server, time.time()))
+
+
 class DoctorInspectorSample(object):
 
-    nova_api_version = '2.11'
+    NOVA_API_VERSION = '2.34'
+    NUMBER_OF_CLIENTS = 50
+    # TODO(tojuvone): This could be enhanced in future with dynamic
+    # reuse of self.novaclients when all threads in use and
+    # self.NUMBER_OF_CLIENTS based on amount of cores or overriden by input
+    # argument
 
     def __init__(self):
         self.servers = collections.defaultdict(list)
-        self.nova = novaclient.Client(self.nova_api_version,
-                                      os.environ['OS_USERNAME'],
-                                      os.environ['OS_PASSWORD'],
-                                      os.environ['OS_TENANT_NAME'],
-                                      os.environ['OS_AUTH_URL'],
-                                      connection_pool=True)
-        # check nova is available
+        self.novaclients = list()
+        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))
+        # Normally we use this client for non redundant API calls
+        self.nova=self.novaclients[0]
         self.nova.servers.list(detailed=False)
         self.init_servers_list()
 
@@ -52,17 +75,20 @@ class DoctorInspectorSample(object):
                 LOG.error('can not get hostname from server=%s' % server)
 
     def disable_compute_host(self, hostname):
-        for server in self.servers[hostname]:
-            self.nova.servers.reset_state(server, 'error')
-
-        # NOTE: We use our own client here instead of this novaclient for a
-        #       workaround.  Once keystone provides v2.1 nova api endpoint
-        #       in the service catalog which is configured by OpenStack
-        #       installer, we can use this:
-        #
-        # self.nova.services.force_down(hostname, 'nova-compute', True)
-        #
-        nova_force_down.force_down(hostname)
+        threads = []
+        if len(self.servers[hostname]) > self.NUMBER_OF_CLIENTS:
+            # TODO(tojuvone): This could be enhanced in future with dynamic
+            # reuse of self.novaclients when all threads in use
+            LOG.error('%d servers in %s. Can handle only %d'%(
+                      self.servers[hostname], hostname, self.NUMBER_OF_CLIENTS))
+        for nova, server in zip(self.novaclients, self.servers[hostname]):
+            t = ThreadedResetState(nova, "error", server)
+            t.start()
+            threads.append(t)
+        for t in threads:
+            t.join()
+        self.nova.services.force_down(hostname, 'nova-compute', True)
+        LOG.info('doctor mark host(%s) down at %s' % (hostname, time.time()))
 
 
 app = Flask(__name__)
@@ -75,10 +101,11 @@ def event_posted():
     LOG.info('inspector = %s' % inspector)
     LOG.info('received data = %s' % request.data)
     d = json.loads(request.data)
-    hostname = d['hostname']
-    event_type = d['type']
-    if event_type == 'compute.host.down':
-        inspector.disable_compute_host(hostname)
+    for event in d:
+        hostname = event['details']['hostname']
+        event_type = event['type']
+        if event_type == 'compute.host.down':
+            inspector.disable_compute_host(hostname)
     return "OK"