Imporve monitor_process pass criteria

[yardstick.git] / yardstick / benchmark / scenarios / availability / serviceha.py

diff --git a/yardstick/benchmark/scenarios/availability/serviceha.py b/yardstick/benchmark/scenarios/availability/serviceha.py
index 10134ea..2e82971 100755 (executable)
--- a/yardstick/benchmark/scenarios/availability/serviceha.py
+++ b/yardstick/benchmark/scenarios/availability/serviceha.py
@@ -6,10 +6,11 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+from __future__ import print_function
+from __future__ import absolute_import
 import logging
-import time
 from yardstick.benchmark.scenarios import base
-from yardstick.benchmark.scenarios.availability import monitor
+from yardstick.benchmark.scenarios.availability.monitor import basemonitor
 from yardstick.benchmark.scenarios.availability.attacker import baseattacker
 
 LOG = logging.getLogger(__name__)
@@ -22,18 +23,20 @@ class ServiceHA(base.Scenario):
 
     def __init__(self, scenario_cfg, context_cfg):
         LOG.debug(
-            "scenario_cfg:%s context_cfg:%s" %
-            (scenario_cfg, context_cfg))
+            "scenario_cfg:%s context_cfg:%s",
+            scenario_cfg, context_cfg)
         self.scenario_cfg = scenario_cfg
         self.context_cfg = context_cfg
         self.setup_done = False
+        self.data = {}
 
     def setup(self):
-        '''scenario setup'''
+        """scenario setup"""
         nodes = self.context_cfg.get("nodes", None)
         if nodes is None:
             LOG.error("the nodes info is none")
             return
+
         self.attackers = []
         attacker_cfgs = self.scenario_cfg["options"]["attackers"]
         for attacker_cfg in attacker_cfgs:
@@ -42,12 +45,13 @@ class ServiceHA(base.Scenario):
             attacker_ins = attacker_cls(attacker_cfg, nodes)
             attacker_ins.setup()
             self.attackers.append(attacker_ins)
+            self.data = dict(self.data.items() + attacker_ins.data.items())
 
         monitor_cfgs = self.scenario_cfg["options"]["monitors"]
 
-        self.monitor_ins = monitor.Monitor()
-        self.monitor_ins.setup(monitor_cfgs[0])
-        self.monitor_ins.monitor_time = monitor_cfgs[0]["monitor_time"]
+        self.monitorMgr = basemonitor.MonitorMgr(self.data)
+        self.monitorMgr.init_monitors(monitor_cfgs, nodes)
+
         self.setup_done = True
 
     def run(self, result):
@@ -56,39 +60,39 @@ class ServiceHA(base.Scenario):
             LOG.error("The setup not finished!")
             return
 
-        self.monitor_ins.start()
-        LOG.info("monitor start!")
+        self.monitorMgr.start_monitors()
+        LOG.info("HA monitor start!")
 
         for attacker in self.attackers:
             attacker.inject_fault()
 
-        time.sleep(self.monitor_ins.monitor_time)
-
-        self.monitor_ins.stop()
-        LOG.info("monitor stop!")
-
-        ret = self.monitor_ins.get_result()
-        LOG.info("The monitor result:%s" % ret)
-        outage_time = ret.get("outage_time")
-        result["outage_time"] = outage_time
-        LOG.info("the result:%s" % result)
-
-        if "sla" in self.scenario_cfg:
-            sla_outage_time = int(self.scenario_cfg["sla"]["outage_time"])
-            assert outage_time <= sla_outage_time, "outage_time %f > sla:outage_time(%f)" % \
-                (outage_time, sla_outage_time)
+        self.monitorMgr.wait_monitors()
+        LOG.info("HA monitor stop!")
+
+        sla_pass = self.monitorMgr.verify_SLA()
+        for k, v in self.data.items():
+            if self.data[k] == 0:
+                result['sla_pass'] = 0
+                LOG.info("The service process not found in the host envrioment, \
+the HA test case NOT pass")
+                return
+        if sla_pass:
+            result['sla_pass'] = 1
+            LOG.info("The HA test case PASS the SLA")
+        else:
+            result['sla_pass'] = 0
+        assert sla_pass is True, "The HA test case NOT pass the SLA"
 
         return
 
     def teardown(self):
-        '''scenario teardown'''
+        """scenario teardown"""
         for attacker in self.attackers:
-            if not attacker.check():
-                attacker.recover()
+            attacker.recover()
 
 
 def _test():    # pragma: no cover
-    '''internal test function'''
+    """internal test function"""
     host = {
         "ip": "10.20.0.5",
         "user": "root",
@@ -103,28 +107,29 @@ def _test():    # pragma: no cover
     attacker_cfgs = []
     attacker_cfgs.append(attacker_cfg)
     monitor_cfg = {
-        "monitor_cmd": "nova image-list",
-        "monitor_tme": 10
+        "monitor_cmd": "nova image-list"
     }
     monitor_cfgs = []
     monitor_cfgs.append(monitor_cfg)
 
     options = {
         "attackers": attacker_cfgs,
+        "wait_time": 10,
         "monitors": monitor_cfgs
     }
     sla = {"outage_time": 5}
     args = {"options": options, "sla": sla}
 
-    print "create instance"
+    print("create instance")
     terstInstance = ServiceHA(args, ctx)
 
     terstInstance.setup()
     result = {}
     terstInstance.run(result)
-    print result
+    print(result)
 
     terstInstance.teardown()
 
+
 if __name__ == '__main__':    # pragma: no cover
     _test()