bugfix: tc054 default value is wrong

management route ip is not common in most SUTs, so it should
be removed.
also huawei pod1 ipmi info should updated so this test case
can be added into ci later

Change-Id: I3a29c59c473ee7087d4d61753ffc955b061571fb
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
(cherry picked from commit 8701e63e3daf508d8e3482f0a344554d17ff6e24)

diff --git a/etc/yardstick/nodes/compass_sclab_physical/pod.yaml b/etc/yardstick/nodes/compass_sclab_physical/pod.yaml
index 8850182..218e002 100644 (file)
--- a/etc/yardstick/nodes/compass_sclab_physical/pod.yaml
+++ b/etc/yardstick/nodes/compass_sclab_physical/pod.yaml
@@ -24,27 +24,49 @@ nodes:
     ip: 192.168.10.10
     user: root
     password: root
+    ipmi_ip: 172.16.130.26
+    ipmi_user: root
+    ipmi_pwd: Opnfv@pod1
 -
     name: node2
     role: Controller
     ip: 192.168.10.11
     user: root
     password: root
+    ipmi_ip: 172.16.130.27
+    ipmi_user: root
+    ipmi_pwd: Opnfv@pod1
 -
     name: node3
     role: Controller
     ip: 192.168.10.12
     user: root
     password: root
+    ipmi_ip: 172.16.130.29
+    ipmi_user: root
+    ipmi_pwd: Opnfv@pod1
 -
     name: node4
     role: Compute
     ip: 192.168.10.13
     user: root
     password: root
+    ipmi_ip: 172.16.130.30
+    ipmi_user: root
+    ipmi_pwd: Opnfv@pod1
 -
     name: node5
     role: Compute
     ip: 192.168.10.14
     user: root
     password: root
+    ipmi_ip: 172.16.130.31
+    ipmi_user: root
+    ipmi_pwd: Opnfv@pod1
+-
+    name: node0
+    ip: 192.168.10.6
+    role: Baremetal
+    user: root
+    password: root
+

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
index 417327c..5eb34e5 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
@@ -13,15 +13,12 @@ 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 attack_host = attack_host or 'node1' %}
-{% set check_host = check_host or 'node2' %}
 {% 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_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' %}
-{% set monitor_time = monitor_time or 180 %}
+{% set vip_public = vip_public or '10.1.0.222' %}
+{% set monitor_time = monitor_time or 30 %}
 
 scenarios:
   -
@@ -44,42 +41,6 @@ scenarios:
           sla:
             max_outage_time: 5
 
-        -
-          monitor_type: "general-monitor"
-          monitor_key: "ip-status"
-          key: "vip-mgmt-status"
-          host: {{check_host}}
-          monitor_time: {{monitor_time}}
-          monitor_number: 3
-          sla:
-            max_outage_time: 5
-          parameter:
-            ip_address: {{vip_management}}
-
-        -
-          monitor_type: "general-monitor"
-          monitor_key: "ip-status"
-          key: "vip-routerp-status"
-          host: {{check_host}}
-          monitor_time: {{monitor_time}}
-          monitor_number: 3
-          sla:
-            max_outage_time: 5
-          parameter:
-            ip_address: {{vip_router_public}}
-
-        -
-          monitor_type: "general-monitor"
-          monitor_key: "ip-status"
-          key: "vip-router-status"
-          host: {{check_host}}
-          monitor_time: {{monitor_time}}
-          monitor_number: 3
-          sla:
-            max_outage_time: 5
-          parameter:
-            ip_address: {{vip_router_management}}
-
         -
           monitor_type: "general-monitor"
           monitor_key: "ip-status"
@@ -102,26 +63,10 @@ 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:
       {{jump_host}}: {{jump_host}}.LF