X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fci%2Fprepare_env.sh;h=be59b7f376aacacd7b953555b6d8707e3070b89d;hb=fbdae0656a3b4784faaa530b641057c441af4342;hp=35118b12c6385c083f199fde24eb5b1f6ffd8113;hpb=7df24abc9a6bdb6d880959e0103f438b88030b55;p=yardstick.git

diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index 35118b12c..be59b7f37 100755
--- a/tests/ci/prepare_env.sh
+++ b/tests/ci/prepare_env.sh
@@ -15,7 +15,6 @@
 : ${NODE_NAME:='unknown'}
 : ${EXTERNAL_NETWORK:='admin_floating_net'}
 
-
 # Extract network name from EXTERNAL_NETWORK
 #  e.g. EXTERNAL_NETWORK='ext-net;flat;192.168.0.2;192.168.0.253;192.168.0.1;192.168.0.0/24'
 export EXTERNAL_NETWORK=$(echo $EXTERNAL_NETWORK | cut -f1 -d \;)
@@ -56,6 +55,11 @@ export EXTERNAL_NETWORK INSTALLER_TYPE DEPLOY_TYPE NODE_NAME
 # Prepare a admin-rc file for StorPerf integration
 $YARDSTICK_REPO_DIR/tests/ci/prepare_storperf_admin-rc.sh
 
+# copy a admin-rc file for StorPerf integration to the deployment location
+if [ "$NODE_NAME" == "huawei-pod1" ]; then
+    bash $YARDSTICK_REPO_DIR/tests/ci/scp_storperf_admin-rc.sh
+fi
+
 # Fetching id_rsa file from jump_server..."
 verify_connectivity() {
     local ip=$1
@@ -78,5 +82,33 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then
     echo "Fetching id_rsa file from jump_server $INSTALLER_IP..."
     sshpass -p r00tme scp 2>/dev/null $ssh_options \
     root@${INSTALLER_IP}:~/.ssh/id_rsa /root/.ssh/id_rsa &> /dev/null
-fi
 
+    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 "${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 "${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 "${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 "${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 "${node_line_num[4]}s/node5/node${compute_IDs[1]}/;s/ip5/${compute_ips[1]}/" $pod_yaml;
+    fi
+
+fi