aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2018-09-21 14:24:24 +0200
committerVratko Polak <vrpolak@cisco.com>2018-09-21 14:25:09 +0200
commitbb0f69d12e0e509c58bb5b8116d73bb585a4ea09 (patch)
treeb2e171fa0e92b47da422645a147faa42852fe2bd
parentdea603c08a0afdab48af34bba7463f9029218aa2 (diff)
Fix autogen regenerator and few suites
+ "elif" instead of "else if". + Some suites had test cases reordered. + Some suites contained 9000B cases for avf. Change-Id: I3bf8241c317f20dbf66b497a2c8be35ef71307f5 Signed-off-by: Vratko Polak <vrpolak@cisco.com>
-rw-r--r--resources/libraries/python/autogen/Regenerator.py2
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-mrr.robot38
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot38
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-mrr.robot12
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot12
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-mrr.robot38
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot38
-rw-r--r--tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2bdbasemaclrn-mrr.robot38
-rw-r--r--tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2bdbasemaclrn-ndrpdr.robot38
-rw-r--r--tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2patch-mrr.robot12
-rw-r--r--tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2patch-ndrpdr.robot12
-rw-r--r--tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2xcbase-mrr.robot38
-rw-r--r--tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2xcbase-ndrpdr.robot38
13 files changed, 153 insertions, 201 deletions
diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py
index 1c265c3f3c..c0937df4e8 100644
--- a/resources/libraries/python/autogen/Regenerator.py
+++ b/resources/libraries/python/autogen/Regenerator.py
@@ -97,7 +97,7 @@ class Regenerator(object):
if kwargs["framesize"] == 9000 and "vic1227" in iface:
# Not supported in HW.
pass
- else if kwargs["framesize"] == 9000 and "avf" in suite_id:
+ 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
diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-mrr.robot
index a251af34c1..44cfd2d510 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-mrr.robot
@@ -84,34 +84,34 @@
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1c-avf-eth-l2bdbasemaclrn-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc04-IMIX-1c-avf-eth-l2bdbasemaclrn-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2c-avf-eth-l2bdbasemaclrn-mrr
+| tc02-64B-2c-avf-eth-l2bdbasemaclrn-mrr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2c-avf-eth-l2bdbasemaclrn-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc08-IMIX-2c-avf-eth-l2bdbasemaclrn-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4c-avf-eth-l2bdbasemaclrn-mrr
+| tc03-64B-4c-avf-eth-l2bdbasemaclrn-mrr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4c-avf-eth-l2bdbasemaclrn-mrr
+| tc04-1518B-1c-avf-eth-l2bdbasemaclrn-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-avf-eth-l2bdbasemaclrn-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-avf-eth-l2bdbasemaclrn-mrr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
+| tc10-IMIX-1c-avf-eth-l2bdbasemaclrn-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-eth-l2bdbasemaclrn-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
| tc12-IMIX-4c-avf-eth-l2bdbasemaclrn-mrr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
index 195c436261..7700b2c191 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
@@ -90,34 +90,34 @@
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc04-IMIX-1c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2c-avf-eth-l2bdbasemaclrn-ndrpdr
+| tc02-64B-2c-avf-eth-l2bdbasemaclrn-ndrpdr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc08-IMIX-2c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4c-avf-eth-l2bdbasemaclrn-ndrpdr
+| tc03-64B-4c-avf-eth-l2bdbasemaclrn-ndrpdr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4c-avf-eth-l2bdbasemaclrn-ndrpdr
+| tc04-1518B-1c-avf-eth-l2bdbasemaclrn-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-avf-eth-l2bdbasemaclrn-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-avf-eth-l2bdbasemaclrn-ndrpdr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
+| tc10-IMIX-1c-avf-eth-l2bdbasemaclrn-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-eth-l2bdbasemaclrn-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
| tc12-IMIX-4c-avf-eth-l2bdbasemaclrn-ndrpdr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-mrr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-mrr.robot
index 195dd546c1..5d7fe9adb4 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-mrr.robot
@@ -103,18 +103,6 @@
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc07-9000B-1c-avf-eth-l2patch-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-avf-eth-l2patch-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-avf-eth-l2patch-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
| tc10-IMIX-1c-avf-eth-l2patch-mrr
| | [Tags] | IMIX | 1C
| | framesize=IMIX_v4_1 | phy_cores=${1}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
index d811c4f32f..8a76c4d6f3 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
@@ -110,18 +110,6 @@
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc07-9000B-1c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
| tc10-IMIX-1c-avf-eth-l2patch-ndrpdr
| | [Tags] | IMIX | 1C
| | framesize=IMIX_v4_1 | phy_cores=${1}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-mrr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-mrr.robot
index 84960c4a90..d92dd728d3 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-mrr.robot
@@ -84,34 +84,34 @@
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1c-avf-eth-l2xcbase-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc04-IMIX-1c-avf-eth-l2xcbase-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2c-avf-eth-l2xcbase-mrr
+| tc02-64B-2c-avf-eth-l2xcbase-mrr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2c-avf-eth-l2xcbase-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc08-IMIX-2c-avf-eth-l2xcbase-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4c-avf-eth-l2xcbase-mrr
+| tc03-64B-4c-avf-eth-l2xcbase-mrr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4c-avf-eth-l2xcbase-mrr
+| tc04-1518B-1c-avf-eth-l2xcbase-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-avf-eth-l2xcbase-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-avf-eth-l2xcbase-mrr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
+| tc10-IMIX-1c-avf-eth-l2xcbase-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-eth-l2xcbase-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
| tc12-IMIX-4c-avf-eth-l2xcbase-mrr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
index c55843f76c..01a638dc7f 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
@@ -90,34 +90,34 @@
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc04-IMIX-1c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2c-avf-eth-l2xcbase-ndrpdr
+| tc02-64B-2c-avf-eth-l2xcbase-ndrpdr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc08-IMIX-2c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4c-avf-eth-l2xcbase-ndrpdr
+| tc03-64B-4c-avf-eth-l2xcbase-ndrpdr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4c-avf-eth-l2xcbase-ndrpdr
+| tc04-1518B-1c-avf-eth-l2xcbase-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-avf-eth-l2xcbase-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-avf-eth-l2xcbase-ndrpdr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
+| tc10-IMIX-1c-avf-eth-l2xcbase-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-eth-l2xcbase-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
| tc12-IMIX-4c-avf-eth-l2xcbase-ndrpdr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2bdbasemaclrn-mrr.robot b/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2bdbasemaclrn-mrr.robot
index e928ec458b..3b5a203153 100644
--- a/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2bdbasemaclrn-mrr.robot
+++ b/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2bdbasemaclrn-mrr.robot
@@ -86,34 +86,34 @@
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1c-avf-eth-l2bdbasemaclrn-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc04-IMIX-1c-avf-eth-l2bdbasemaclrn-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2c-avf-eth-l2bdbasemaclrn-mrr
+| tc02-64B-2c-avf-eth-l2bdbasemaclrn-mrr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2c-avf-eth-l2bdbasemaclrn-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc08-IMIX-2c-avf-eth-l2bdbasemaclrn-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4c-avf-eth-l2bdbasemaclrn-mrr
+| tc03-64B-4c-avf-eth-l2bdbasemaclrn-mrr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4c-avf-eth-l2bdbasemaclrn-mrr
+| tc04-1518B-1c-avf-eth-l2bdbasemaclrn-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-avf-eth-l2bdbasemaclrn-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-avf-eth-l2bdbasemaclrn-mrr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
+| tc10-IMIX-1c-avf-eth-l2bdbasemaclrn-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-eth-l2bdbasemaclrn-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
| tc12-IMIX-4c-avf-eth-l2bdbasemaclrn-mrr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
index c324e36f3e..0d215b2813 100644
--- a/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
@@ -92,34 +92,34 @@
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc04-IMIX-1c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2c-avf-eth-l2bdbasemaclrn-ndrpdr
+| tc02-64B-2c-avf-eth-l2bdbasemaclrn-ndrpdr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc08-IMIX-2c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4c-avf-eth-l2bdbasemaclrn-ndrpdr
+| tc03-64B-4c-avf-eth-l2bdbasemaclrn-ndrpdr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4c-avf-eth-l2bdbasemaclrn-ndrpdr
+| tc04-1518B-1c-avf-eth-l2bdbasemaclrn-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-avf-eth-l2bdbasemaclrn-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-avf-eth-l2bdbasemaclrn-ndrpdr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
+| tc10-IMIX-1c-avf-eth-l2bdbasemaclrn-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-eth-l2bdbasemaclrn-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
| tc12-IMIX-4c-avf-eth-l2bdbasemaclrn-ndrpdr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2patch-mrr.robot b/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2patch-mrr.robot
index 8d85fd6859..94890211a3 100644
--- a/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2patch-mrr.robot
+++ b/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2patch-mrr.robot
@@ -105,18 +105,6 @@
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc07-9000B-1c-avf-eth-l2patch-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-avf-eth-l2patch-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-avf-eth-l2patch-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
| tc10-IMIX-1c-avf-eth-l2patch-mrr
| | [Tags] | IMIX | 1C
| | framesize=IMIX_v4_1 | phy_cores=${1}
diff --git a/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2patch-ndrpdr.robot
index 80e643fc86..07b7ba79b0 100644
--- a/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2patch-ndrpdr.robot
+++ b/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2patch-ndrpdr.robot
@@ -112,18 +112,6 @@
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc07-9000B-1c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
| tc10-IMIX-1c-avf-eth-l2patch-ndrpdr
| | [Tags] | IMIX | 1C
| | framesize=IMIX_v4_1 | phy_cores=${1}
diff --git a/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2xcbase-mrr.robot b/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2xcbase-mrr.robot
index 4da17b4f1e..de0265aada 100644
--- a/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2xcbase-mrr.robot
+++ b/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2xcbase-mrr.robot
@@ -86,34 +86,34 @@
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1c-avf-eth-l2xcbase-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc04-IMIX-1c-avf-eth-l2xcbase-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2c-avf-eth-l2xcbase-mrr
+| tc02-64B-2c-avf-eth-l2xcbase-mrr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2c-avf-eth-l2xcbase-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc08-IMIX-2c-avf-eth-l2xcbase-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4c-avf-eth-l2xcbase-mrr
+| tc03-64B-4c-avf-eth-l2xcbase-mrr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4c-avf-eth-l2xcbase-mrr
+| tc04-1518B-1c-avf-eth-l2xcbase-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-avf-eth-l2xcbase-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-avf-eth-l2xcbase-mrr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
+| tc10-IMIX-1c-avf-eth-l2xcbase-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-eth-l2xcbase-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
| tc12-IMIX-4c-avf-eth-l2xcbase-mrr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2xcbase-ndrpdr.robot
index 7a73c7f78d..430e515433 100644
--- a/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/25ge2p1xxv710-avf-eth-l2xcbase-ndrpdr.robot
@@ -93,34 +93,34 @@
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc04-IMIX-1c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2c-avf-eth-l2xcbase-ndrpdr
+| tc02-64B-2c-avf-eth-l2xcbase-ndrpdr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc08-IMIX-2c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4c-avf-eth-l2xcbase-ndrpdr
+| tc03-64B-4c-avf-eth-l2xcbase-ndrpdr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4c-avf-eth-l2xcbase-ndrpdr
+| tc04-1518B-1c-avf-eth-l2xcbase-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-avf-eth-l2xcbase-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-avf-eth-l2xcbase-ndrpdr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
+| tc10-IMIX-1c-avf-eth-l2xcbase-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-eth-l2xcbase-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
| tc12-IMIX-4c-avf-eth-l2xcbase-ndrpdr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}