diff options
| author |   dongwenjuan <dong.wenjuan@zte.com.cn> | 2018-10-25 11:23:58 +0800 |
|---|---|---|
| committer |   Tomi Juvonen <tomi.juvonen@nokia.com> | 2018-10-29 12:51:41 +0000 |
| commit | a7517dda9ede8bedadcbcedf7a46187268977d3a (patch) | |
| tree | 113f123f9b26c20eb6681863242569edbbb7eb4a | |
| parent | bec932db65949fb4c8356c590efc85eda6845c00 (diff) | |
fix the username to login undercloud in Apex
Change-Id: I6d5325166db642b3481a0327f518ec821a8ab378
Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
(cherry picked from commit 2a1d82ade82c3076a630af41da493da5a606993d)
| -rw-r--r-- | doctor_tests/installer/__init__.py | 4 | ||||
| -rw-r--r-- | doctor_tests/installer/apex.py | 3 | ||||
| -rw-r--r-- | doctor_tests/installer/daisy.py | 3 | ||||
| -rw-r--r-- | doctor_tests/scenario/fault_management.py | 7 |
4 files changed, 9 insertions, 8 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/apex.py b/doctor_tests/installer/apex.py index 694adb88..31850a74 100644 --- a/doctor_tests/installer/apex.py +++ b/doctor_tests/installer/apex.py @@ -16,6 +16,7 @@ from doctor_tests.installer.base import BaseInstaller class ApexInstaller(BaseInstaller): node_user_name = 'heat-admin' + installer_username = 'stack' cm_set_script = 'set_config.py' nc_set_compute_script = 'set_compute_config.py' cg_set_script = 'set_congress.py' @@ -26,7 +27,7 @@ class ApexInstaller(BaseInstaller): def __init__(self, conf, log): super(ApexInstaller, self).__init__(conf, log) self.client = SSHClient(self.conf.installer.ip, - self.conf.installer.username, + self.installer_username, key_filename=self.conf.installer.key_file, look_for_keys=True) self.key_file = None 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.......') |