aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/python/autogen/Regenerator.py
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2020-01-08 20:51:43 +0000
committerPeter Mikus <pmikus@cisco.com>2020-01-17 13:52:00 +0000
commit96bce92149e6ba9a6590a94347f42645ea8ac861 (patch)
treec047a2a1ba456c2b6f757effaceb4fbd41b52ef6 /resources/libraries/python/autogen/Regenerator.py
parente206bb978809135e907841db46ea5765070e818e (diff)
perf: add TCP Iperf3+LDPRELOAD test suite
Change-Id: Icff49fb31cce342a2a4ae799e844ec91f9e5e366 Signed-off-by: Dave Wallace <dwallacelf@gmail.com> (cherry picked from commit 6518c73a0e5cdaf12ae01d247a65aec287d01625)
Diffstat (limited to 'resources/libraries/python/autogen/Regenerator.py')
-rw-r--r--resources/libraries/python/autogen/Regenerator.py71
1 files changed, 55 insertions, 16 deletions
diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py
index d47680ccd0..cb0d3329d5 100644
--- a/resources/libraries/python/autogen/Regenerator.py
+++ b/resources/libraries/python/autogen/Regenerator.py
@@ -113,7 +113,7 @@ def check_suite_tag(suite_tag, prolog):
"""
found = prolog.count(u"| " + suite_tag)
if found != 1:
- raise ValueError(f"Suite tag found {found} times for {suite_id}")
+ raise ValueError(f"Suite tag found {found} times for {suite_tag}")
def add_default_testcases(testcase, iface, suite_id, file_out, tc_kwargs_list):
@@ -440,22 +440,56 @@ 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"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}
+ {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"}
]
- tcp_kwargs_list = [
- {u"phy_cores": i, u"frame_size": 0} for i in (1, 2, 4)
+ hoststack_wrk_kwargs_list = [
+ {u"phy_cores": i, u"frame_size": 0, u"clients": 1,
+ u"streams": 1, u"bytes_str": u"1G"} for i in (1, 2, 4)
]
+ hoststack_iperf3_kwargs_list = [
+ {u"phy_cores": 1, u"frame_size": 0, u"clients": 1,
+ u"streams": 1, u"bytes_str": u"1G"},
+ {u"phy_cores": 1, u"frame_size": 0, u"clients": 1,
+ u"streams": 10, u"bytes_str": u"10G"},
+ {u"phy_cores": 2, u"frame_size": 0, u"clients": 1,
+ u"streams": 10, u"bytes_str": u"10G"},
+ {u"phy_cores": 4, u"frame_size": 0, u"clients": 1,
+ u"streams": 10, u"bytes_str": u"10G"},
+ ]
+ hoststack_quic_kwargs_list = [
+ {u"phy_cores": 1, u"frame_size": 0, u"clients": 1,
+ u"streams": 1, u"bytes_str": u"100M"},
+ {u"phy_cores": 1, u"frame_size": 0, u"clients": 1,
+ u"streams": 10, u"bytes_str": u"100M"},
+ {u"phy_cores": 1, u"frame_size": 0, u"clients": 10,
+ u"streams": 1, u"bytes_str": u"100M"},
+ {u"phy_cores": 1, u"frame_size": 0, u"clients": 10,
+ u"streams": 10, u"bytes_str": u"100M"},
+ ]
+
for in_filename in glob(pattern):
if not self.quiet:
print(
@@ -480,7 +514,12 @@ 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, tcp_kwargs_list)
+ write_tcp_files(in_filename, in_prolog,
+ hoststack_wrk_kwargs_list)
+ elif in_filename[-10:] in (u"-bps.robot"):
+ write_tcp_files(in_filename, in_prolog,
+ hoststack_iperf3_kwargs_list if u"iperf3"
+ in in_filename else hoststack_quic_kwargs_list)
else:
raise RuntimeError(
f"Error in {in_filename}: non-primary suite type found."