X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fbenchmark%2Fscenarios%2Favailability%2Fmonitor%2Fbasemonitor.py;h=a0fc5965b4286dcb2e39e3854f2cee0d86b5d401;hb=747a3260fef52fb5f7da337bc149ec202a05be6e;hp=3062037ee633edfe608f19b212ba3c925be38888;hpb=03d764791eeb708ade47b5e2196b18ce04552dd1;p=yardstick.git diff --git a/yardstick/benchmark/scenarios/availability/monitor/basemonitor.py b/yardstick/benchmark/scenarios/availability/monitor/basemonitor.py index 3062037ee..a0fc5965b 100644 --- a/yardstick/benchmark/scenarios/availability/monitor/basemonitor.py +++ b/yardstick/benchmark/scenarios/availability/monitor/basemonitor.py @@ -34,6 +34,11 @@ class MonitorMgr(object): for monitor_cfg in monitor_cfgs: monitor_type = monitor_cfg["monitor_type"] monitor_cls = BaseMonitor.get_monitor_cls(monitor_type) + + monitor_number = monitor_cfg.get("monitor_number", 1) + if monitor_number > 1: + monitor_cls = BaseMonitor.get_monitor_cls("multi-monitor") + monitor_ins = monitor_cls(monitor_cfg, context) if "key" in monitor_cfg: monitor_ins.key = monitor_cfg["key"] @@ -133,6 +138,8 @@ class BaseMonitor(multiprocessing.Process): self._queue.put({"total_time": total_time, "outage_time": last_outage - first_outage, + "last_outage": last_outage, + "first_outage": first_outage, "total_count": total_count, "outage_count": outage_count}) @@ -152,3 +159,6 @@ class BaseMonitor(multiprocessing.Process): def verify_SLA(self): pass + + def result(self): + return self._result