DevStack support

[doctor.git] / doctor_tests / inspector / sample.py

diff --git a/doctor_tests/inspector/sample.py b/doctor_tests/inspector/sample.py
index baf0306..c44db95 100644 (file)
--- a/doctor_tests/inspector/sample.py
+++ b/doctor_tests/inspector/sample.py
@@ -52,7 +52,7 @@ class SampleInspector(BaseInspector):
                                                  driver='messaging',
                                                  topics=['notifications'])
             self.notif = self.notif.prepare(publisher_id='sample')
-        except:
+        except Exception:
             self.notif = None
 
     def _init_novaclients(self):
@@ -72,7 +72,7 @@ class SampleInspector(BaseInspector):
                 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))
+                               % (host, str(server.name)))
             except Exception as e:
                 self.log.info('can not get hostname from server=%s, error=%s'
                               % (server, e))
@@ -135,7 +135,7 @@ class SampleInspector(BaseInspector):
     def maintenance(self, data):
         try:
             payload = self._alarm_traits_decoder(data)
-        except:
+        except Exception:
             payload = ({t[0]: t[2] for t in
                        data['reason_data']['event']['traits']})
             self.log.error('cannot parse alarm data: %s' % payload)