From 2733defda816a84d2b9c2e361a5970b9de4923f4 Mon Sep 17 00:00:00 2001
From: wym_libra <yimin.wang@huawei.com>
Date: Mon, 7 Dec 2015 16:02:18 +0800
Subject: 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>
---
 samples/serviceha.yaml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'samples')

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
-
-
-- 
cgit