NFVBENCH-119 cli option --vxlan not working

[nfvbench.git] / nfvbench / traffic_server.py

diff --git a/nfvbench/traffic_server.py b/nfvbench/traffic_server.py
index fe9edd2..c3d4d14 100644 (file)
--- a/nfvbench/traffic_server.py
+++ b/nfvbench/traffic_server.py
@@ -34,26 +34,33 @@ class TRexTrafficServer(TrafficServer):
         assert len(contents) == 1
         self.trex_dir = os.path.join(trex_base_dir, contents[0])
 
-    def run_server(self, traffic_profile, filename='/etc/trex_cfg.yaml'):
-        """
-        Runs TRex server for specified traffic profile.
+    def run_server(self, generator_config, filename='/etc/trex_cfg.yaml'):
+        """Run TRex server for specified traffic profile.
 
         :param traffic_profile: traffic profile object based on config file
         :param filename: path where to save TRex config file
         """
-        cfg = self.__save_config(traffic_profile, filename)
-        cores = traffic_profile.cores
-        sw_mode = "--software" if traffic_profile.software_mode else ""
+        cfg = self.__save_config(generator_config, filename)
+        cores = generator_config.cores
+        vtep_vlan = generator_config.gen_config.get('vtep_vlan')
+        sw_mode = "--software" if generator_config.software_mode else ""
+        vlan_opt = "--vlan" if (generator_config.vlan_tagging or vtep_vlan) else ""
+        if generator_config.mbuf_factor:
+            mbuf_opt = "--mbuf-factor " + str(generator_config.mbuf_factor)
+        else:
+            mbuf_opt = ""
         subprocess.Popen(['nohup', '/bin/bash', '-c',
                           './t-rex-64 -i -c {} --iom 0 --no-scapy-server --close-at-end {} '
-                          '--vlan --cfg {} &> /tmp/trex.log & disown'.format(cores, sw_mode, cfg)],
+                          '{} {} --cfg {} &> /tmp/trex.log & disown'.format(cores, sw_mode,
+                                                                            vlan_opt,
+                                                                            mbuf_opt, cfg)],
                          cwd=self.trex_dir)
         LOG.info('TRex server is running...')
 
-    def __save_config(self, traffic_profile, filename):
-        ifs = ",".join([repr(pci) for pci in traffic_profile.pcis])
+    def __save_config(self, generator_config, filename):
+        ifs = ",".join([repr(pci) for pci in generator_config.pcis])
 
-        result = """# Config generated by NFVBench tool
+        result = """# Config generated by NFVbench
         - port_limit : 2
           version    : 2
           interfaces : [{ifs}]""".format(ifs=ifs)