X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fautogen%2FRegenerator.py;h=ee387e1c4fbf2d815a20bb4906500e6a6b36d535;hp=f47c88b022f65abfb325be60d750661642180802;hb=065313317117200ae456d1462be8af7898c5302e;hpb=5e6145a4260ffce1c302e94b9b241851f90838e1

diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py
index f47c88b022..ee387e1c4f 100644
--- a/resources/libraries/python/autogen/Regenerator.py
+++ b/resources/libraries/python/autogen/Regenerator.py
@@ -115,11 +115,15 @@ class Regenerator(object):
                 if "vic1227" in iface:
                     # Not supported in HW.
                     emit = False
-                if "avf" in suite_id:
-                    # Not supported by AVF driver.
-                    # https://git.fd.io/vpp/tree/src/plugins/avf/README.md
+                if "vic1385" in iface:
+                    # Not supported in HW.
+                    emit = False
+            if "-16vm2t-" in suite_id or "-16dcr2t-" in suite_id:
+                if kwargs["phy_cores"] > 3:
+                    # CSIT lab only has 28 (physical) core processors,
+                    # so these test would fail when attempting to assign cores.
                     emit = False
-            if "-16vm-" in suite_id or "-16dcr-" in suite_id:
+            if "-24vm1t-" in suite_id or "-24dcr1t-" in suite_id:
                 if kwargs["phy_cores"] > 3:
                     # CSIT lab only has 28 (physical) core processors,
                     # so these test would fail when attempting to assign cores.