From 0a0a2cc3d7a5179c0a3183b99494e27ab83546e5 Mon Sep 17 00:00:00 2001
From: rexlee8776 <limingjiang@huawei.com>
Date: Thu, 29 Sep 2016 06:41:13 +0000
Subject: [PATCH] ipv6 testcase to support fuel

JIRA: YARDSTICK-363

1. fuel pod.yaml node id update according to the real environment
2. add constaints to run ipv6 on one fuel physical pod(lf-pod2)

Change-Id: I5b91f1bea84f2c79e0b9c3195028e38ddad55363
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
---
 tests/ci/prepare_env.sh                                    | 14 +++++++++-----
 .../test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml     |  5 +++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index 9c949ec4f..130969fa1 100755
--- a/tests/ci/prepare_env.sh
+++ b/tests/ci/prepare_env.sh
@@ -96,25 +96,29 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then
     sshpass -p r00tme ssh 2>/dev/null $ssh_options \
         root@${INSTALLER_IP} fuel node>fuel_node
 
+    # update fuel node id and ip info according to the CI env
+    controller_IDs=($(cat fuel_node|grep controller|awk '{print $1}'))
+    compute_IDs=($(cat fuel_node|grep compute|awk '{print $1}'))
     controller_ips=($(cat fuel_node|grep controller|awk '{print $10}'))
     compute_ips=($(cat fuel_node|grep compute|awk '{print $10}'))
 
     pod_yaml="./etc/yardstick/nodes/fuel_baremetal/pod.yaml"
+    node_line_num=($(grep -n node[1-5] $pod_yaml | awk -F: '{print $1}'))
 
     if [[ ${controller_ips[0]} ]]; then
-        sed -i "s/ip1/${controller_ips[0]}/" $pod_yaml;
+        sed -i "${node_line_num[0]}s/node1/node${controller_IDs[0]}/;s/ip1/${controller_ips[0]}/" $pod_yaml;
     fi
     if [[ ${controller_ips[1]} ]]; then
-        sed -i "s/ip2/${controller_ips[1]}/" $pod_yaml;
+        sed -i "${node_line_num[1]}s/node2/node${controller_IDs[1]}/;s/ip2/${controller_ips[1]}/" $pod_yaml;
     fi
     if [[ ${controller_ips[2]} ]]; then
-        sed -i "s/ip3/${controller_ips[2]}/" $pod_yaml;
+        sed -i "${node_line_num[2]}s/node3/node${controller_IDs[2]}/;s/ip3/${controller_ips[2]}/" $pod_yaml;
     fi
     if [[ ${compute_ips[0]} ]]; then
-        sed -i "s/ip4/${compute_ips[0]}/" $pod_yaml;
+        sed -i "${node_line_num[3]}s/node4/node${compute_IDs[0]}/;s/ip4/${compute_ips[0]}/" $pod_yaml;
     fi
     if [[ ${compute_ips[1]} ]]; then
-        sed -i "s/ip5/${compute_ips[1]}/" $pod_yaml;
+        sed -i "${node_line_num[4]}s/node5/node${compute_IDs[1]}/;s/ip5/${compute_ips[1]}/" $pod_yaml;
     fi
 
 fi
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml
index 1ad871e51..67445f051 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml
@@ -21,10 +21,11 @@ test_cases:
 -
     file_name: opnfv_yardstick_tc027.yaml
     constraint:
-        installer: compass
-        pod: huawei-pod1
+        installer: compass,fuel
+        pod: huawei-pod1,lf-pod2
     task_args:
         huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml"}'
+        lf-pod2: '{"pod_info": "etc/yardstick/nodes/fuel_baremetal/pod.yaml", "openrc":"/root/openrc", "external_network":"admin_floating_net"}'
 -
     file_name: opnfv_yardstick_tc037.yaml
 -
-- 
2.16.6