Merge "Cleanup process test cases"

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

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc057.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc057.yaml
index 322e2bd..f6a35e9 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc057.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc057.yaml
@@ -10,9 +10,8 @@
 
 schema: "yardstick:task:0.1"
 description: >
-    Test case for TC057 :OpenStack Controller Cluster Management Service High
-    Availability;
-    This test case is written by scenario-based HA testing framework.
+    Yardstick TC057 config file;
+    HA test case: OpenStack Controller Cluster Management Service High Availability.
 
 {% set file = file or '/etc/yardstick/pod.yaml' %}
 {% set vip_mgmt = vip_mgmt or 'vip__management' %}
@@ -21,6 +20,7 @@ description: >
 {% set check_host = check_host or 'node2' %}
 {% set monitor_time = monitor_time or 10 %}
 {% set monitor_number = monitor_number or 3 %}
+{% set attack_process = attack_process or "corosync" %}
 
 scenarios:
   -
@@ -33,7 +33,7 @@ scenarios:
           key: "kill-process"
           attack_key: "kill-corosync"
           action_parameter:
-            process_name: "corosync"
+            process_name: "{{ attack_process }}"
 
       monitors:
         -
@@ -81,7 +81,7 @@ scenarios:
           action_parameter:
             vip_name: {{vip_mgmt}}
           return_parameter:
-            all: "$vip_mgmt_host"
+            all: "@vip_mgmt_host"
 
         -
           operation_type: "general-operation"
@@ -91,7 +91,7 @@ scenarios:
           action_parameter:
             vip_name: {{vip_vrouter}}
           return_parameter:
-            all: "$vip_router_host"
+            all: "@vip_router_host"
 
       resultCheckers:
         -
@@ -101,7 +101,7 @@ scenarios:
           host: {{check_host}}
           parameter:
             resource_name: "p_rabbitmq-server"
-            resource_host: "$vip_mgmt_host"
+            resource_host: "@vip_mgmt_host"
           expectedValue: "Masters"
           condition: "in"
 
@@ -112,7 +112,7 @@ scenarios:
           host: {{check_host}}
           parameter:
             resource_name: "p_conntrackd"
-            resource_host: "$vip_router_host"
+            resource_host: "@vip_router_host"
           expectedValue: "Masters"
           condition: "in"