diff options
| author |   LiHuan <lihuanwk@126.com> | 2017-04-07 23:32:07 +0800 |
|---|---|---|
| committer |   Jing Lu <lvjing5@huawei.com> | 2017-06-01 02:42:11 +0000 |
| commit | c5d97cd1d1da2478ac12278fe898385165ba3087 (patch) | |
| tree | 5b2579be4e9229ebca333b311a39715f05330ab2 /yardstick/benchmark/scenarios/availability/monitor/basemonitor.py | |
| parent | 370632cc02a711289f9830616d4ded2f6a9341be (diff) | |
Add a new monitor type: MultiMonitor that can run any number of other monitors at the same time.
JIRA: YARDSTICK-397
Change-Id: Ic5cb79f0820029e306373abead1ea43fac9abee2
Signed-off-by: LiHuan <lihuanwk@126.com>
(cherry picked from commit 747a3260fef52fb5f7da337bc149ec202a05be6e)
Diffstat (limited to 'yardstick/benchmark/scenarios/availability/monitor/basemonitor.py')
| -rw-r--r-- | yardstick/benchmark/scenarios/availability/monitor/basemonitor.py | 10 |
1 files changed, 10 insertions, 0 deletions
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 |