From: Tomi Juvonen <tomi.juvonen@nokia.com>
Date: Thu, 25 Oct 2018 13:36:16 +0000 (+0000)
Subject: Merge "Support Apex with services in containers"
X-Git-Tag: opnfv-8.0.0~20
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=baac6579556f8216b36db0d0f87f9c2d4f8b4ef5;hp=a6575910a137f8932e294f66c9da3194ad937691;p=doctor.git

Merge "Support Apex with services in containers"
---

diff --git a/doctor_tests/installer/__init__.py b/doctor_tests/installer/__init__.py
index ee44018c..2b9ad83d 100644
--- a/doctor_tests/installer/__init__.py
+++ b/doctor_tests/installer/__init__.py
@@ -20,10 +20,6 @@ OPTS = [
     cfg.StrOpt('ip',
                default=os.environ.get('INSTALLER_IP', '127.0.0.1'),
                help='the ip of installer'),
-    cfg.StrOpt('username',
-               default='root',
-               help='the user name for login installer server',
-               required=True),
     cfg.StrOpt('key_file',
                default=os.environ.get('SSH_KEY', None),
                help='the key for user to login installer server',
diff --git a/doctor_tests/installer/daisy.py b/doctor_tests/installer/daisy.py
index 52ccb7c8..e4499d9c 100644
--- a/doctor_tests/installer/daisy.py
+++ b/doctor_tests/installer/daisy.py
@@ -12,11 +12,12 @@ from doctor_tests.installer.base import BaseInstaller
 
 class DaisyInstaller(BaseInstaller):
     node_user_name = 'root'
+    installer_username = 'root'
 
     def __init__(self, conf, log):
         super(DaisyInstaller, self).__init__(conf, log)
         self.client = SSHClient(self.conf.installer.ip,
-                                self.conf.installer.username,
+                                self.installer_username,
                                 password='r00tme')
         self.key_file = None
         self.controllers = list()
diff --git a/doctor_tests/scenario/fault_management.py b/doctor_tests/scenario/fault_management.py
index ee3bf5f1..869311bd 100644
--- a/doctor_tests/scenario/fault_management.py
+++ b/doctor_tests/scenario/fault_management.py
@@ -180,9 +180,12 @@ class FaultManagement(object):
         notification_time = \
             self.consumer.notified_time - \
             self.monitor.detected_time
+
+        self.log.info('doctor fault management notification_time=%s'
+                      % notification_time)
+
         if notification_time < 1 and notification_time > 0:
-            self.log.info('doctor fault management test successfully,'
-                          'notification_time=%s' % notification_time)
+            self.log.info('doctor fault management test successfully')
         else:
             if self.conf.profiler_type:
                 self.log.info('run doctor fault management profile.......')