X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fautogen%2FRegenerator.py;h=e670b692de53c31a4d7e6e0bffd76c2cedd3acaf;hb=7f138bad98908762f9e738c2d7c47ac204acae71;hp=dd2672bd7c30b1a9a2ef679d5060004a24c3640a;hpb=44dcb3113c8ade2e44543746abca861a89362c9b;p=csit.git diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py index dd2672bd7c..e670b692de 100644 --- a/resources/libraries/python/autogen/Regenerator.py +++ b/resources/libraries/python/autogen/Regenerator.py @@ -156,7 +156,11 @@ def add_default_testcases(testcase, iface, suite_id, file_out, tc_kwargs_list): emit = False if kwargs[u"frame_size"] not in MIN_FRAME_SIZE_VALUES: emit = False - if u"-cps-" in suite_id or u"-pps-" in suite_id: + if ( + u"-cps-" in suite_id + or u"-pps-" in suite_id + or u"-tput-" in suite_id + ): if kwargs[u"frame_size"] not in MIN_FRAME_SIZE_VALUES: emit = False if emit: @@ -532,6 +536,22 @@ class Regenerator: {u"frame_size": 128000, u"phy_cores": 2}, {u"frame_size": 128000, u"phy_cores": 4} ] + # List for tests with one dataplane core + # (and variable number of other cores). + dp1_kwargs_list = [ + {u"frame_size": min_frame_size, u"phy_cores": 2}, + {u"frame_size": min_frame_size, u"phy_cores": 3}, + {u"frame_size": min_frame_size, u"phy_cores": 4}, + {u"frame_size": 1518, u"phy_cores": 2}, + {u"frame_size": 1518, u"phy_cores": 3}, + {u"frame_size": 1518, u"phy_cores": 4}, + {u"frame_size": 9000, u"phy_cores": 2}, + {u"frame_size": 9000, u"phy_cores": 3}, + {u"frame_size": 9000, u"phy_cores": 4}, + {u"frame_size": u"IMIX_v4_1", u"phy_cores": 2}, + {u"frame_size": u"IMIX_v4_1", u"phy_cores": 3}, + {u"frame_size": u"IMIX_v4_1", u"phy_cores": 4} + ] for in_filename in glob(pattern): if not self.quiet: @@ -553,7 +573,14 @@ class Regenerator: file_in.read().partition(u"*** Test Cases ***")[:-1] ) if in_filename.endswith(u"-ndrpdr.robot"): - write_default_files(in_filename, in_prolog, default_kwargs_list) + if u"scheduler" in in_filename: + write_default_files( + in_filename, in_prolog, dp1_kwargs_list + ) + else: + write_default_files( + in_filename, in_prolog, default_kwargs_list + ) elif in_filename.endswith(u"-reconf.robot"): write_reconf_files(in_filename, in_prolog, default_kwargs_list) elif in_filename.endswith(u"-bps.robot"): @@ -561,7 +588,7 @@ class Regenerator: hs_quic_kwargs_list if u"quic" in in_filename \ else hs_bps_kwargs_list write_tcp_files(in_filename, in_prolog, hoststack_kwargs_list) - elif in_filename.endswith(u"-iperf3.robot"): + elif in_filename.endswith(u"-iperf3-mrr.robot"): write_iperf3_files(in_filename, in_prolog, iperf3_kwargs_list) else: raise RuntimeError(