X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=yardstick%2Fbenchmark%2Fscenarios%2Favailability%2Fserviceha.py;h=69727de2b2763bf399e606d33e9844d937898cc3;hb=71bbbdb18b5f8621b8b4ed9aa0e4fcc1e8882085;hp=aee94ee09d17138e20c77868d63eb62b5e54dc2a;hpb=2733defda816a84d2b9c2e361a5970b9de4923f4;p=yardstick.git

diff --git a/yardstick/benchmark/scenarios/availability/serviceha.py b/yardstick/benchmark/scenarios/availability/serviceha.py
index aee94ee09..69727de2b 100755
--- a/yardstick/benchmark/scenarios/availability/serviceha.py
+++ b/yardstick/benchmark/scenarios/availability/serviceha.py
@@ -6,6 +6,8 @@
 # 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
 from yardstick.benchmark.scenarios import base
 from yardstick.benchmark.scenarios.availability.monitor import basemonitor
@@ -21,14 +23,14 @@ 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
 
     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")
@@ -57,27 +59,32 @@ class ServiceHA(base.Scenario):
             return
 
         self.monitorMgr.start_monitors()
-        LOG.info("monitor start!")
+        LOG.info("HA monitor start!")
 
         for attacker in self.attackers:
             attacker.inject_fault()
 
         self.monitorMgr.wait_monitors()
-        LOG.info("monitor stop!")
+        LOG.info("HA monitor stop!")
 
         sla_pass = self.monitorMgr.verify_SLA()
-        assert sla_pass is True, "the test cases is not pass the SLA"
+        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:
             attacker.recover()
 
 
 def _test():    # pragma: no cover
-    '''internal test function'''
+    """internal test function"""
     host = {
         "ip": "10.20.0.5",
         "user": "root",
@@ -105,15 +112,16 @@ def _test():    # pragma: no cover
     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()