Merge "unify pod keywork so api can easily used"

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

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
index 2d51a96..c229277 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
@@ -13,7 +13,11 @@ description: >
     Test case for TC054 :OpenStack VIP Master Node abnormally shutdown High Availability;
     This test case is written by new scenario-based HA testing framework.
 
-{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
+{% set vip_management = vip_management or '192.168.0.2' %}
+{% set vip_public = vip_public or '172.16.0.3' %}
+{% set vip_router_management = vip_router_management or '192.168.0.1' %}
+{% set vip_router_public = vip_router_public or '172.16.0.2' %}
 
 scenarios:
   -
@@ -31,6 +35,7 @@ scenarios:
           key: "list-images"
           command_name: "openstack image list"
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
 
@@ -40,10 +45,11 @@ scenarios:
           key: "vip-mgmt-status"
           host: node2
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
           parameter:
-            ip_address: "192.168.0.2"
+            ip_address: {{vip_management}}
 
         -
           monitor_type: "general-monitor"
@@ -51,10 +57,11 @@ scenarios:
           key: "vip-routerp-status"
           host: node2
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
           parameter:
-            ip_address: "172.16.0.2"
+            ip_address: {{vip_router_public}}
 
         -
           monitor_type: "general-monitor"
@@ -62,10 +69,11 @@ scenarios:
           key: "vip-router-status"
           host: node2
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
           parameter:
-            ip_address: "192.168.0.1"
+            ip_address: {{vip_router_management}}
 
         -
           monitor_type: "general-monitor"
@@ -73,10 +81,11 @@ scenarios:
           key: "vip-pub"
           host: node2
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
           parameter:
-            ip_address: "172.16.0.3"
+            ip_address: {{vip_public}}
 
 
       steps: