Merge "assertTrue(mock.called) -> mock.assert_called"

[yardstick.git] / samples / serviceha.yaml

diff --git a/samples/serviceha.yaml b/samples/serviceha.yaml
index ce4fefa..ee7c8f4 100755 (executable)
--- a/samples/serviceha.yaml
+++ b/samples/serviceha.yaml
@@ -1,3 +1,11 @@
+##############################################################################
+# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 ---
 # Sample test case for ha
 
@@ -13,8 +21,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 +48,3 @@ context:
   type: Node
   name: LF
   file: /root/yardstick/etc/yardstick/nodes/fuel_virtual/pod.yaml
-
-