diff options
author | Abhijit Sinha <abhijit.sinha@intel.com> | 2018-06-26 15:15:02 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-06-26 15:15:02 +0000 |
commit | b0699552d6b308d6ce458c456a3ece99ae9069a6 (patch) | |
tree | 7f4cd98e7a9607e92b2469619c9a10e3aa849866 /yardstick/benchmark/scenarios | |
parent | da8e2c813048e70956e6dcb54b997e8e6bfb9ebf (diff) | |
parent | 736f3fa5d52345d6fe5174b83de043f779fa0600 (diff) |
Merge "Bugfix: HA kill process recovery has a conflict"
Diffstat (limited to 'yardstick/benchmark/scenarios')
-rwxr-xr-x | yardstick/benchmark/scenarios/availability/serviceha.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/yardstick/benchmark/scenarios/availability/serviceha.py b/yardstick/benchmark/scenarios/availability/serviceha.py index 76721e38c..7f976fdbc 100755 --- a/yardstick/benchmark/scenarios/availability/serviceha.py +++ b/yardstick/benchmark/scenarios/availability/serviceha.py @@ -29,6 +29,7 @@ class ServiceHA(base.Scenario): self.context_cfg = context_cfg self.setup_done = False self.data = {} + self.sla_pass = False def setup(self): """scenario setup""" @@ -69,26 +70,28 @@ class ServiceHA(base.Scenario): self.monitorMgr.wait_monitors() LOG.info("Monitor '%s' stop!", self.__scenario_type__) - sla_pass = self.monitorMgr.verify_SLA() + self.sla_pass = self.monitorMgr.verify_SLA() service_not_found = False for k, v in self.data.items(): if v == 0: - sla_pass = False + self.sla_pass = False service_not_found = True LOG.info("The service process (%s) not found in the host envrioment", k) - result['sla_pass'] = 1 if sla_pass else 0 + result['sla_pass'] = 1 if self.sla_pass else 0 self.monitorMgr.store_result(result) self.verify_SLA( - sla_pass, ("a service process was not found in the host " - "environment" if service_not_found - else "MonitorMgr.verify_SLA() failed")) + self.sla_pass, ("a service process was not found in the host " + "environment" if service_not_found + else "MonitorMgr.verify_SLA() failed")) def teardown(self): """scenario teardown""" - for attacker in self.attackers: - attacker.recover() + # only recover when sla not pass + if not self.sla_pass: + for attacker in self.attackers: + attacker.recover() def _test(): # pragma: no cover |