summaryrefslogtreecommitdiffstats
path: root/nsb_setup.sh
diff options
context:
space:
mode:
authorDeepak S <deepak.s@linux.intel.com>2017-03-09 19:33:42 +0530
committerDeepak S <deepak.s@linux.intel.com>2017-03-09 19:35:41 +0530
commitdfda13a6a3eadeb316f391a91052da2820dcb9b7 (patch)
tree70901b3434952e48d1965afefa7d6eec5bb0d63c /nsb_setup.sh
parent72030a83b2cfa9f0993e22559b2b9a6261abd6b2 (diff)
Bugfix: Using the right trex version to support both py2.7 & py3
Updating the trex version and downloading the right version for vnf testing :) Change-Id: Iaca74ce627a05128a60bdc331968d2c56c06522f Signed-off-by: Deepak S <deepak.s@linux.intel.com>
Diffstat (limited to 'nsb_setup.sh')
-rwxr-xr-xnsb_setup.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/nsb_setup.sh b/nsb_setup.sh
index e77ffbe44..332c0345c 100755
--- a/nsb_setup.sh
+++ b/nsb_setup.sh
@@ -28,7 +28,8 @@ if [ "$(whoami)" != "root" ]; then
fi
INSTALL_BIN_PATH="/opt/nsb_bin"
-TREX_DOWNLOAD="https://trex-tgn.cisco.com/trex/release/v2.20.tar.gz"
+TREX_VERSION="v2.20"
+TREX_DOWNLOAD="https://trex-tgn.cisco.com/trex/release/$TREX_VERSION.tar.gz"
DPDK_DOWNLOAD="http://dpdk.org/browse/dpdk/snapshot/dpdk-16.07.zip"
VIRTUAL_VENV="$INSTALL_BIN_PATH/yardstick_venv"
@@ -82,7 +83,7 @@ install_trex()
{
TREX_DIR=$INSTALL_BIN_PATH/trex/scripts
if [ -d "$TREX_DIR" ]; then
- echo "Trex v2.05already installed. Make sure it contains PYTHONPATH which is required to run TRex"
+ echo "Trex v2.20 already installed. Make sure it contains PYTHONPATH which is required to run TRex"
else
echo "Build TRex and installing Trex TG in $INSTALL_BIN_PATH/trex"
rm -rf ${TREX_DOWNLOAD##*/}
@@ -93,8 +94,8 @@ install_trex()
pushd .
rm -rf trex
mkdir -p trex
- mv v2.05 trex/scripts
- rm -rf v2.05.tar.gz
+ mv $TREX_VERSION trex/scripts
+ rm -rf $TREX_VERSION.tar.gz
cd trex/scripts/ko/src/
make
make install
@@ -182,7 +183,7 @@ install_dpdk()
push_nsb_binary()
{
- if [ ! -d "$INSTALL_BIN_PATH/trex" ]; then
+ if [ ! -d "$INSTALL_BIN_PATH/trex/scripts" ]; then
cp -fr "$REPO_DIR/trex" "$INSTALL_BIN_PATH"
fi
rm -rf "$REPO_DIR/trex"