Merge "Bugfix: interface down HA tc050 attack and monitor logistic wrong" into stable/fraser

2 files changed, 42 insertions, 91 deletions

diff --git a/docs/testing/user/userguide/opnfv_yardstick_tc050.rst b/docs/testing/user/userguide/opnfv_yardstick_tc050.rst
index 8890c9d53..82a491b72 100644
--- a/docs/testing/user/userguide/opnfv_yardstick_tc050.rst
+++ b/docs/testing/user/userguide/opnfv_yardstick_tc050.rst
@@ -34,23 +34,20 @@ Yardstick Test Case Description TC050
 |              | 2) host: which is the name of a control node being attacked. |
 |              | 3) interface: the network interface to be turned off.        |
 |              |                                                              |
-|              | There are four instance of the "close-interface" monitor:    |
-|              | attacker1(for public netork):                                |
-|              | -fault_type: "close-interface"                               |
-|              | -host: node1                                                 |
-|              | -interface: "br-ex"                                          |
-|              | attacker2(for management netork):                            |
-|              | -fault_type: "close-interface"                               |
-|              | -host: node1                                                 |
-|              | -interface: "br-mgmt"                                        |
-|              | attacker3(for storage netork):                               |
-|              | -fault_type: "close-interface"                               |
-|              | -host: node1                                                 |
-|              | -interface: "br-storage"                                     |
-|              | attacker4(for private netork):                               |
-|              | -fault_type: "close-interface"                               |
-|              | -host: node1                                                 |
-|              | -interface: "br-mesh"                                        |
+|              | The interface to be closed by the attacker can be set by the |
+|              | variable of "{{ interface_name }}"                           |
+|              |                                                              |
+|              | attackers:                                                   |
+|              |   -                                                          |
+|              |     fault_type: "general-attacker"                           |
+|              |     host: {{ attack_host }}                                  |
+|              |     key: "close-br-public"                                   |
+|              |     attack_key: "close-interface"                            |
+|              |     action_parameter:                                        |
+|              |       interface: {{ interface_name }}                        |
+|              |     rollback_parameter:                                      |
+|              |       interface: {{ interface_name }}                        |
+|              |                                                              |
 +--------------+--------------------------------------------------------------+
 |monitors      | In this test case, the monitor named "openstack-cmd" is      |
 |              | needed. The monitor needs needs two parameters:              |
@@ -61,17 +58,17 @@ Yardstick Test Case Description TC050
 |              |                                                              |
 |              | There are four instance of the "openstack-cmd" monitor:      |
 |              | monitor1:                                                    |
-|              | -monitor_type: "openstack-cmd"                               |
-|              | -command_name: "nova image-list"                             |
+|              |     - monitor_type: "openstack-cmd"                          |
+|              |     - command_name: "nova image-list"                        |
 |              | monitor2:                                                    |
-|              | -monitor_type: "openstack-cmd"                               |
-|              | -command_name: "neutron router-list"                         |
+|              |     - monitor_type: "openstack-cmd"                          |
+|              |     - command_name: "neutron router-list"                    |
 |              | monitor3:                                                    |
-|              | -monitor_type: "openstack-cmd"                               |
-|              | -command_name: "heat stack-list"                             |
+|              |     - monitor_type: "openstack-cmd"                          |
+|              |     - command_name: "heat stack-list"                        |
 |              | monitor4:                                                    |
-|              | -monitor_type: "openstack-cmd"                               |
-|              | -command_name: "cinder list"                                 |
+|              |     - monitor_type: "openstack-cmd"                          |
+|              |     - command_name: "cinder list"                            |
 +--------------+--------------------------------------------------------------+
 |metrics       | In this test case, there is one metric:                      |
 |              | 1)service_outage_time: which indicates the maximum outage    |
@@ -109,9 +106,9 @@ Yardstick Test Case Description TC050
 +--------------+--------------------------------------------------------------+
 |step 2        | do attacker: connect the host through SSH, and then execute  |
 |              | the turnoff network interface script with param value        |
-|              | specified by  "interface".                                   |
+|              | specified by "{{ interface_name }}".                         |
 |              |                                                              |
-|              | Result: Network interfaces will be turned down.              |
+|              | Result: The specified network interface will be down.        |
 |              |                                                              |
 +--------------+--------------------------------------------------------------+
 |step 3        | stop monitors after a period of time specified by            |
@@ -133,3 +130,4 @@ Yardstick Test Case Description TC050
 |              | execution problem.                                           |
 |              |                                                              |
 +--------------+--------------------------------------------------------------+
+
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:
         -
@@ -105,48 +72,34 @@ 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 }}