Merge "Improve VMs spawning for OpenStack"

[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 93948d3..a1fa38e 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
@@ -1,9 +1,24 @@
+##############################################################################
+# Copyright (c) 2017 14_ykl@tongji.edu.cn 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
+##############################################################################
 ---
 
 schema: "yardstick:task:0.1"
 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.
+    Yardstick TC054 config file;
+    HA test case: OpenStack VIP Master Node abnormally shutdown High Availability.
+
+{% set jump_host = jump_host or 'node0' %}
+{% set attack_host = attack_host or 'node1' %}
+{% set check_host = check_host or 'node4' %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
+{% set vip_public = vip_public or '10.1.0.222' %}
+{% set monitor_time = monitor_time or 30 %}
 
 scenarios:
   -
@@ -12,61 +27,31 @@ scenarios:
       attackers:
         -
           fault_type: "bare-metal-down"
-          host: node1
+          host: {{attack_host}}
           key: "bare-metal-down"
+          jump_host: {{jump_host}}
 
       monitors:
         -
           monitor_type: "openstack-cmd"
           key: "list-images"
-          command_name: "nova image-list"
-          monitor_time: 10
-          sla:
-            max_outage_time: 5
-
-        -
-          monitor_type: "general-monitor"
-          monitor_key: "ip-status"
-          key: "vip-mgmt-status"
-          host: node2
-          monitor_time: 10
-          sla:
-            max_outage_time: 5
-          parameter:
-            ip_address: "192.168.0.2"
-
-        -
-          monitor_type: "general-monitor"
-          monitor_key: "ip-status"
-          key: "vip-routerp-status"
-          host: node2
-          monitor_time: 10
-          sla:
-            max_outage_time: 5
-          parameter:
-            ip_address: "172.16.0.2"
-
-        -
-          monitor_type: "general-monitor"
-          monitor_key: "ip-status"
-          key: "vip-router-status"
-          host: node2
-          monitor_time: 10
+          command_name: "openstack image list"
+          monitor_time: {{monitor_time}}
+          monitor_number: 3
           sla:
             max_outage_time: 5
-          parameter:
-            ip_address: "192.168.0.1"
 
         -
           monitor_type: "general-monitor"
           monitor_key: "ip-status"
           key: "vip-pub"
-          host: node2
-          monitor_time: 10
+          host: {{check_host}}
+          monitor_time: {{monitor_time}}
+          monitor_number: 3
           sla:
             max_outage_time: 5
           parameter:
-            ip_address: "172.16.0.3"
+            ip_address: {{vip_public}}
 
 
       steps:
@@ -78,30 +63,15 @@ scenarios:
           actionKey: "list-images"
           actionType: "monitor"
           index: 2
-
-        -
-          actionKey: "vip-mgmt-status"
-          actionType: "monitor"
-          index: 3
-
-        -
-          actionKey: "vip-routerp-status"
-          actionType: "monitor"
-          index: 4
-
-        -
-          actionKey: "vip-router-status"
-          actionType: "monitor"
-          index: 5
-
         -
           actionKey: "vip-pub"
           actionType: "monitor"
-          index: 6
+          index: 3
 
     nodes:
-      node1: node1.LF
-      node2: node2.LF
+      {{jump_host}}: {{jump_host}}.LF
+      {{attack_host}}: {{attack_host}}.LF
+      {{check_host}}: {{check_host}}.LF
     runner:
       type: Duration
       duration: 1
@@ -112,4 +82,4 @@ scenarios:
 context:
   type: Node
   name: LF
-  file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+  file: {{file}}