diff options
Diffstat (limited to 'doctor_tests')
| -rw-r--r-- | doctor_tests/installer/__init__.py | 4 | ||||
| -rw-r--r-- | doctor_tests/installer/daisy.py | 3 | ||||
| -rw-r--r-- | doctor_tests/scenario/fault_management.py | 7 |
3 files changed, 7 insertions, 7 deletions
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.......') |