fix(Autogen): VSAP driver combinations

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: Ieac8cd32009bebbd1a3324a81becfbf3abb814ab

diff --git a/docs/job_specs/report_iterative/2n-clx/vsap-00.md b/docs/job_specs/report_iterative/2n-clx/vsap-00.md
index b537bdc..88a334e 100644 (file)
--- a/docs/job_specs/report_iterative/2n-clx/vsap-00.md
+++ b/docs/job_specs/report_iterative/2n-clx/vsap-00.md
@@ -1,9 +1,4 @@
 # 2n-clx
-### tests 24
-### job hrs est. ?
-### job hrs real ?
-### test mins est. ?
-### test mins real ?
 ## ./container_memif
 ## ./crypto
 ## ./ip4
@@ -19,35 +14,15 @@
 ## ./nfv_density/vm_vhost/chain_dot1qip4vxlan
 ## ./srv6
 ## ./hoststack
-### intel-e810cq
-#### dpdk-vfio-pci
-##### eth-ip4tcphttp-ldpreload-nginx-1_14_2
-1c AND 0b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_14_2
-1c AND 64b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_14_2
-1c AND 1024b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_14_2
-1c AND 2048b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_14_2
-1c AND 0b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_14_2
-1c AND 64b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_14_2
-1c AND 1024b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_14_2
-1c AND 2048b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_14_2
-##### eth-ip4tcphttp-ldpreload-nginx-1_15_0
-1c AND 0b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
-1c AND 64b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
-1c AND 1024b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
-1c AND 2048b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
-1c AND 0b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
-1c AND 64b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
-1c AND 1024b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
-1c AND 2048b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
 ### mellanox-cx556a
 #### dpdk-vfio-pci
 ##### eth-ip4tcphttp-ldpreload-nginx-1_15_0
-1c AND 0b AND cps AND cx556a AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
-1c AND 64b AND cps AND cx556a AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
-1c AND 1024b AND cps AND cx556a AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
-1c AND 2048b AND cps AND cx556a AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
-1c AND 0b AND rps AND cx556a AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
-1c AND 64b AND rps AND cx556a AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
-1c AND 1024b AND rps AND cx556a AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
-1c AND 2048b AND rps AND cx556a AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
+1c AND 0b AND cps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
+1c AND 64b AND cps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
+1c AND 1024b AND cps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
+1c AND 2048b AND cps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
+1c AND 0b AND rps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
+1c AND 64b AND rps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
+1c AND 1024b AND rps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
+1c AND 2048b AND rps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_15_0
 ## ./vm_vhost

diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py
index bb2e5b5..8fac5b0 100644 (file)
--- a/resources/libraries/python/autogen/Regenerator.py
+++ b/resources/libraries/python/autogen/Regenerator.py
@@ -449,8 +449,6 @@ def write_reconf_files(in_filename, in_prolog, kwargs_list):
 def write_tcp_files(in_filename, in_prolog, kwargs_list):
     """Using given filename and prolog, write all generated tcp suites.
 
-    TODO: Suport drivers.
-
     :param in_filename: Template filename to derive real filenames from.
     :param in_prolog: Template content to derive real content from.
     :param kwargs_list: List of kwargs for add_default_testcase.
@@ -462,20 +460,53 @@ def write_tcp_files(in_filename, in_prolog, kwargs_list):
     _, suite_id, suite_tag = get_iface_and_suite_ids(in_filename)
     testcase = Testcase.tcp(suite_id)
     for nic_name in Constants.NIC_NAME_TO_CODE:
-        out_filename = replace_defensively(
+        tmp_filename = replace_defensively(
             in_filename, u"10ge2p1x710",
             Constants.NIC_NAME_TO_CODE[nic_name], 1,
             u"File name should contain NIC code once.", in_filename
         )
-        out_prolog = replace_defensively(
+        tmp_prolog = replace_defensively(
             in_prolog, u"Intel-X710", nic_name, 2,
             u"NIC name should appear twice (tag and variable).",
             in_filename
         )
-        check_suite_tag(suite_tag, out_prolog)
-        with open(out_filename, u"wt") as file_out:
-            file_out.write(out_prolog)
-            add_tcp_testcases(testcase, file_out, kwargs_list)
+        iface, old_suite_id, old_suite_tag = get_iface_and_suite_ids(
+            tmp_filename
+        )
+        for driver in Constants.NIC_NAME_TO_DRIVER[nic_name]:
+            out_filename = replace_defensively(
+                tmp_filename, old_suite_id,
+                Constants.NIC_DRIVER_TO_SUITE_PREFIX[driver] + old_suite_id,
+                1, u"Error adding driver prefix.", in_filename
+            )
+            out_prolog = replace_defensively(
+                tmp_prolog, u"vfio-pci", driver, 1,
+                u"Driver name should appear once.", in_filename
+            )
+            out_prolog = replace_defensively(
+                out_prolog, Constants.NIC_DRIVER_TO_TAG[u"vfio-pci"],
+                Constants.NIC_DRIVER_TO_TAG[driver], 1,
+                u"Driver tag should appear once.", in_filename
+            )
+            out_prolog = replace_defensively(
+                out_prolog, Constants.NIC_DRIVER_TO_PLUGINS[u"vfio-pci"],
+                Constants.NIC_DRIVER_TO_PLUGINS[driver], 1,
+                u"Driver plugin should appear once.", in_filename
+            )
+            out_prolog = replace_defensively(
+                out_prolog, Constants.NIC_DRIVER_TO_VFS[u"vfio-pci"],
+                Constants.NIC_DRIVER_TO_VFS[driver], 1,
+                u"NIC VFs argument should appear once.", in_filename
+            )
+            iface, suite_id, suite_tag = get_iface_and_suite_ids(out_filename)
+            out_prolog = replace_defensively(
+                out_prolog, old_suite_tag, suite_tag, 1,
+                u"Perf suite tag should appear once.", in_filename
+            )
+            check_suite_tag(suite_tag, out_prolog)
+            with open(out_filename, u"wt") as file_out:
+                file_out.write(out_prolog)
+                add_tcp_testcases(testcase, file_out, kwargs_list)
 
 
 def write_iperf3_files(in_filename, in_prolog, kwargs_list):