Patch to tldk bootstrap on the tldk package download.

[csit.git] / bootstrap-TLDK.sh

diff --git a/bootstrap-TLDK.sh b/bootstrap-TLDK.sh
index 22fd78a..4678bf5 100755 (executable)
--- a/bootstrap-TLDK.sh
+++ b/bootstrap-TLDK.sh
@@ -17,6 +17,9 @@ set -x
 cat /etc/hostname
 cat /etc/hosts
 
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+export PYTHONPATH=${SCRIPT_DIR}
+
 export DEBIAN_FRONTEND=noninteractive
 sudo apt-get -y update
 sudo apt-get -y install libpython2.7-dev python-virtualenv
@@ -33,7 +36,7 @@ SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/
 
 DPDK_VERSION=16.11.1
 DPDK_DIR=dpdk
-DPDK_PACKAGE=${DPDK_DIR}.tar.xz
+DPDK_PACKAGE=${DPDK_DIR}"-"${DPDK_VERSION}.tar.xz
 
 function ssh_do() {
     echo
@@ -112,8 +115,10 @@ done
 VIRL_DIR_LOC="/tmp"
 TLDK_TAR_FILE="tldk_depends.tar.gz"
 
-tar zcf ${TLDK_TAR_FILE} dpdk-${DPDK_VERSION}.tar.xz ./tldk/ \
-    ./TLDK-tests/tldk_testconfig/ ./TLDK-tests/tldk_deplibs/
+wget "fast.dpdk.org/rel/${DPDK_PACKAGE}"
+
+tar zcf ${TLDK_TAR_FILE} ${DPDK_PACKAGE} ./tldk/ \
+    ./tests/tldk/tldk_testconfig/
 
 cat ${VIRL_PKEY}
 # Copy the files to VIRL host
@@ -190,7 +195,7 @@ fi
 
 PYTHONPATH=`pwd` pybot -L TRACE -W 150 \
     -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
-    --suite "TLDK-tests.func" \
+    --suite "tests.tldk.func" \
     --include vm_envAND3_node_single_link_topo \
     --noncritical EXPECTED_FAILING \
-    TLDK-tests/
+    tests/