# Download the latest VPP build install packages
rm -f *.${PACKAGE}
echo Downloading VPP packages...
- bash ${SCRIPT_DIR}/resources/tools/download_install_vpp_pkgs.sh --skip-install
+ bash ${SCRIPT_DIR}/resources/tools/scripts/download_install_vpp_pkgs.sh --skip-install
fi
# Take vpp package and get the vpp version
VIRL_PKEY=priv_key
VIRL_SERVER_STATUS_FILE="status"
VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
+VIRL_SESSION_EXPIRY="620"
case "$DISTRO" in
CENTOS )
- VIRL_TOPOLOGY=double-ring-nested.centos7
- VIRL_RELEASE=csit-centos-7.3-1611_2017-02-14_1.3
+ VIRL_TOPOLOGY=$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_CENTOS)
+ VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_CENTOS)
;;
UBUNTU )
- VIRL_TOPOLOGY=double-ring-nested.xenial
- VIRL_RELEASE=csit-ubuntu-16.04.1_2017-02-20_1.7
+ VIRL_TOPOLOGY=$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_UBUNTU)
+ VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_UBUNTU)
esac
SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
VIRL_SID=$(ssh ${SSH_OPTIONS} \
${VIRL_USERNAME}@${VIRL_SERVER} \
- "start-testcase -c ${VIRL_TOPOLOGY} -r ${VIRL_RELEASE} ${VPP_PKGS_VIRL[@]}")
+ "start-testcase -vv --copy ${VIRL_TOPOLOGY} \
+ --expiry ${VIRL_SESSION_EXPIRY} \
+ --release ${VIRL_RELEASE} ${VPP_PKGS_VIRL[@]}")
retval=$?
if [ ${retval} -ne "0" ]; then
echo "VIRL simulation start failed"
pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology_VIRL.yaml \
- --suite "tests.func" \
+ --suite "tests.vpp.func" \
--include vm_envAND3_node_single_link_topo \
--include vm_envAND3_node_double_link_topo \
--exclude PERFTEST \