From: fmenguy <francoisregis.menguy@orange.com>
Date: Mon, 15 Jul 2019 12:15:53 +0000 (+0200)
Subject: NFVBENCH-144 Trex cannot take account NFVBench config (platform thread id 0)
X-Git-Tag: 3.5.1~3
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F37%2F68237%2F2;p=nfvbench.git

NFVBENCH-144 Trex cannot take account NFVBench config (platform thread id 0)

Change-Id: I9f9891dcc2dd446068ba577322680216f03cac35
Signed-off-by: fmenguy <francoisregis.menguy@orange.com>
---

diff --git a/nfvbench/traffic_server.py b/nfvbench/traffic_server.py
index 94e5694..4dc7dce 100644
--- a/nfvbench/traffic_server.py
+++ b/nfvbench/traffic_server.py
@@ -97,11 +97,10 @@ class TRexTrafficServer(TrafficServer):
                                          prefix=generator_config.name,
                                          limit_memory=generator_config.limit_memory,
                                          ifs=ifs)
-        if generator_config.platform.master_thread_id and \
-           generator_config.platform.latency_thread_id:
+        if self.__check_platform_config(generator_config):
             try:
                 platform = """
-              platform     :
+          platform     :
             master_thread_id  : {master_thread_id}
             latency_thread_id : {latency_thread_id}
             dual_if:""".format(master_thread_id=generator_config.platform.master_thread_id,
@@ -122,6 +121,13 @@ class TRexTrafficServer(TrafficServer):
                 pass
         return result
 
+    def __check_platform_config(self, generator_config):
+        return hasattr(generator_config, 'platform') \
+            and hasattr(generator_config.platform, "master_thread_id") \
+            and generator_config.platform.master_thread_id is not None \
+            and hasattr(generator_config.platform, "latency_thread_id") \
+            and generator_config.platform.latency_thread_id is not None
+
     def check_config_updated(self, generator_config):
         existing_config = self.__load_config(filename='/etc/trex_cfg.yaml')
         new_config = yaml.safe_load(self.__prepare_config(generator_config))