diff options
author | wym_libra <yimin.wang@huawei.com> | 2015-12-31 20:02:09 +0800 |
---|---|---|
committer | qi liang <liangqi1@huawei.com> | 2016-01-10 03:22:44 +0000 |
commit | 4f4edd840823ff6a0151e3f5220241183e27e560 (patch) | |
tree | c483de22d9abbf14f7ebf932170f666d89e6035a /yardstick/benchmark/scenarios/availability/monitor/basemonitor.py | |
parent | 2733defda816a84d2b9c2e361a5970b9de4923f4 (diff) |
The secondi HA test case-shutdown controller
1) add "attacker_baremetal.py" for fault injection
2) modify the monitor to excute on remote node after ssh connection
3) move all shell scripts together
JIRA: YARDSTICK-182
Change-Id: Ibb9dc908224ddb8b99a0140b75c1a046503f6dfb
Signed-off-by: wym_libra <yimin.wang@huawei.com>
Diffstat (limited to 'yardstick/benchmark/scenarios/availability/monitor/basemonitor.py')
-rw-r--r-- | yardstick/benchmark/scenarios/availability/monitor/basemonitor.py | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/yardstick/benchmark/scenarios/availability/monitor/basemonitor.py b/yardstick/benchmark/scenarios/availability/monitor/basemonitor.py index 25990ac8c..983c3a3ac 100644 --- a/yardstick/benchmark/scenarios/availability/monitor/basemonitor.py +++ b/yardstick/benchmark/scenarios/availability/monitor/basemonitor.py @@ -16,10 +16,40 @@ import yardstick.common.utils as utils LOG = logging.getLogger(__name__) monitor_conf_path = pkg_resources.resource_filename( - "yardstick.benchmark.scenarios.availability.monitor", + "yardstick.benchmark.scenarios.availability", "monitor_conf.yaml") +class MonitorMgr(object): + """docstring for MonitorMgr""" + def __init__(self): + self._monitor_list = [] + + def init_monitors(self, monitor_cfgs, context): + LOG.debug("monitorMgr config: %s" % monitor_cfgs) + + for monitor_cfg in monitor_cfgs: + monitor_type = monitor_cfg["monitor_type"] + monitor_cls = BaseMonitor.get_monitor_cls(monitor_type) + monitor_ins = monitor_cls(monitor_cfg, context) + + self._monitor_list.append(monitor_ins) + + def start_monitors(self): + for _monotor_instace in self._monitor_list: + _monotor_instace.start_monitor() + + def wait_monitors(self): + for monitor in self._monitor_list: + monitor.wait_monitor() + + def verify_SLA(self): + sla_pass = True + for monitor in self._monitor_list: + sla_pass = sla_pass & monitor.verify_SLA() + return sla_pass + + class BaseMonitor(multiprocessing.Process): """docstring for BaseMonitor""" @@ -108,33 +138,3 @@ class BaseMonitor(multiprocessing.Process): def verify_SLA(self): pass - - -class MonitorMgr(object): - """docstring for MonitorMgr""" - def __init__(self): - self._monitor_list = [] - - def init_monitors(self, monitor_cfgs, context): - LOG.debug("monitorMgr config: %s" % monitor_cfgs) - - for monitor_cfg in monitor_cfgs: - monitor_type = monitor_cfg["monitor_type"] - monitor_cls = BaseMonitor.get_monitor_cls(monitor_type) - monitor_ins = monitor_cls(monitor_cfg, context) - - self._monitor_list.append(monitor_ins) - - def start_monitors(self): - for _monotor_instace in self._monitor_list: - _monotor_instace.start_monitor() - - def wait_monitors(self): - for monitor in self._monitor_list: - monitor.wait_monitor() - - def verify_SLA(self): - sla_pass = True - for monitor in self._monitor_list: - sla_pass = sla_pass & monitor.verify_SLA() - return sla_pass |