NFVBENCH-73 vlan_tagging parameter cause exception

Change-Id: Ia2f091dfd05004806637e3e15076e04aa31bd433
Signed-off-by: mortenhillbom <mhillbom@cisco.com>

diff --git a/nfvbench/traffic_gen/trex.py b/nfvbench/traffic_gen/trex.py
index 1e7c133..68ab95a 100644 (file)
--- a/nfvbench/traffic_gen/trex.py
+++ b/nfvbench/traffic_gen/trex.py
@@ -321,7 +321,7 @@ class TRex(AbstractTrafficGenerator):
 
     def __start_server(self):
         server = TRexTrafficServer()
-        server.run_server(self.config.generator_config)
+        server.run_server(self.config.generator_config, self.config.vlan_tagging)
 
     def resolve_arp(self):
         self.client.set_service_mode(ports=self.port_handle)

diff --git a/nfvbench/traffic_server.py b/nfvbench/traffic_server.py
index 007998e..dcb83fb 100644 (file)
--- a/nfvbench/traffic_server.py
+++ b/nfvbench/traffic_server.py
@@ -34,7 +34,7 @@ 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'):
+    def run_server(self, traffic_profile, vlan_tagging, filename='/etc/trex_cfg.yaml'):
         """
         Runs TRex server for specified traffic profile.
 
@@ -44,9 +44,11 @@ class TRexTrafficServer(TrafficServer):
         cfg = self.__save_config(traffic_profile, filename)
         cores = traffic_profile.cores
         sw_mode = "--software" if traffic_profile.generator_config.software_mode else ""
+        vlan_opt = "--vlan" if vlan_tagging else ""
         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, cfg)],
                          cwd=self.trex_dir)
         LOG.info('TRex server is running...')