NFVBENCH-215 Fix wrong throughput ratio in latency tests

[nfvbench.git] / nfvbench / traffic_server.py

diff --git a/nfvbench/traffic_server.py b/nfvbench/traffic_server.py
index 52ec2f1..2c85286 100644 (file)
--- a/nfvbench/traffic_server.py
+++ b/nfvbench/traffic_server.py
@@ -53,16 +53,27 @@ class TRexTrafficServer(TrafficServer):
         # --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)
+        # Try: --ignore-528-issue -> neither unbind nor exit with error,
+        #                            just proceed cause it might work!
+        # Note that force unbinding is probably a bad choice:
+        # we can't assume for sure that other ports are "unused".
+        # The default TRex behaviour - exit - is indeed a safer option;
+        # a message informs about the ports that should be unbound.
+        i40e_opt = ("--ignore-528-issue" if
+                    generator_config.config.i40e_mixed == 'ignore' else
+                    "--unbind-unused-ports" if
+                    generator_config.config.i40e_mixed == 'unbind' else "")
         cmd = ['nohup', '/bin/bash', '-c',
                './t-rex-64 -i -c {} --iom 0 --no-scapy-server '
-               '--unbind-unused-ports --close-at-end {} {} '
+               '--close-at-end {} {} {} '
                '{} {} --cfg {} &> /tmp/trex.log & disown'.format(cores, sw_mode,
+                                                                 i40e_opt,
                                                                  vlan_opt,
                                                                  hdrh_opt,
                                                                  mbuf_opt, cfg)]
         LOG.info(' '.join(cmd))
-        subprocess.Popen(cmd, cwd=self.trex_dir)
-        LOG.info('TRex server is running...')
+        with subprocess.Popen(cmd, cwd=self.trex_dir) as trex_process:
+            LOG.info('TRex server is running (PID: %s)...', trex_process.pid)
 
     def __load_config(self, filename):
         result = {}
@@ -91,7 +102,7 @@ class TRexTrafficServer(TrafficServer):
         # parameter, specified as one of the starting command line
         # arguments, has been modified since the last launch.
         # Hence we add some extra fields to the config file
-        # (nb_cores, use_vlan, mbuf_factor, hdrh)
+        # (nb_cores, use_vlan, mbuf_factor, i40e_mixed, hdrh)
         # which will serve as a memory between runs -
         # while being actually ignored by the T-Rex server.
 
@@ -108,6 +119,7 @@ class TRexTrafficServer(TrafficServer):
             hdrh       : {hdrh}
             nb_cores   : {nb_cores}
             use_vlan   : {use_vlan}
+            i40e_mixed : {i40e_mixed}
           interfaces   : [{ifs}]""".format(
             zmq_pub_port=generator_config.zmq_pub_port,
             zmq_rpc_port=generator_config.zmq_rpc_port,
@@ -119,6 +131,7 @@ class TRexTrafficServer(TrafficServer):
             nb_cores=generator_config.cores,
             use_vlan=generator_config.gen_config.get('vtep_vlan') or
             generator_config.vlan_tagging,
+            i40e_mixed=generator_config.config.i40e_mixed,
             ifs=ifs)
 
         if hasattr(generator_config, 'mbuf_64') and generator_config.mbuf_64: