X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=nsb_setup.sh;h=c11dc103804d76855bd34146e899d7adbe9dd277;hb=7f46ed48c51dde7b11502ebac482536048b70177;hp=cc2542989c6aa92bc84443f1b97f0332d331d394;hpb=9da77e9572bc9bd90b3978713b197339480a4a74;p=yardstick.git diff --git a/nsb_setup.sh b/nsb_setup.sh index cc2542989..c11dc1038 100755 --- a/nsb_setup.sh +++ b/nsb_setup.sh @@ -83,7 +83,7 @@ install_trex() { TREX_DIR=$INSTALL_BIN_PATH/trex/scripts if [ -d "$TREX_DIR" ]; then - echo "Trex v2.20 already installed. Make sure it contains PYTHONPATH which is required to run TRex" + echo "Trex $TREX_VERSION already installed." else echo "Build TRex and installing Trex TG in $INSTALL_BIN_PATH/trex" rm -rf ${TREX_DOWNLOAD##*/} @@ -99,9 +99,7 @@ install_trex() cd trex/scripts/ko/src/ make make install - # workaround trex module issue - touch "$REPO_DIR/trex/scripts/automation/trex_control_plane/stl/__init__.py" - cp "$REPO_DIR/trex/scripts/dpdk_nic_bind.py" "$INSTALL_BIN_PATH" + ln -s $TREX_DIR/automation/trex_control_plane $INSTALL_BIN_PATH/trex_client popd fi echo "Done."