79 files changed, 47 insertions, 45 deletions

diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py
index c822b16d10..bae0e4f9fe 100644
--- a/resources/libraries/python/autogen/Regenerator.py
+++ b/resources/libraries/python/autogen/Regenerator.py
@@ -74,6 +74,7 @@ class Regenerator(object):
             "ip6": 78,
             "vxlan+ip4": 114  # What is the real minimum for latency stream?
         }
+        min_framesize_values = protocol_to_min_framesize.values()
 
         def get_iface_and_suite_id(filename):
             """Get interface and suite ID.
@@ -108,20 +109,30 @@ class Regenerator(object):
             :rtype: int
             """
             # TODO: Is there a better way to disable some combinations?
-            if kwargs["framesize"] == 9000 and "vic1227" in iface:
-                # Not supported in HW.
-                pass
-            elif kwargs["framesize"] == 9000 and "avf" in suite_id:
-                # Not supported by AVF driver.
-                # https://git.fd.io/vpp/tree/src/plugins/avf/README.md
-                pass
-            elif ("soak" in suite_id and
-                  (kwargs["phy_cores"] != 1
-                   or kwargs["framesize"] in (1518, 9000, "IMIX_v4_1"))):
+            emit = True
+            if kwargs["framesize"] == 9000:
+                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
+                    emit = False
+            if "-16vm-" in suite_id or "-16dcr-" 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 "soak" in suite_id:
                 # Soak test take too long, do not risk other than tc01.
-                pass
-            else:
+                if kwargs["phy_cores"] != 1:
+                    emit = False
+                if kwargs["framesize"] not in min_framesize_values:
+                    emit = False
+            if emit:
                 file_out.write(testcase.generate(num=num, **kwargs))
+            # We bump tc number in any case, so that future enables/disables
+            # do not affect the numbering of other test cases.
             return num + 1
 
         def add_testcases(testcase, iface, suite_id, file_out, tc_kwargs_list):
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-1chain-6dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr.robot
index f8eacdd3e2..f8eacdd3e2 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-1chain-6dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-1chain-6dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-1chain-6dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr.robot
index f4b222244d..f4b222244d 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-1chain-6dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-1chain-6dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6chain-6dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr.robot
index bdd6022036..bdd6022036 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6chain-6dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6chain-6dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6chain-6dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr.robot
index 443275381b..443275381b 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6chain-6dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6chain-6dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-12dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr.robot
index f205c49808..f205c49808 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-12dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-12dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-12dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr.robot
index e5821e6e08..e5821e6e08 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-12dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-12dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-6dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr.robot
index c0f32e4e87..c0f32e4e87 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-6dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-6dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr.robot
index fc19fcc58d..fc19fcc58d 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-12memif-6pipe-6dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-1chain-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr.robot
index 422193b689..422193b689 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-1chain-8dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-1chain-8dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-1chain-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr.robot
index bf4e55c5b9..bf4e55c5b9 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-1chain-8dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-1chain-8dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-2chain-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr.robot
index e7eadfbb64..e7eadfbb64 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-2chain-8dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-2chain-8dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-2chain-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr.robot
index 6aee137681..6aee137681 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-2chain-8dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-2chain-8dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-4chain-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr.robot
index 7bbfaf3056..7bbfaf3056 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-4chain-8dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-4chain-8dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-4chain-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr.robot
index f30f6c856d..a3b9e141f3 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-4chain-8dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr.robot
@@ -97,50 +97,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc01-64B-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc02-64B-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc03-64B-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc04-1518B-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc05-1518B-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc06-1518B-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc07-9000B-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc08-9000B-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc09-9000B-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-16memif-4chain-8dcrr-vppip4-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-16memif-4chain-8dcr-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8chain-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr.robot
index 5e36a2be46..5e36a2be46 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8chain-8dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8chain-8dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8chain-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr.robot
index e491eeb0ba..e491eeb0ba 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8chain-8dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8chain-8dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-16dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr.robot
index 3a42d20ea0..3a42d20ea0 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-16dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-16dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-16dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr.robot
index 10606a71a1..10606a71a1 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-16dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-16dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr.robot
index 31564df1dd..31564df1dd 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-8dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-8dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr.robot
index ccb3b2c589..ccb3b2c589 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-16memif-8pipe-8dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-16memif-8pipe-8dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10chain-10dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr.robot
index 65d2f3244f..65d2f3244f 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10chain-10dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10chain-10dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10chain-10dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr.robot
index ad914acf15..ad914acf15 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10chain-10dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10chain-10dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10pipe-10dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr.robot
index ca66dc2002..ca66dc2002 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10pipe-10dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10pipe-10dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10pipe-10dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr.robot
index 6f08ad23f4..6f08ad23f4 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-10pipe-10dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-10pipe-10dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-1chain-10dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr.robot
index d1be40a482..d1be40a482 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-1chain-10dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-1chain-10dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-1chain-10dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr.robot
index 4929918914..4929918914 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-20memif-1chain-10dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-20memif-1chain-10dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-2chain-12dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr.robot
index a5eb17557c..a5eb17557c 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-2chain-12dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-2chain-12dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-2chain-12dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr.robot
index 39e07a4faf..39e07a4faf 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-2chain-12dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-2chain-12dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-6chain-12dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr.robot
index 54dee8f594..54dee8f594 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-6chain-12dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-6chain-12dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-6chain-12dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr.robot
index 7b08dcd118..7b08dcd118 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-24memif-6chain-12dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-24memif-6chain-12dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1chain-1dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr.robot
index b7276598d6..b7276598d6 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1chain-1dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1chain-1dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1chain-1dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr.robot
index 44b7640060..44b7640060 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1chain-1dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1chain-1dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-10dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr.robot
index 9af708933f..9af708933f 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-10dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-10dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-10dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr.robot
index 90483d8bf0..90483d8bf0 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-10dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-10dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-1dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr.robot
index 2071c05848..2071c05848 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-1dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-1dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-1dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr.robot
index 318ca5ad2d..318ca5ad2d 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-1dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-1dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-2dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr.robot
index d6c9e137b7..d6c9e137b7 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-2dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-2dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-2dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr.robot
index 883fbe2e34..883fbe2e34 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-2dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-2dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-4dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr.robot
index 1b7f8917f1..1b7f8917f1 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-4dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-4dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-4dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr.robot
index c6a243cc25..c6a243cc25 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-4dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-4dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-6dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr.robot
index e161a2d6c0..e161a2d6c0 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-6dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-6dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-6dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr.robot
index 7e7c380808..7e7c380808 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-6dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-6dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr.robot
index f8cd5e7dfb..f8cd5e7dfb 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-8dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-8dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr.robot
index 7636df73bd..7636df73bd 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-2memif-1pipe-8dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-2memif-1pipe-8dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-2chain-16dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr.robot
index 9466d989f2..14929f6bc2 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-2chain-16dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr.robot
@@ -122,4 +122,3 @@
 | tc11-IMIX-2c-eth-l2bd-32memif-2chain-16dcr-vppip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
-
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-2chain-16dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr.robot
index cfffdad46c..cfffdad46c 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-2chain-16dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-2chain-16dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-4chain-16dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr.robot
index e000112c41..6e422f4fd8 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-4chain-16dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr.robot
@@ -122,4 +122,3 @@
 | tc11-IMIX-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
-
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-4chain-16dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr.robot
index 74bdac6b10..f64c84eaf6 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-4chain-16dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr.robot
@@ -128,4 +128,3 @@
 | tc11-IMIX-2c-eth-l2bd-32memif-4chain-16dcr-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
-
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-8chain-16dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr.robot
index e8b0dce650..298f758e97 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-8chain-16dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr.robot
@@ -122,4 +122,3 @@
 | tc11-IMIX-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
-
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-8chain-16dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr.robot
index 99564d601c..e992fe9203 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-32memif-8chain-16dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr.robot
@@ -128,4 +128,3 @@
 | tc11-IMIX-2c-eth-l2bd-32memif-8chain-16dcr-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
-
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-1chain-2dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr.robot
index 84b25cac41..84b25cac41 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-1chain-2dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-1chain-2dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-1chain-2dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr.robot
index 31d294aaef..31d294aaef 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-1chain-2dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-1chain-2dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2chain-2dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr.robot
index 305ab86910..305ab86910 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2chain-2dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2chain-2dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2chain-2dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr.robot
index 338c2a42b8..338c2a42b8 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2chain-2dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2chain-2dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-12dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr.robot
index 53ef42c5a9..53ef42c5a9 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-12dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-12dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-12dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr.robot
index 7b56186223..7b56186223 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-12dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-12dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-16dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr.robot
index dbaf74c64d..6c9954368b 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-16dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr.robot
@@ -122,4 +122,3 @@
 | tc11-IMIX-2c-eth-l2bd-4memif-2pipe-16dcr-vppip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
-
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-16dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr.robot
index dc8bfdb001..dc8bfdb001 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-16dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-16dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-2dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr.robot
index 92e8f92332..92e8f92332 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-2dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-2dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-2dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr.robot
index 8f192ea2e0..8f192ea2e0 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-2dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-2dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-4dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr.robot
index 0067505031..0067505031 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-4dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-4dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-4dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr.robot
index 8ddc84d1d3..8ddc84d1d3 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-4dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-4dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr.robot
index 58bf50fde5..58bf50fde5 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-8dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-8dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr.robot
index 8413a0bb89..8413a0bb89 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-4memif-2pipe-8dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-4memif-2pipe-8dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-1chain-4dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr.robot
index 7d8837438a..7d8837438a 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-1chain-4dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-1chain-4dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-1chain-4dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr.robot
index a77f13a7b4..a77f13a7b4 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-1chain-4dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-1chain-4dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-2chain-4dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr.robot
index 558807a54a..558807a54a 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-2chain-4dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-2chain-4dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-2chain-4dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr.robot
index c000a3ada9..c000a3ada9 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-2chain-4dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-2chain-4dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4chain-4dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr.robot
index a9f305e623..a9f305e623 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4chain-4dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4chain-4dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4chain-4dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr.robot
index 84cd660ade..84cd660ade 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4chain-4dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4chain-4dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-16dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr.robot
index 46a94a336b..0f6b369cc6 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-16dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr.robot
@@ -122,4 +122,3 @@
 | tc11-IMIX-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
-
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-16dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr.robot
index 510bd755f5..af364ace29 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-16dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr.robot
@@ -128,4 +128,3 @@
 | tc11-IMIX-2c-eth-l2bd-8memif-4pipe-16dcr-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
-
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-4dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr.robot
index c1daf3092e..c1daf3092e 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-4dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-4dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-4dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr.robot
index 37cf9066ea..37cf9066ea 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-4dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-4dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-8dcr-vppip4-mrr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr.robot
index 0ccc5dd2fc..0ccc5dd2fc 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-8dcr-vppip4-mrr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-8dcr-vppip4-mrr.robot
diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-8dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr.robot
index ba07eaf8f3..ba07eaf8f3 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-eth-8memif-4pipe-8dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-8memif-4pipe-8dcr-vppip4-ndrpdr.robot
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr.robot
index 397d3f8f70..938c7b74ff 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr.robot
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc01-64B-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc02-64B-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc03-64B-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc04-1518B-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc05-1518B-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc06-1518B-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc07-9000B-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc08-9000B-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc09-9000B-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr.robot
index 4cfeaa360f..829ffdd5a0 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr.robot
@@ -124,4 +124,3 @@
 | tc11-IMIX-2c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
-