NFVBENCH-130 Upgrade to TRex v2.54

Insert --unbind-unused-ports in t-rex-64 script

Change-Id: I76e873a9fcc2bf6173c00be764e1c70d92e8ba1c
Signed-off-by: ahothan <ahothan@cisco.com>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 283d0be..15196f2 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,12 +1,17 @@
 # docker file for creating a container that has nfvbench installed and ready to use
 FROM ubuntu:16.04
 
-ENV TREX_VER "v2.53"
+ENV TREX_VER "v2.54"
 ENV VM_IMAGE_VER "0.6"
 
 # Note: do not clone with --depth 1 as it will cause pbr to fail extracting the nfvbench version
 # from the git tag
 
+# Trex v2.54:
+# workaround a problem when using --unbind-unused-ports with t-rex-64
+# instead patch t-rex-64 directly to add --unbind-unused-ports when calling ./trex-cfg
+# so that the new arg is not passed to _t-rex-64 
+# 
 RUN apt-get update && apt-get install -y \
        git \
        kmod \
@@ -27,6 +32,7 @@ RUN apt-get update && apt-get install -y \
        && cp -a /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex /usr/local/lib/python2.7/dist-packages/ \
        && rm -rf /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex \
        && sed -i -e "s/2048 /512 /" -e "s/2048\"/512\"/" /opt/trex/$TREX_VER/trex-cfg \
+       && sed -i -e "s/trex-cfg/trex-cfg --unbind-unused-ports/" /opt/trex/$TREX_VER/t-rex-64 \
        && apt-get remove -y python-pip \
        && wget https://bootstrap.pypa.io/get-pip.py \
        && python get-pip.py \