X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fautogen%2FRegenerator.py;h=6d35d1d13fdad9ec5bb574d550a2c071884e5f72;hb=a5a51a112a0d3475f2368a18b6b42f7712ec5b25;hp=c6038588e6baf5f5ca8bb78180de450aef458725;hpb=14a71b74b414df7616ccb5ada3d50ecb90d96bae;p=csit.git

diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py
index c6038588e6..6d35d1d13f 100644
--- a/resources/libraries/python/autogen/Regenerator.py
+++ b/resources/libraries/python/autogen/Regenerator.py
@@ -130,9 +130,7 @@ def add_default_testcases(testcase, iface, suite_id, file_out, tc_kwargs_list):
     :type file_out: file
     :type tc_kwargs_list: dict
     """
-    # We bump tc number in any case, so that future enables/disables
-    # do not affect the numbering of other test cases.
-    for num, kwargs in enumerate(tc_kwargs_list, start=1):
+    for kwargs in tc_kwargs_list:
         # TODO: Is there a better way to disable some combinations?
         emit = True
         if kwargs[u"frame_size"] == 9000:
@@ -142,10 +140,6 @@ def add_default_testcases(testcase, iface, suite_id, file_out, tc_kwargs_list):
             if u"vic1385" in iface:
                 # Not supported in HW.
                 emit = False
-            if u"ipsec" in suite_id:
-                # IPsec code does not support chained buffers.
-                # Tracked by Jira ticket VPP-1207.
-                emit = False
         if u"-16vm2t-" in suite_id or u"-16dcr2t-" in suite_id:
             if kwargs[u"phy_cores"] > 3:
                 # CSIT lab only has 28 (physical) core processors,
@@ -162,8 +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 kwargs[u"frame_size"] not in MIN_FRAME_SIZE_VALUES:
+                emit = False
         if emit:
-            file_out.write(testcase.generate(num=num, **kwargs))
+            file_out.write(testcase.generate(**kwargs))
 
 
 def add_tcp_testcases(testcase, file_out, tc_kwargs_list):
@@ -176,8 +173,8 @@ def add_tcp_testcases(testcase, file_out, tc_kwargs_list):
     :type file_out: file
     :type tc_kwargs_list: dict
     """
-    for num, kwargs in enumerate(tc_kwargs_list, start=1):
-        file_out.write(testcase.generate(num=num, **kwargs))
+    for kwargs in tc_kwargs_list:
+        file_out.write(testcase.generate(**kwargs))
 
 
 def write_default_files(in_filename, in_prolog, kwargs_list):
@@ -245,12 +242,41 @@ def write_default_files(in_filename, in_prolog, kwargs_list):
                 tmp2_filename
             )
             if u"DPDK" in in_prolog:
-                check_suite_tag(old_suite_tag, tmp2_prolog)
-                with open(tmp2_filename, u"wt") as file_out:
-                    file_out.write(tmp2_prolog)
-                    add_default_testcases(
-                        testcase, iface, old_suite_id, file_out, kwargs_list
+                for driver in Constants.DPDK_NIC_NAME_TO_DRIVER[nic_name]:
+                    out_filename = replace_defensively(
+                        tmp2_filename, old_suite_id,
+                        Constants.DPDK_NIC_DRIVER_TO_SUITE_PREFIX[driver] \
+                            + old_suite_id,
+                        1, u"Error adding driver prefix.", in_filename
+                    )
+                    out_prolog = replace_defensively(
+                        tmp2_prolog, u"vfio-pci", driver, 1,
+                        u"Driver name should appear once.", in_filename
                     )
+                    out_prolog = replace_defensively(
+                        out_prolog,
+                        Constants.DPDK_NIC_DRIVER_TO_TAG[u"vfio-pci"],
+                        Constants.DPDK_NIC_DRIVER_TO_TAG[driver], 1,
+                        u"Driver tag should appear once.", in_filename
+                    )
+                    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.
+                    out_prolog = replace_defensively(
+                        out_prolog, old_suite_tag, suite_tag, 1,
+                        f"Perf suite tag {old_suite_tag} should appear once.",
+                        in_filename
+                    )
+                    check_suite_tag(suite_tag, out_prolog)
+                    # TODO: Reorder loops so suite_id is finalized sooner.
+                    testcase = Testcase.default(suite_id)
+                    with open(out_filename, u"wt") as file_out:
+                        file_out.write(out_prolog)
+                        add_default_testcases(
+                            testcase, iface, suite_id, file_out, kwargs_list
+                        )
                 continue
             for driver in Constants.NIC_NAME_TO_DRIVER[nic_name]:
                 out_filename = replace_defensively(
@@ -453,9 +479,6 @@ class Regenerator:
             {u"frame_size": u"IMIX_v4_1", u"phy_cores": 2},
             {u"frame_size": u"IMIX_v4_1", u"phy_cores": 4}
         ]
-        hs_wrk_kwargs_list = [
-            {u"frame_size": 0, u"phy_cores": i} for i in (1, 2, 4)
-        ]
         hs_bps_kwargs_list = [
             {u"frame_size": 1460, u"phy_cores": 1},
         ]
@@ -486,8 +509,6 @@ class Regenerator:
                 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[-10:] in (u"-cps.robot", u"-rps.robot"):
-                write_tcp_files(in_filename, in_prolog, hs_wrk_kwargs_list)
             elif in_filename.endswith(u"-bps.robot"):
                 hoststack_kwargs_list = \
                     hs_quic_kwargs_list if u"quic" in in_filename \