From: Carsten Koester Date: Sun, 8 May 2016 05:46:13 +0000 (-0400) Subject: Add VIRL host selection mechanism to bootstrap X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=51e6d6933d6b20b9e6c68ac156c71c2379d8a63c Add VIRL host selection mechanism to bootstrap Add a mechanism to the bootstrap script that allows it to select one out of multiple candidate VIRL hosts. In addition, fix a few cosmetic issues wrt. connecting to the VIRL host: * Use consistent set of SSH options * Consistently use constant instead of hardcoded key filename * Use relative path names for start-/stop-testcase scripts Change-Id: I0d2972f170de82dd5d98da88656f5f962fca2415 Signed-off-by: Carsten Koester --- diff --git a/bootstrap.sh b/bootstrap.sh index 3f29f9856e..d1ca2f4606 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -21,16 +21,22 @@ export DEBIAN_FRONTEND=noninteractive sudo apt-get -y update sudo apt-get -y install libpython2.7-dev python-virtualenv +VIRL_SERVERS=("10.30.51.28" "10.30.51.29" "10.30.51.30") +VIRL_SERVER="" + +VIRL_USERNAME=jenkins-in +VIRL_PKEY=priv_key +VIRL_SERVER_STATUS_FILE="status" +VIRL_SERVER_EXPECTED_STATUS="PRODUCTION" + +SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error" + function ssh_do() { echo echo "### " ssh $@ - ssh -i priv_key -o StrictHostKeyChecking=no $@ + ssh ${SSH_OPTIONS} $@ } -VIRL_SERVER=10.30.51.28 -VIRL_USERNAME=jenkins-in -VIRL_PKEY=priv_key - rm -f ${VIRL_PKEY} cat > ${VIRL_PKEY} <&1) + echo VIRL HOST $virl_server_candidate status is \"$virl_server_status\" + if [ "$virl_server_status" == "$VIRL_SERVER_EXPECTED_STATUS" ] + then + # Candidate is in good status. Select this server. + VIRL_SERVER="$virl_server_candidate" + else + # Candidate is in bad status. Remove from array. + VIRL_SERVERS=("${VIRL_SERVERS[@]:0:$element}" "${VIRL_SERVERS[@]:$[$element+1]}") + fi +done # Temporarily download VPP packages from nexus.fd.io @@ -94,7 +134,7 @@ echo "Updated file names: " ${VPP_DEBS_FULL[@]} cat ${VIRL_PKEY} # Copy the files to VIRL host -scp -i ${VIRL_PKEY} -o StrictHostKeyChecking=no *.deb \ +scp ${SSH_OPTIONS} *.deb \ ${VIRL_USERNAME}@${VIRL_SERVER}:${VIRL_DIR_LOC}/ result=$? @@ -108,13 +148,13 @@ fi echo "Starting simulation on VIRL server" function stop_virl_simulation { - ssh -i priv_key -o StrictHostKeyChecking=no ${VIRL_USERNAME}@${VIRL_SERVER}\ - "/home/jenkins-in/testcase-infra/bin/stop-testcase ${VIRL_SID}" + ssh ${SSH_OPTIONS} ${VIRL_USERNAME}@${VIRL_SERVER}\ + "stop-testcase ${VIRL_SID}" } -VIRL_SID=$(ssh -i priv_key -o StrictHostKeyChecking=no \ +VIRL_SID=$(ssh ${SSH_OPTIONS} \ ${VIRL_USERNAME}@${VIRL_SERVER} \ - "/home/jenkins-in/testcase-infra/bin/start-testcase -c double-ring-nested ${VPP_DEBS_FULL[@]}") + "start-testcase -c double-ring-nested ${VPP_DEBS_FULL[@]}") retval=$? if [ "$?" -ne "0" ]; then echo "VIRL simulation start failed" @@ -133,7 +173,7 @@ echo ${VIRL_SID} ssh_do ${VIRL_USERNAME}@${VIRL_SERVER} cat /scratch/${VIRL_SID}/topology.yaml # Download the topology file from virl session -scp -i ${VIRL_PKEY} -o StrictHostKeyChecking=no \ +scp ${SSH_OPTIONS} \ ${VIRL_USERNAME}@${VIRL_SERVER}:/scratch/${VIRL_SID}/topology.yaml \ topologies/enabled/topology.yaml