summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/hugepages.py2
-rw-r--r--tools/pkt_gen/testcenter/testcenter.py16
2 files changed, 10 insertions, 8 deletions
diff --git a/tools/hugepages.py b/tools/hugepages.py
index bba40122..d233f04d 100644
--- a/tools/hugepages.py
+++ b/tools/hugepages.py
@@ -42,7 +42,7 @@ def get_hugepage_size():
for line in data:
match = hugepage_size_re.search(line)
if match:
- _LOGGER.info('Hugepages size: %s', match.group('size_hp'))
+ _LOGGER.info('Hugepages size: %s kb', match.group('size_hp'))
return int(match.group('size_hp'))
else:
_LOGGER.error('Could not parse for hugepage size')
diff --git a/tools/pkt_gen/testcenter/testcenter.py b/tools/pkt_gen/testcenter/testcenter.py
index c242269a..a6cea2e1 100644
--- a/tools/pkt_gen/testcenter/testcenter.py
+++ b/tools/pkt_gen/testcenter/testcenter.py
@@ -95,8 +95,6 @@ def get_rfc2544_common_settings():
settings.getValue("TRAFFICGEN_STC_WEST_INTF_ADDR"),
"--west_intf_gateway_addr",
settings.getValue("TRAFFICGEN_STC_WEST_INTF_GATEWAY_ADDR"),
- "--num_trials",
- settings.getValue("TRAFFICGEN_STC_NUMBER_OF_TRIALS"),
"--trial_duration_sec",
settings.getValue("TRAFFICGEN_STC_TRIAL_DURATION_SEC"),
"--traffic_pattern",
@@ -104,14 +102,16 @@ def get_rfc2544_common_settings():
return args
-def get_rfc2544_custom_settings(framesize, custom_tr):
+def get_rfc2544_custom_settings(framesize, custom_tr, tests):
"""
Return RFC2544 Custom Settings
"""
args = ["--frame_size_list",
str(framesize),
"--traffic_custom",
- str(custom_tr)]
+ str(custom_tr),
+ "--num_trials",
+ str(tests)]
return args
@@ -192,7 +192,7 @@ class TestCenter(trafficgen.ITrafficGenerator):
stc_common_args = get_stc_common_settings()
rfc2544_common_args = get_rfc2544_common_settings()
rfc2544_custom_args = get_rfc2544_custom_settings(framesize,
- custom)
+ custom, 1)
args = stc_common_args + rfc2544_common_args + rfc2544_custom_args
if settings.getValue("TRAFFICGEN_STC_VERBOSE") is "True":
@@ -224,7 +224,8 @@ class TestCenter(trafficgen.ITrafficGenerator):
stc_common_args = get_stc_common_settings()
rfc2544_common_args = get_rfc2544_common_settings()
- rfc2544_custom_args = get_rfc2544_custom_settings(framesize, '')
+ rfc2544_custom_args = get_rfc2544_custom_settings(framesize, '',
+ tests)
args = stc_common_args + rfc2544_common_args + rfc2544_custom_args
if settings.getValue("TRAFFICGEN_STC_VERBOSE") is "True":
@@ -256,7 +257,8 @@ class TestCenter(trafficgen.ITrafficGenerator):
stc_common_args = get_stc_common_settings()
rfc2544_common_args = get_rfc2544_common_settings()
- rfc2544_custom_args = get_rfc2544_custom_settings(framesize, '')
+ rfc2544_custom_args = get_rfc2544_custom_settings(framesize, '',
+ tests)
args = stc_common_args + rfc2544_common_args + rfc2544_custom_args
if settings.getValue("TRAFFICGEN_STC_VERBOSE") is "True":