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

diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py
index d40ae7c9fc..c6038588e6 100644
--- a/resources/libraries/python/autogen/Regenerator.py
+++ b/resources/libraries/python/autogen/Regenerator.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -14,7 +14,7 @@
 """Module defining utilities for test directory regeneration.
 
 TODO: How can we check each suite id is unique,
-when currently the suite generation is run on each directory separately?
+      when currently the suite generation is run on each directory separately?
 """
 
 import sys
@@ -234,7 +234,7 @@ def write_default_files(in_filename, in_prolog, kwargs_list):
             )
             if tmp2_prolog.count(u"HW_") == 2:
                 # TODO CSIT-1481: Crypto HW should be read
-                # from topology file instead.
+                #      from topology file instead.
                 if nic_name in Constants.NIC_NAME_TO_CRYPTO_HW:
                     tmp2_prolog = replace_defensively(
                         tmp2_prolog, u"HW_DH895xcc",
@@ -273,9 +273,9 @@ def write_default_files(in_filename, in_prolog, kwargs_list):
                     u"Driver plugin should appear once.", in_filename
                 )
                 out_prolog = replace_defensively(
-                    out_prolog, Constants.NIC_DRIVER_TO_SETUP_ARG[u"vfio-pci"],
-                    Constants.NIC_DRIVER_TO_SETUP_ARG[driver], 1,
-                    u"Perf setup argument should appear once.", in_filename
+                    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
@@ -326,7 +326,7 @@ def write_reconf_files(in_filename, in_prolog, kwargs_list):
         )
         if tmp_prolog.count(u"HW_") == 2:
             # TODO CSIT-1481: Crypto HW should be read
-            # from topology file instead.
+            #      from topology file instead.
             if nic_name in Constants.NIC_NAME_TO_CRYPTO_HW.keys():
                 tmp_prolog = replace_defensively(
                     tmp_prolog, u"HW_DH895xcc",
@@ -357,9 +357,9 @@ def write_reconf_files(in_filename, in_prolog, kwargs_list):
                 u"Driver plugin should appear once.", in_filename
             )
             out_prolog = replace_defensively(
-                out_prolog, Constants.NIC_DRIVER_TO_SETUP_ARG[u"vfio-pci"],
-                Constants.NIC_DRIVER_TO_SETUP_ARG[driver], 1,
-                u"Perf setup argument should appear once.", in_filename
+                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(
@@ -457,7 +457,10 @@ class Regenerator:
             {u"frame_size": 0, u"phy_cores": i} for i in (1, 2, 4)
         ]
         hs_bps_kwargs_list = [
-            {u"frame_size": 0, u"phy_cores": 1},
+            {u"frame_size": 1460, u"phy_cores": 1},
+        ]
+        hs_quic_kwargs_list = [
+            {u"frame_size": 1280, u"phy_cores": 1},
         ]
 
         for in_filename in glob(pattern):
@@ -485,8 +488,11 @@ class Regenerator:
                 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[-10:] in (u"-bps.robot"):
-                write_tcp_files(in_filename, in_prolog, hs_bps_kwargs_list)
+            elif in_filename.endswith(u"-bps.robot"):
+                hoststack_kwargs_list = \
+                    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)
             else:
                 raise RuntimeError(
                     f"Error in {in_filename}: non-primary suite type found."