Merge "Fix retrieving "options" section in "scenario""

[yardstick.git] / tests / opnfv / test_cases / opnfv_yardstick_tc025.yaml

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
index a831287..ac2db0d 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
@@ -10,14 +10,13 @@
 
 schema: "yardstick:task:0.1"
 description: >
-    Sample test case for the HA of OpenStack Controll Node abnormally shutdown.
-    In order to power on the shutdown node after testing, the jumphost is
-    required to install ipmitool. Ipmi jumphost info and each nodes' ipmi ip,
-    username, password are needed in pod file (There is a sample pod file in
-    "etc/yardstick/nodes/pod.yaml.ipmi.sample").
+    Yardstick TC025 config file;
+    HA test case: OpenStack Controll Node abnormally shutdown.
 
 {% set file = file or '/etc/yardstick/pod.yaml' %}
-{% set jumphost = jumphost or 'node0' %}
+{% set jump_host = jump_host or 'node0' %}
+{% set attack_host = attack_host or 'node1' %}
+{% set monitor_time = monitor_time or 30 %}
 
 scenarios:
 -
@@ -25,30 +24,38 @@ scenarios:
   options:
     attackers:
     - fault_type: "bare-metal-down"
-      host: node1
-      jump_host: {{jumphost}}
+      host: {{attack_host}}
+      jump_host: {{jump_host}}
 
     monitors:
     - monitor_type: "openstack-cmd"
       command_name: "openstack image list"
-      monitor_time: 10
+      monitor_time: {{monitor_time}}
       monitor_number: 3
+      sla:
+        max_outage_time: 5
     - monitor_type: "openstack-cmd"
       command_name: "openstack router list"
-      monitor_time: 10
+      monitor_time: {{monitor_time}}
       monitor_number: 3
+      sla:
+        max_outage_time: 5
     - monitor_type: "openstack-cmd"
       command_name: "openstack stack list"
-      monitor_time: 10
+      monitor_time: {{monitor_time}}
       monitor_number: 3
+      sla:
+        max_outage_time: 5
     - monitor_type: "openstack-cmd"
       command_name: "openstack volume list"
-      monitor_time: 10
+      monitor_time: {{monitor_time}}
       monitor_number: 3
+      sla:
+        max_outage_time: 5
 
   nodes:
-    node1: node1.LF
-    node0: node0.LF
+    {{attack_host}}: {{attack_host}}.LF
+    {{jump_host}}: {{jump_host}}.LF
 
   runner:
     type: Iteration