From af7f0bea3a0d24bdf084622acc9932ccd261e42e Mon Sep 17 00:00:00 2001
From: rexlee8776 <limingjiang@huawei.com>
Date: Thu, 12 Apr 2018 06:53:17 +0000
Subject: Bugfix: interface down HA tc050 attack and monitor logistic wrong

1. simplify the attack to be one interface
2. move monitor step before attack
3. update rst doc to match

JIRA: YARDSTICK-1120

Change-Id: Icfa21d58e7ccdbeaca8a9a1a3098cceb21c981c3
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
---
 tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml | 81 +++++------------------
 1 file changed, 17 insertions(+), 64 deletions(-)

(limited to 'tests')

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
index dde3a1077..faddfab28 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
@@ -13,12 +13,9 @@ description: >
     Yardstick TC050 config file;
     HA test case: OpenStack Controller Node Network High Availability.
 
-{% set file = file or '/etc/yardstick/pod.yaml' %}
 {% set attack_host = attack_host or "node1" %}
-{% set external_net = external_net or 'br-ex' %}
-{% set management_net = management_net or 'br-mgmt' %}
-{% set storage_net = storage_net or 'br-storage' %}
-{% set internal_net = internal_net or 'br-mesh' %}
+{% set interface_name = interface_name or 'br-mgmt' %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 
 scenarios:
   -
@@ -27,43 +24,13 @@ scenarios:
       attackers:
         -
           fault_type: "general-attacker"
-          host: {{attack_host}}
+          host: {{ attack_host }}
           key: "close-br-public"
           attack_key: "close-interface"
           action_parameter:
-            interface: {{external_net}}
-          rollback_parameter:
-            interface: {{external_net}}
-
-        -
-          fault_type: "general-attacker"
-          host: {{attack_host}}
-          key: "close-br-mgmt"
-          attack_key: "close-interface"
-          action_parameter:
-            interface: {{management_net}}
-          rollback_parameter:
-            interface: {{management_net}}
-
-        -
-          fault_type: "general-attacker"
-          host: {{attack_host}}
-          key: "close-br-storage"
-          attack_key: "close-interface"
-          action_parameter:
-            interface: {{storage_net}}
-          rollback_parameter:
-            interface: {{storage_net}}
-
-        -
-          fault_type: "general-attacker"
-          host: {{attack_host}}
-          key: "close-br-private"
-          attack_key: "close-interface"
-          action_parameter:
-            interface: {{internal_net}}
+            interface: {{ interface_name }}
           rollback_parameter:
-            interface: {{internal_net}}
+            interface: {{ interface_name }}
 
       monitors:
         -
@@ -104,49 +71,35 @@ scenarios:
 
 
       steps:
-        -
-          actionKey: "close-br-public"
-          actionType: "attacker"
-          index: 1
-
-        -
-          actionKey: "close-br-mgmt"
-          actionType: "attacker"
-          index: 2
-
-        -
-          actionKey: "close-br-storage"
-          actionType: "attacker"
-          index: 3
-
-        -
-          actionKey: "close-br-private"
-          actionType: "attacker"
-          index: 4
-
         -
           actionKey: "nova-image-list"
           actionType: "monitor"
-          index: 5
+          index: 1
 
         -
           actionKey: "neutron-router-list"
           actionType: "monitor"
-          index: 6
+          index: 2
 
         -
           actionKey: "heat-stack-list"
           actionType: "monitor"
-          index: 7
+          index: 3
 
         -
           actionKey: "cinder-list"
           actionType: "monitor"
-          index: 8
+          index: 4
+
+        -
+          actionKey: "close-br-public"
+          actionType: "attacker"
+          index: 5
+
 
 
     nodes:
-      {{attack_host}}: {{attack_host}}.LF
+      {{ attack_host }}: {{ attack_host }}.LF
     runner:
       type: Duration
       duration: 1
@@ -157,4 +110,4 @@ scenarios:
 context:
   type: Node
   name: LF
-  file: {{file}}
+  file: {{ file }}
-- 
cgit 1.2.3-korg