Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
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
46a197c
..
2e82971
100755
(executable)
--- 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
##############################################################################
# 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
import logging
from yardstick.benchmark.scenarios import base
from yardstick.benchmark.scenarios.availability.monitor import basemonitor
@@
-26,9
+28,10
@@
class ServiceHA(base.Scenario):
self.scenario_cfg = scenario_cfg
self.context_cfg = context_cfg
self.setup_done = False
self.scenario_cfg = scenario_cfg
self.context_cfg = context_cfg
self.setup_done = False
+ self.data = {}
def setup(self):
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")
nodes = self.context_cfg.get("nodes", None)
if nodes is None:
LOG.error("the nodes info is none")
@@
-42,10
+45,11
@@
class ServiceHA(base.Scenario):
attacker_ins = attacker_cls(attacker_cfg, nodes)
attacker_ins.setup()
self.attackers.append(attacker_ins)
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"]
monitor_cfgs = self.scenario_cfg["options"]["monitors"]
- self.monitorMgr = basemonitor.MonitorMgr()
+ self.monitorMgr = basemonitor.MonitorMgr(
self.data
)
self.monitorMgr.init_monitors(monitor_cfgs, nodes)
self.setup_done = True
self.monitorMgr.init_monitors(monitor_cfgs, nodes)
self.setup_done = True
@@
-57,31
+61,38
@@
class ServiceHA(base.Scenario):
return
self.monitorMgr.start_monitors()
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()
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()
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
if sla_pass:
result['sla_pass'] = 1
+ LOG.info("The HA test case PASS the SLA")
else:
result['sla_pass'] = 0
else:
result['sla_pass'] = 0
- assert sla_pass is True, "
the test cases is not
pass the SLA"
+ assert sla_pass is True, "
The HA test case NOT
pass the SLA"
return
def teardown(self):
return
def teardown(self):
- '''scenario teardown'''
+ """scenario teardown"""
for attacker in self.attackers:
attacker.recover()
def _test(): # pragma: no cover
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",
host = {
"ip": "10.20.0.5",
"user": "root",
@@
-109,15
+120,16
@@
def _test(): # pragma: no cover
sla = {"outage_time": 5}
args = {"options": options, "sla": sla}
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)
terstInstance = ServiceHA(args, ctx)
terstInstance.setup()
result = {}
terstInstance.run(result)
- print
result
+ print
(result)
terstInstance.teardown()
terstInstance.teardown()
+
if __name__ == '__main__': # pragma: no cover
_test()
if __name__ == '__main__': # pragma: no cover
_test()