X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=doctor_tests%2Finspector%2Fsample.py;h=fadfd3d4a49695800138951c614781d02079ad80;hb=refs%2Fchanges%2F45%2F49445%2F5;hp=114e4ebd2c5804cba6baa021b923d78c342b6fcf;hpb=25759e0a0204765a7a9454d7586df66592e943c2;p=doctor.git

diff --git a/doctor_tests/inspector/sample.py b/doctor_tests/inspector/sample.py
index 114e4ebd..fadfd3d4 100644
--- a/doctor_tests/inspector/sample.py
+++ b/doctor_tests/inspector/sample.py
@@ -35,7 +35,8 @@ class SampleInspector(BaseInspector):
 
         auth = get_identity_auth(project=self.conf.doctor_project)
         session = get_session(auth=auth)
-        self.neutron = neutron_client(session)
+        if self.conf.inspector.update_neutron_port_dp_status:
+            self.neutron = neutron_client(session)
 
         self.servers = collections.defaultdict(list)
         self.hostnames = list()
@@ -57,12 +58,15 @@ class SampleInspector(BaseInspector):
             try:
                 host = server.__dict__.get('OS-EXT-SRV-ATTR:host')
                 self.servers[host].append(server)
-                self.log.debug('get hostname=%s from server=%s' % (host, server))
+                self.log.debug('get hostname=%s from server=%s'
+                               % (host, server))
             except Exception as e:
-                self.log.info('can not get hostname from server=%s' % server)
+                self.log.info('can not get hostname from server=%s, error=%s'
+                              % (server, e))
 
     def get_inspector_url(self):
-        return 'http://%s:%s' % (self.conf.inspector.ip, self.conf.inspector.port)
+        return 'http://%s:%s/events' % (self.conf.inspector.ip,
+                                        self.conf.inspector.port)
 
     def start(self):
         self.log.info('sample inspector start......')
@@ -94,15 +98,18 @@ class SampleInspector(BaseInspector):
                 self.hostnames.append(hostname)
                 thr1 = self._disable_compute_host(hostname)
                 thr2 = self._vms_reset_state('error', hostname)
-                thr3 = self._set_ports_data_plane_status('DOWN', hostname)
+                if self.conf.inspector.update_neutron_port_dp_status:
+                    thr3 = self._set_ports_data_plane_status('DOWN', hostname)
                 thr1.join()
                 thr2.join()
-                thr3.join()
+                if self.conf.inspector.update_neutron_port_dp_status:
+                    thr3.join()
 
     @utils.run_async
     def _disable_compute_host(self, hostname):
         self.nova.services.force_down(hostname, 'nova-compute', True)
-        self.log.info('doctor mark host(%s) down at %s' % (hostname, time.time()))
+        self.log.info('doctor mark host(%s) down at %s'
+                      % (hostname, time.time()))
 
     @utils.run_async
     def _vms_reset_state(self, state, hostname):
@@ -110,7 +117,8 @@ class SampleInspector(BaseInspector):
         @utils.run_async
         def _vm_reset_state(nova, server, state):
             nova.servers.reset_state(server, state)
-            self.log.info('doctor mark vm(%s) error at %s' % (server, time.time()))
+            self.log.info('doctor mark vm(%s) error at %s'
+                          % (server, time.time()))
 
         thrs = []
         for nova, server in zip(self.novaclients, self.servers[hostname]):
@@ -126,7 +134,8 @@ class SampleInspector(BaseInspector):
         @utils.run_async
         def _set_port_data_plane_status(port_id):
             self.neutron.update_port(port_id, body)
-            self.log.info('doctor set data plane status %s on port %s' % (status, port_id))
+            self.log.info('doctor set data plane status %s on port %s'
+                          % (status, port_id))
 
         thrs = []
         params = {'binding:host_id': hostname}
@@ -150,9 +159,11 @@ class InspectorApp(Thread):
 
         @app.route('/events', methods=['PUT'])
         def event_posted():
-            self.log.info('event posted in sample inspector at %s' % time.time())
+            self.log.info('event posted in sample inspector at %s'
+                          % time.time())
             self.log.info('sample inspector = %s' % self.inspector)
-            self.log.info('sample inspector received data = %s' % request.data)
+            self.log.info('sample inspector received data = %s'
+                          % request.data)
             events = json.loads(request.data.decode('utf8'))
             self.inspector.handle_events(events)
             return "OK"