aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/python/autogen/Regenerator.py
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2020-02-11 00:57:10 +0000
committerTibor Frank <tifrank@cisco.com>2020-03-03 10:08:30 +0000
commit2b23529065c5db02ebd3aadc093397d7614e6671 (patch)
tree82bf1e1293ca3d90e3e64aa31914e2a522d5d230 /resources/libraries/python/autogen/Regenerator.py
parentf2aec0ea87d403b56251198885d843cf9da38021 (diff)
perf: Clean up Hoststack tests
- Update test names with clients/streams - Convert test results to JSON output * iperf3 results include bits_per_second * vpp_echo results include both client and server output which includes time in seconds and rx_data/tx_data in bytes which can be used to calculate the average bits per second. Tx and Rx data will always be the same: BPS = (client tx_data * 8) / ((client time + server time) / 2) - Fix WRK test results data formatting errors Change-Id: Ie2aeb665e3cc0739b16f97ba2628eebe6e041d22 Signed-off-by: Dave Wallace <dwallacelf@gmail.com> (cherry picked from commit 5570bf3ab49301201dd7607bb4f8de67fd8f16dc)
Diffstat (limited to 'resources/libraries/python/autogen/Regenerator.py')
-rw-r--r--resources/libraries/python/autogen/Regenerator.py67
1 files changed, 18 insertions, 49 deletions
diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py
index 5cd8bcccb7..d40ae7c9fc 100644
--- a/resources/libraries/python/autogen/Regenerator.py
+++ b/resources/libraries/python/autogen/Regenerator.py
@@ -440,50 +440,24 @@ class Regenerator:
min_frame_size = PROTOCOL_TO_MIN_FRAME_SIZE[protocol]
default_kwargs_list = [
- {u"frame_size": min_frame_size, u"phy_cores": 1, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": min_frame_size, u"phy_cores": 2, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": min_frame_size, u"phy_cores": 4, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": 1518, u"phy_cores": 1, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": 1518, u"phy_cores": 2, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": 1518, u"phy_cores": 4, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": 9000, u"phy_cores": 1, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": 9000, u"phy_cores": 2, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": 9000, u"phy_cores": 4, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": u"IMIX_v4_1", u"phy_cores": 1, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": u"IMIX_v4_1", u"phy_cores": 2, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": u"IMIX_v4_1", u"phy_cores": 4, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"}
+ {u"frame_size": min_frame_size, u"phy_cores": 1},
+ {u"frame_size": min_frame_size, u"phy_cores": 2},
+ {u"frame_size": min_frame_size, u"phy_cores": 4},
+ {u"frame_size": 1518, u"phy_cores": 1},
+ {u"frame_size": 1518, u"phy_cores": 2},
+ {u"frame_size": 1518, u"phy_cores": 4},
+ {u"frame_size": 9000, u"phy_cores": 1},
+ {u"frame_size": 9000, u"phy_cores": 2},
+ {u"frame_size": 9000, u"phy_cores": 4},
+ {u"frame_size": u"IMIX_v4_1", u"phy_cores": 1},
+ {u"frame_size": u"IMIX_v4_1", u"phy_cores": 2},
+ {u"frame_size": u"IMIX_v4_1", u"phy_cores": 4}
]
- hoststack_wrk_kwargs_list = [
- {u"frame_size": 0, u"phy_cores": i, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"} for i in (1, 2, 4)
+ hs_wrk_kwargs_list = [
+ {u"frame_size": 0, u"phy_cores": i} for i in (1, 2, 4)
]
- hoststack_iperf3_kwargs_list = [
- {u"frame_size": 0, u"phy_cores": 1, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": 0, u"phy_cores": 1, u"clients": 1,
- u"streams": 10, u"bytes_str": u"1G"},
- ]
- hoststack_quic_kwargs_list = [
- {u"phy_cores": 1, u"frame_size": 0, u"clients": 1,
- u"streams": 1, u"bytes_str": u"10G"},
- {u"phy_cores": 1, u"frame_size": 0, u"clients": 1,
- u"streams": 10, u"bytes_str": u"1G"},
- {u"phy_cores": 1, u"frame_size": 0, u"clients": 10,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"phy_cores": 1, u"frame_size": 0, u"clients": 10,
- u"streams": 10, u"bytes_str": u"100M"},
+ hs_bps_kwargs_list = [
+ {u"frame_size": 0, u"phy_cores": 1},
]
for in_filename in glob(pattern):
@@ -510,14 +484,9 @@ class Regenerator:
elif in_filename.endswith(u"-reconf.robot"):
write_reconf_files(in_filename, in_prolog, default_kwargs_list)
elif in_filename[-10:] in (u"-cps.robot", u"-rps.robot"):
- write_tcp_files(in_filename, in_prolog,
- hoststack_wrk_kwargs_list)
+ write_tcp_files(in_filename, in_prolog, hs_wrk_kwargs_list)
elif in_filename[-10:] in (u"-bps.robot"):
- if u"ldpreload-iperf3" in in_filename:
- hoststack_kwargs_list = hoststack_iperf3_kwargs_list
- else:
- hoststack_kwargs_list = hoststack_quic_kwargs_list
- write_tcp_files(in_filename, in_prolog, hoststack_kwargs_list)
+ write_tcp_files(in_filename, in_prolog, hs_bps_kwargs_list)
else:
raise RuntimeError(
f"Error in {in_filename}: non-primary suite type found."