Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding latency test for vfw"
[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
2e82971
..
6d0d812
100755
(executable)
--- 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.context_cfg = context_cfg
self.setup_done = False
self.data = {}
+ self.pass_flag = True
def setup(self):
"""scenario setup"""
def setup(self):
"""scenario setup"""
@@
-71,16
+72,19
@@
class ServiceHA(base.Scenario):
sla_pass = self.monitorMgr.verify_SLA()
for k, v in self.data.items():
sla_pass = self.monitorMgr.verify_SLA()
for k, v in self.data.items():
- if
self.data[k]
== 0:
+ if
v
== 0:
result['sla_pass'] = 0
result['sla_pass'] = 0
+ self.pass_flag = False
LOG.info("The service process not found in the host envrioment, \
the HA test case NOT pass")
return
LOG.info("The service process not found in the host envrioment, \
the HA test case NOT pass")
return
+ self.monitorMgr.store_result(result)
if sla_pass:
result['sla_pass'] = 1
LOG.info("The HA test case PASS the SLA")
else:
result['sla_pass'] = 0
if sla_pass:
result['sla_pass'] = 1
LOG.info("The HA test case PASS the SLA")
else:
result['sla_pass'] = 0
+ self.pass_flag = False
assert sla_pass is True, "The HA test case NOT pass the SLA"
return
assert sla_pass is True, "The HA test case NOT pass the SLA"
return
@@
-90,6
+94,8
@@
the HA test case NOT pass")
for attacker in self.attackers:
attacker.recover()
for attacker in self.attackers:
attacker.recover()
+ assert self.pass_flag, "The HA test case NOT passed"
+
def _test(): # pragma: no cover
"""internal test function"""
def _test(): # pragma: no cover
"""internal test function"""