import subprocess
import yaml
-from log import LOG
+from .log import LOG
class TrafficServerException(Exception):
try:
result = yaml.safe_load(stream)
except yaml.YAMLError as exc:
- print exc
+ print(exc)
return result
def __save_config(self, generator_config, filename):
prefix=generator_config.name,
limit_memory=generator_config.limit_memory,
ifs=ifs)
+ if hasattr(generator_config, 'mbuf_64') and generator_config.mbuf_64:
+ result += """
+ memory :
+ mbuf_64 : {mbuf_64}""".format(mbuf_64=generator_config.mbuf_64)
+
if self.__check_platform_config(generator_config):
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)
+ dual_if:""".format(master_thread_id=generator_config.gen_config.platform.
+ master_thread_id,
+ latency_thread_id=generator_config.gen_config.platform.
+ latency_thread_id)
result += platform
- for core in generator_config.platform.dual_if:
+ for core in generator_config.gen_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)
+ LOG.warning("No threads defined for socket %s", core.socket)
core_result = """
- socket : {socket}
threads : [{threads}]""".format(socket=core.socket, threads=threads)
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
+ return hasattr(generator_config.gen_config, 'platform') \
+ and hasattr(generator_config.gen_config.platform, "master_thread_id") \
+ and generator_config.gen_config.platform.master_thread_id is not None \
+ and hasattr(generator_config.gen_config.platform, "latency_thread_id") \
+ and generator_config.gen_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')