summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorwym_libra <yimin.wang@huawei.com>2015-12-07 16:02:18 +0800
committerqi liang <liangqi1@huawei.com>2016-01-10 03:17:21 +0000
commit93e5a8fefd2574de339d2f1ae2041b9d233bbc7b (patch)
treeab4a5507c4100cec6485ba9d587aca8728e8d1c7 /samples
parent9b792a92f1f0b67159de52f8bd6b94806b35ae7b (diff)
Rewrite the HA test case (2)
idea: refact the Monitor class in old file "monitor.py" with the base class and sub-class. detail: 1) the BaseMonitor is the base class of other monitor 2) each monitor run in independent process 3) there are two monitor("openstack-cmd" and "process") for the first test case 4) MonitorMgr class used to manager monitor process JIRA: YARDSTICK-149 Change-Id: I2eede94481f740812212e6cb673d175b5f543c15 Signed-off-by: wym_libra <yimin.wang@huawei.com> (cherry picked from commit 2733defda816a84d2b9c2e361a5970b9de4923f4)
Diffstat (limited to 'samples')
-rwxr-xr-xsamples/serviceha.yaml14
1 files changed, 11 insertions, 3 deletions
diff --git a/samples/serviceha.yaml b/samples/serviceha.yaml
index ce4fefa23..e624f531e 100755
--- a/samples/serviceha.yaml
+++ b/samples/serviceha.yaml
@@ -13,8 +13,18 @@ scenarios:
host: node1
monitors:
- - monitor_cmd: "nova image-list"
+ - monitor_type: "openstack-cmd"
+ command_name: "nova image-list"
monitor_time: 10
+ sla:
+ max_outage_time: 5
+ - monitor_type: "process"
+ process_name: "nova-api"
+ host: node1
+ monitor_time: 10
+ sla:
+ max_recover_time: 5
+
nodes:
node1: node1.LF
@@ -30,5 +40,3 @@ context:
type: Node
name: LF
file: /root/yardstick/etc/yardstick/nodes/fuel_virtual/pod.yaml
-
-