Modify HA test cases and HA test script to support other installers

JIRA: YARDSTICK-633

Change-Id: I65fd1ba11504dc61485f83c3bcc93bec4d41883b
Signed-off-by: tjuyinkanglin <14_ykl@tongji.edu.cn>

5 files changed, 20 insertions, 18 deletions

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
index b1dc31e90..1296c0592 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
@@ -14,6 +14,10 @@ description: >
     This test case is written by new scenario-based HA testing framework.
 
 {% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+{% 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' %}
 
 scenarios:
   -
@@ -26,9 +30,9 @@ scenarios:
           key: "close-br-public"
           attack_key: "close-interface"
           action_parameter:
-            interface: "br-ex"
+            interface: {{external_net}}
           rollback_parameter:
-            interface: "br-ex"
+            interface: {{external_net}}
 
         -
           fault_type: "general-attacker"
@@ -36,9 +40,9 @@ scenarios:
           key: "close-br-mgmt"
           attack_key: "close-interface"
           action_parameter:
-            interface: "br-mgmt"
+            interface: {{management_net}}
           rollback_parameter:
-            interface: "br-mgmt"
+            interface: {{management_net}}
 
         -
           fault_type: "general-attacker"
@@ -46,9 +50,9 @@ scenarios:
           key: "close-br-storage"
           attack_key: "close-interface"
           action_parameter:
-            interface: "br-storage"
+            interface: {{storage_net}}
           rollback_parameter:
-            interface: "br-storage"
+            interface: {{storage_net}}
 
         -
           fault_type: "general-attacker"
@@ -56,9 +60,9 @@ scenarios:
           key: "close-br-private"
           attack_key: "close-interface"
           action_parameter:
-            interface: "br-mesh"
+            interface: {{internal_net}}
           rollback_parameter:
-            interface: "br-mesh"
+            interface: {{internal_net}}
 
       monitors:
         -
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
index 2d51a96cc..b9bb889a1 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
@@ -14,6 +14,10 @@ description: >
     This test case is written by new scenario-based HA testing framework.
 
 {% set file = file or 'etc/yardstick/nodes/fuel_baremetal/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:
   -
@@ -43,7 +47,7 @@ scenarios:
           sla:
             max_outage_time: 5
           parameter:
-            ip_address: "192.168.0.2"
+            ip_address: {{vip_management}}
 
         -
           monitor_type: "general-monitor"
@@ -54,7 +58,7 @@ scenarios:
           sla:
             max_outage_time: 5
           parameter:
-            ip_address: "172.16.0.2"
+            ip_address: {{vip_router_public}}
 
         -
           monitor_type: "general-monitor"
@@ -65,7 +69,7 @@ scenarios:
           sla:
             max_outage_time: 5
           parameter:
-            ip_address: "192.168.0.1"
+            ip_address: {{vip_router_management}}
 
         -
           monitor_type: "general-monitor"
@@ -76,7 +80,7 @@ scenarios:
           sla:
             max_outage_time: 5
           parameter:
-            ip_address: "172.16.0.3"
+            ip_address: {{vip_public}}
 
 
       steps:
diff --git a/yardstick/benchmark/scenarios/availability/ha_tools/nova/create_flavor.bash b/yardstick/benchmark/scenarios/availability/ha_tools/nova/create_flavor.bash
index 38dbe0cee..941563e7c 100644
--- a/yardstick/benchmark/scenarios/availability/ha_tools/nova/create_flavor.bash
+++ b/yardstick/benchmark/scenarios/availability/ha_tools/nova/create_flavor.bash
@@ -14,6 +14,4 @@
 
 set -e
 
-source /root/openrc
-
 openstack flavor create $1 --id $2 --ram $3 --disk $4 --vcpus $5
diff --git a/yardstick/benchmark/scenarios/availability/ha_tools/nova/delete_flavor.bash b/yardstick/benchmark/scenarios/availability/ha_tools/nova/delete_flavor.bash
index 37d2cf6c0..e998464c7 100644
--- a/yardstick/benchmark/scenarios/availability/ha_tools/nova/delete_flavor.bash
+++ b/yardstick/benchmark/scenarios/availability/ha_tools/nova/delete_flavor.bash
@@ -14,6 +14,4 @@
 
 set -e
 
-source /root/openrc
-
 openstack flavor delete $1
diff --git a/yardstick/benchmark/scenarios/availability/ha_tools/nova/show_flavors.bash b/yardstick/benchmark/scenarios/availability/ha_tools/nova/show_flavors.bash
index 0b1a9f056..1b0739602 100644
--- a/yardstick/benchmark/scenarios/availability/ha_tools/nova/show_flavors.bash
+++ b/yardstick/benchmark/scenarios/availability/ha_tools/nova/show_flavors.bash
@@ -13,6 +13,4 @@
 
 set -e
 
-source /root/openrc
-
 nova flavor-list
\ No newline at end of file