X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fautogen%2FRegenerator.py;h=3ef4e8554d06ce0185169dc33d79e018005d8c71;hb=d79b753c1fde3cd831f60ac5cc0034f613c44b43;hp=cb0d3329d5fe39eab65218e4afd818c2df029c56;hpb=6518c73a0e5cdaf12ae01d247a65aec287d01625;p=csit.git

diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py
index cb0d3329d5..3ef4e8554d 100644
--- a/resources/libraries/python/autogen/Regenerator.py
+++ b/resources/libraries/python/autogen/Regenerator.py
@@ -280,8 +280,8 @@ def write_default_files(in_filename, in_prolog, kwargs_list):
                 iface, suite_id, suite_tag = get_iface_and_suite_ids(
                     out_filename
                 )
-                # The next replace is probably a noop, but it is safer to maintain
-                # the same structure as for other edits.
+                # The next replace is probably a noop, but it is safer to
+                # maintain the same structure as for other edits.
                 out_prolog = replace_defensively(
                     out_prolog, old_suite_tag, suite_tag, 1,
                     f"Perf suite tag {old_suite_tag} should appear once.",
@@ -466,26 +466,22 @@ class Regenerator:
              u"streams": 1, u"bytes_str": u"1G"}
         ]
         hoststack_wrk_kwargs_list = [
-            {u"phy_cores": i, u"frame_size": 0, u"clients": 1,
+            {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)
         ]
         hoststack_iperf3_kwargs_list = [
-            {u"phy_cores": 1, u"frame_size": 0, u"clients": 1,
+            {u"frame_size": 0, u"phy_cores": 1, 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"},
+            {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"100M"},
+             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"100M"},
+             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"100M"},
+             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"},
         ]
@@ -517,9 +513,11 @@ class Regenerator:
                 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)
+                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."