NFVBENCH-139 Fix master_thread_id and latency_thread_id property checking

[nfvbench.git] / nfvbench / traffic_server.py

diff --git a/nfvbench/traffic_server.py b/nfvbench/traffic_server.py
index 91608dd..8a8ddba 100644 (file)
--- a/nfvbench/traffic_server.py
+++ b/nfvbench/traffic_server.py
@@ -66,7 +66,7 @@ class TRexTrafficServer(TrafficServer):
         if os.path.exists(filename):
             with open(filename, 'r') as stream:
                 try:
-                    result = yaml.load(stream)
+                    result = yaml.safe_load(stream)
                 except yaml.YAMLError as exc:
                     print exc
         return result
@@ -94,30 +94,29 @@ class TRexTrafficServer(TrafficServer):
                                          prefix=generator_config.name,
                                          limit_memory=generator_config.limit_memory,
                                          ifs=ifs)
-        if hasattr(generator_config, 'platform'):
-            if generator_config.platform.master_thread_id \
-                    and generator_config.platform.latency_thread_id:
-                platform = """
+        try:
+            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,
                                latency_thread_id=generator_config.platform.latency_thread_id)
-                result += platform
+            result += platform
 
-                for core in generator_config.platform.dual_if:
-                    threads = ""
-                    try:
-                        threads = ",".join([repr(thread) for thread in core.threads])
-                    except TypeError:
-                        LOG.warn("No threads defined for socket %s", core.socket)
-                    core_result = """
+            for core in generator_config.platform.dual_if:
+                threads = ""
+                try:
+                    threads = ",".join([repr(thread) for thread in core.threads])
+                except TypeError:
+                    LOG.warn("No threads defined for socket %s", core.socket)
+                core_result = """
                   - socket : {socket}
                     threads : [{threads}]""".format(socket=core.socket, threads=threads)
-                    result += core_result
-            else:
-                LOG.info("Generator profile 'platform' sub-properties are set but not filled in \
-                         config file. TRex will use default values.")
+                result += core_result
+        except (KeyError, AttributeError):
+            LOG.info(
+                "Generator profile 'platform' sub-properties are set but not filled in config file.\
+                TRex will use default values.")
         return result
 
     def check_config_updated(self, generator_config):