NFVBENCH-132 Upgrade to TRex v2.56

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

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 15196f2..2c4055e 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,17 +1,12 @@
 # docker file for creating a container that has nfvbench installed and ready to use
 FROM ubuntu:16.04
 
-ENV TREX_VER "v2.54"
+ENV TREX_VER "v2.56"
 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 \
@@ -32,7 +27,6 @@ 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 \

diff --git a/nfvbench/traffic_server.py b/nfvbench/traffic_server.py
index d46a27d..91608dd 100644 (file)
--- a/nfvbench/traffic_server.py
+++ b/nfvbench/traffic_server.py
@@ -49,8 +49,12 @@ class TRexTrafficServer(TrafficServer):
             mbuf_opt = "--mbuf-factor " + str(generator_config.mbuf_factor)
         else:
             mbuf_opt = ""
+        # --unbind-unused-ports: for NIC that have more than 2 ports such as Intel X710
+        # this will instruct trex to unbind all ports that are unused instead of
+        # erroring out with an exception (i40e only)
         subprocess.Popen(['nohup', '/bin/bash', '-c',
-                          './t-rex-64 -i -c {} --iom 0 --no-scapy-server --close-at-end {} '
+                          './t-rex-64 -i -c {} --iom 0 --no-scapy-server '
+                          '--unbind-unused-ports --close-at-end {} '
                           '{} {} --cfg {} &> /tmp/trex.log & disown'.format(cores, sw_mode,
                                                                             vlan_opt,
                                                                             mbuf_opt, cfg)],