X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fautogen%2FRegenerator.py;h=3ef4e8554d06ce0185169dc33d79e018005d8c71;hb=d79b753c1fde3cd831f60ac5cc0034f613c44b43;hp=5b112f5a73c662534b2a16b4fbbfd326fed04889;hpb=b340b5c9925b43869b91197850504760757a0bfe;p=csit.git diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py index 5b112f5a73..3ef4e8554d 100644 --- a/resources/libraries/python/autogen/Regenerator.py +++ b/resources/libraries/python/autogen/Regenerator.py @@ -476,13 +476,13 @@ class Regenerator: u"streams": 10, u"bytes_str": u"1G"}, ] hoststack_quic_kwargs_list = [ - {u"frame_size": 0, u"phy_cores": 1, u"clients": 1, - u"streams": 1, u"bytes_str": u"100M"}, - {u"frame_size": 0, u"phy_cores": 1, u"clients": 1, - u"streams": 10, u"bytes_str": u"100M"}, - {u"frame_size": 0, u"phy_cores": 1, u"clients": 10, - u"streams": 1, u"bytes_str": u"100M"}, - {u"frame_size": 0, u"phy_cores": 1, u"clients": 10, + {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"}, ] @@ -512,10 +512,12 @@ class Regenerator: elif in_filename[-10:] in (u"-cps.robot", u"-rps.robot"): 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) + 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) else: raise RuntimeError( f"Error in {in_filename}: non-primary suite type found."