Merge "Change MININET to TOOLS_SYSTEM_IP in get-slave-addresses.sh"

diff --combined jjb/integration/include-raw-integration-deploy-controller-run-test.sh
index 435ac9f3baa76ad2531c47b78479059c7f643417,42f1e26e88e7ae746d0cc288003633cd8b870933..865c31a693b36a30ca1875910cd3a89890c433ba
--- 1/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
--- 2/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@@ -1,7 -1,5 +1,7 @@@
  # Activate robotframework virtualenv
 -source $WORKSPACE/venv-robotframework/bin/activate
 +# ${ROBOT_VENV} comes from the include-raw-integration-install-robotframework.sh
 +# script.
 +source ${ROBOT_VENV}/bin/activate
  
  CONTROLLERMEM="2048m"
  
@@@ -81,8 -79,8 +81,8 @@@ sshpass -p karaf /tmp/${BUNDLEFOLDER}/b
  
  EOF
  
- scp ${WORKSPACE}/controller-script.sh ${CONTROLLER0}:/tmp
- ssh ${CONTROLLER0} 'bash /tmp/controller-script.sh'
+ scp ${WORKSPACE}/controller-script.sh ${ODL_SYSTEM_IP}:/tmp
+ ssh ${ODL_SYSTEM_IP} 'bash /tmp/controller-script.sh'
  
  echo "Changing the testplan path..."
  cat ${WORKSPACE}/test/csit/testplans/${TESTPLAN} | sed "s:integration:${WORKSPACE}:" > testplan.txt
@@@ -92,12 -90,15 +92,15 @@@ SUITES=$( egrep -v '(^[[:space:]]*#|^[[
  
  echo "Starting Robot test suites ${SUITES} ..."
  pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
- -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v CONTROLLER:${CONTROLLER0} -v CONTROLLER_USER:${USER} \
- -v MININET:${MININET0} -v MININET1:${MININET1} -v MININET2:${MININET2} -v MININET_USER:${USER} \
+ -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
+ -v CONTROLLER:${ODL_SYSTEM_IP} -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} -v CONTROLLER_USER:${USER} -v ODL_SYSTEM_USER:${USER} \
+ -v TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} -v TOOLS_SYSTEM_2_IP:${TOOLS_SYSTEM_2_IP} -v TOOLS_SYSTEM_3_IP:${TOOLS_SYSTEM_3_IP} \
+ -v TOOLS_SYSTEM_USER:${USER} \
+ -v MININET:${TOOLS_SYSTEM_IP} -v MININET1:${TOOLS_SYSTEM_2_IP} -v MININET2:${TOOLS_SYSTEM_3_IP} -v MININET_USER:${USER} \
  -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
  
  echo "Fetching Karaf log"
- scp ${CONTROLLER0}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log .
+ scp ${ODL_SYSTEM_IP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log .
  
  # vim: ts=4 sw=4 sts=4 et ft=sh :
  

diff --combined jjb/integration/include-raw-integration-start-cluster-run-test.sh
index 5255db883d21287e9f304c9aa3c3064b6982ebec,91ef4d88a564bae37f2b253c9b32b465e5a17000..ad112030a8885bdf505e33adc0e62a791194b687
--- 1/jjb/integration/include-raw-integration-start-cluster-run-test.sh
--- 2/jjb/integration/include-raw-integration-start-cluster-run-test.sh
+++ b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
@@@ -1,7 -1,5 +1,7 @@@
  # Activate robotframework virtualenv
 -source $WORKSPACE/venv-robotframework/bin/activate
 +# ${ROBOT_VENV} comes from the include-raw-integration-install-robotframework.sh
 +# script.
 +source ${ROBOT_VENV}/bin/activate
  
  echo "#################################################"
  echo "##         Verify Cluster is UP                ##"
@@@ -10,7 -8,7 +10,7 @@@ echo "#################################
  cat > ${WORKSPACE}/verify-cluster-is-up.sh <<EOF
  
  CONTROLLERID="member-\$1"
- CONTROLLERIP=\$2
+ ODL_SYSTEM_IP_PATH=\$2
  
  echo "Waiting for controller to come up..."
  COUNT="0"
@@@ -39,12 -37,12 +39,12 @@@ sshpass -p karaf /tmp/${BUNDLEFOLDER}/b
  
  EOF
  
- CONTROLLERIPS=(${CONTROLLER0} ${CONTROLLER1} ${CONTROLLER2})
- for i in "${!CONTROLLERIPS[@]}"
+ ODL_SYSTEM_IPS=(${ODL_SYSTEM_1_IP} ${ODL_SYSTEM_2_IP} ${ODL_SYSTEM_3_IP})
+ for i in "${!ODL_SYSTEM_IPS[@]}"
  do
-     echo "Verifying member-$((i+1)) with IP address ${CONTROLLERIPS[$i]} is UP"
-     scp ${WORKSPACE}/verify-cluster-is-up.sh ${CONTROLLERIPS[$i]}:/tmp
-     ssh ${CONTROLLERIPS[$i]} "bash /tmp/verify-cluster-is-up.sh $((i+1)) ${CONTROLLERIPS[$i]}"
+     echo "Verifying member-$((i+1)) with IP address ${ODL_SYSTEM_IPS[$i]} is UP"
+     scp ${WORKSPACE}/verify-cluster-is-up.sh ${ODL_SYSTEM_IPS[$i]}:/tmp
+     ssh ${ODL_SYSTEM_IPS[$i]} "bash /tmp/verify-cluster-is-up.sh $((i+1)) ${ODL_SYSTEM_IPS[$i]}"
  done
  
  echo "Cool down for 1 min :)..."
@@@ -58,14 -56,18 +58,18 @@@ SUITES=$( egrep -v '(^[[:space:]]*#|^[[
  
  echo "Starting Robot test suites ${SUITES} ..."
  pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
- -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v CONTROLLER:${CONTROLLER0} -v CONTROLLER1:${CONTROLLER1} -v CONTROLLER2:${CONTROLLER2} \
- -v CONTROLLER_USER:${USER} -v MININET:${MININET0} -v MININET1:${MININET1} -v MININET2:${MININET2} \
- -v MININET_USER:${USER} -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
+ -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v CONTROLLER:${ODL_SYSTEM_IP} -v CONTROLLER1:${ODL_SYSTEM_2_IP} \
+ -v CONTROLLER2:${ODL_SYSTEM_3_IP} -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} -v ODL_SYSTEM_2_IP:${ODL_SYSTEM_2_IP} \
+ -v ODL_SYSTEM_3_IP:${ODL_SYSTEM_3_IP} -v CONTROLLER_USER:${USER} -v ODL_SYSTEM_USER:${USER} \
+ -v TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} -v TOOLS_SYSTEM_2_IP:${TOOLS_SYSTEM_2_IP} -v TOOLS_SYSTEM_3_IP:${TOOLS_SYSTEM_3_IP} \
+ -v TOOLS_SYSTEM_USER:${USER} \
+ -v MININET:${TOOLS_SYSTEM_IP} -v MININET1:${TOOLS_SYSTEM_2_IP} -v MININET2:${TOOLS_SYSTEM_3_IP} -v MININET_USER:${USER} \
+ -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
  
  echo "Fetching Karaf log"
- scp $CONTROLLER0:/tmp/$BUNDLEFOLDER/data/log/karaf.log controller0-karaf.log
- scp $CONTROLLER1:/tmp/$BUNDLEFOLDER/data/log/karaf.log controller1-karaf.log
- scp $CONTROLLER2:/tmp/$BUNDLEFOLDER/data/log/karaf.log controller2-karaf.log
+ scp $ODL_SYSTEM_IP:/tmp/$BUNDLEFOLDER/data/log/karaf.log controller0-karaf.log
+ scp $ODL_SYSTEM_2_IP:/tmp/$BUNDLEFOLDER/data/log/karaf.log controller1-karaf.log
+ scp $ODL_SYSTEM_3_IP:/tmp/$BUNDLEFOLDER/data/log/karaf.log controller2-karaf.log
  
  # vim: ts=4 sw=4 sts=4 et ft=sh :