diff options
| author |   Pierrick Louin <pierrick.louin@orange.com> | 2019-08-02 15:16:33 +0200 |
|---|---|---|
| committer |   fmenguy <francoisregis.menguy@orange.com> | 2019-10-21 15:07:39 +0200 |
| commit | 97e6de93dc4de1b7724d659c213b5c09a25287d8 (patch) | |
| tree | e4de7c8d38766300d38b976877936fa4350eb3c2 /nfvbench/traffic_server.py | |
| parent | 98aac3b7ed5060d2e498d4ab545482a525339120 (diff) | |
NFVBENCH-146 Add cache_size option
Change-Id: I99c1242198e40bd75cfd013c829d0d24dbafb5d9
Signed-off-by: fmenguy <francoisregis.menguy@orange.com>
Diffstat (limited to 'nfvbench/traffic_server.py')
| -rw-r--r-- | nfvbench/traffic_server.py | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/nfvbench/traffic_server.py b/nfvbench/traffic_server.py index 4dc7dce..8d1cf0f 100644 --- a/nfvbench/traffic_server.py +++ b/nfvbench/traffic_server.py @@ -97,17 +97,24 @@ class TRexTrafficServer(TrafficServer): 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]) @@ -122,11 +129,11 @@ class TRexTrafficServer(TrafficServer): 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') |