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 8d1cf0f..2c85286 100644 (file)
--- a/nfvbench/traffic_server.py
+++ b/nfvbench/traffic_server.py
@@ -16,7 +16,7 @@ import os
 import subprocess
 import yaml
 
-from log import LOG
+from .log import LOG
 
 
 class TrafficServerException(Exception):
@@ -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 = {}
@@ -71,7 +82,7 @@ class TRexTrafficServer(TrafficServer):
                 try:
                     result = yaml.safe_load(stream)
                 except yaml.YAMLError as exc:
-                    print exc
+                    print(exc)
         return result
 
     def __save_config(self, generator_config, filename):
@@ -85,18 +96,44 @@ class TRexTrafficServer(TrafficServer):
 
     def __prepare_config(self, generator_config):
         ifs = ",".join([repr(pci) for pci in generator_config.pcis])
+
+        # For consistency and stability reasons, the T-Rex server
+        # should be forciby restarted each time the value of a
+        # 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, i40e_mixed, hdrh)
+        # which will serve as a memory between runs -
+        # while being actually ignored by the T-Rex server.
+
         result = """# Config generated by NFVbench
-        - port_limit : 2
-          version    : 2
+        - port_limit   : 2
+          version      : 2
           zmq_pub_port : {zmq_pub_port}
           zmq_rpc_port : {zmq_rpc_port}
           prefix       : {prefix}
           limit_memory : {limit_memory}
-          interfaces : [{ifs}]""".format(zmq_pub_port=generator_config.zmq_pub_port,
-                                         zmq_rpc_port=generator_config.zmq_rpc_port,
-                                         prefix=generator_config.name,
-                                         limit_memory=generator_config.limit_memory,
-                                         ifs=ifs)
+          command_line :
+            sw_mode    : {sw_mode}
+            mbuf_factor: {mbuf_factor}
+            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,
+            prefix=generator_config.name,
+            limit_memory=generator_config.limit_memory,
+            sw_mode=generator_config.software_mode,
+            mbuf_factor=generator_config.mbuf_factor,
+            hdrh=generator_config.hdrh,
+            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:
             result += """
           memory       :
@@ -119,14 +156,14 @@ class TRexTrafficServer(TrafficServer):
                     try:
                         threads = ",".join([repr(thread) for thread in core.threads])
                     except TypeError:
-                        LOG.warn("No threads defined for socket %s", core.socket)
+                        LOG.warning("No threads defined for socket %s", core.socket)
                     core_result = """
                   - socket : {socket}
                     threads : [{threads}]""".format(socket=core.socket, threads=threads)
                     result += core_result
             except (KeyError, AttributeError):
                 pass
-        return result
+        return result + "\n"
 
     def __check_platform_config(self, generator_config):
         return hasattr(generator_config.gen_config, 'platform') \