From: Sam Hague <shague@redhat.com>
Date: Tue, 6 Nov 2018 19:04:35 +0000 (-0500)
Subject: Use defined tools ips
X-Git-Tag: pre-potassium~491
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=a8e82f88aded7fa6164f92ba3d6a2d64469467ff

Use defined tools ips

Change-Id: Iefafd774674805f3684a871be81ace45502b43c4
Signed-off-by: Sam Hague <shague@redhat.com>
---

diff --git a/csit/scripts/set_unique_node_uuid.sh b/csit/scripts/set_unique_node_uuid.sh
index 1d753734cf..b6e34ba731 100644
--- a/csit/scripts/set_unique_node_uuid.sh
+++ b/csit/scripts/set_unique_node_uuid.sh
@@ -1,16 +1,15 @@
 #!/bin/bash
 
 cat > ${WORKSPACE}/system-ovs-restart.sh <<EOF
-
 sudo rm -rf /etc/openvswitch/conf.db
 sudo service openvswitch-switch restart
-
 EOF
-scp ${WORKSPACE}/system-ovs-restart.sh ${TOOLS_SYSTEM_2_IP}:/tmp/
-ssh ${TOOLS_SYSTEM_2_IP} 'sudo bash /tmp/system-ovs-restart.sh'
-scp ${WORKSPACE}/system-ovs-restart.sh ${TOOLS_SYSTEM_3_IP}:/tmp/
-ssh ${TOOLS_SYSTEM_3_IP} 'sudo bash /tmp/system-ovs-restart.sh'
-scp ${WORKSPACE}/system-ovs-restart.sh ${TOOLS_SYSTEM_4_IP}:/tmp/
-ssh ${TOOLS_SYSTEM_4_IP} 'sudo bash /tmp/system-ovs-restart.sh'
-scp ${WORKSPACE}/system-ovs-restart.sh ${TOOLS_SYSTEM_5_IP}:/tmp/
-ssh ${TOOLS_SYSTEM_5_IP} 'sudo bash /tmp/system-ovs-restart.sh'
+
+echo "Copying and running running set_unique_node_uuid.sh on tools system(s)"
+for i in `seq 2 ${NUM_TOOLS_SYSTEM}`; do
+    ip_var=TOOLS_SYSTEM_${i}_IP
+    ip=${!ip_var}
+    echo "Restarting openswitch to create unique node uuid"
+    scp ${WORKSPACE}/system-ovs-restart.sh ${ip}:/tmp/
+    ssh ${ip} 'sudo bash /tmp/system-ovs-restart.sh'
+done