From: ahothan <ahothan@cisco.com>
Date: Fri, 9 Feb 2018 21:17:08 +0000 (-0800)
Subject: [NFVBENCH-65] 1.2.2: AttributeError: 'RunningTrafficProfile' object has no attribute... 
X-Git-Tag: 1.2.3~1
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=5baff6620aee46376023b209c7d11c56a7c5181a;p=nfvbench.git

[NFVBENCH-65] 1.2.2: AttributeError: 'RunningTrafficProfile' object has no attribute 'software_mode'

Fix exception

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

diff --git a/nfvbench/traffic_gen/traffic_base.py b/nfvbench/traffic_gen/traffic_base.py
index 817ecc8..c2ac8d0 100644
--- a/nfvbench/traffic_gen/traffic_base.py
+++ b/nfvbench/traffic_gen/traffic_base.py
@@ -58,7 +58,7 @@ class AbstractTrafficGenerator(object):
         return None
 
     @abc.abstractmethod
-    def create_traffic(self):
+    def create_traffic(self, l2frame_size, rates, bidirectional, latency=True):
         # Must be implemented by sub classes
         return None
 
diff --git a/nfvbench/traffic_server.py b/nfvbench/traffic_server.py
index fe9edd2..007998e 100644
--- a/nfvbench/traffic_server.py
+++ b/nfvbench/traffic_server.py
@@ -43,7 +43,7 @@ class TRexTrafficServer(TrafficServer):
         """
         cfg = self.__save_config(traffic_profile, filename)
         cores = traffic_profile.cores
-        sw_mode = "--software" if traffic_profile.software_mode else ""
+        sw_mode = "--software" if traffic_profile.generator_config.software_mode 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)],