6 files changed, 129 insertions, 175 deletions
diff --git a/docs/job_specs/test_select_list_2n_dnv.md b/docs/job_specs/test_select_list_2n_dnv.md
index e62aa1510d..80777fefde 100644
--- a/docs/job_specs/test_select_list_2n_dnv.md
+++ b/docs/job_specs/test_select_list_2n_dnv.md
@@ -4,32 +4,14 @@
 ## ./ip4:
 ### x533
 2n1l-10ge2p1x553-dot1q-ip4base-ndrpdr.robot
-2n1l-10ge2p1x553-ethip4-ip4base-ndrpdr.robot
-2n1l-10ge2p1x553-ethip4-ip4scale200k-ndrpdr.robot
-2n1l-10ge2p1x553-ethip4-ip4scale20k-ndrpdr.robot
-2n1l-10ge2p1x553-ethip4-ip4scale2m-ndrpdr.robot
-2n1l-10ge2p1x553-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
-2n1l-10ge2p1x553-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
-2n1l-10ge2p1x553-ethip4udp-ip4base-nat44-ndrpdr.robot
-2n1l-10ge2p1x553-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
-2n1l-10ge2p1x553-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
 ## ./ip4_tunnels:
 ## ./ip6:
 ### x533
-2n1l-10ge2p1x553-dot1q-ip6base-ndrpdr.robot
 2n1l-10ge2p1x553-ethip6-ip6base-ndrpdr.robot
-2n1l-10ge2p1x553-ethip6-ip6scale200k-ndrpdr.robot
-2n1l-10ge2p1x553-ethip6-ip6scale20k-ndrpdr.robot
-2n1l-10ge2p1x553-ethip6-ip6scale2m-ndrpdr.robot
 ## ./ip6_tunnels:
 ## ./l2:
 ### x533
-2n1l-10ge2p1x553-dot1q-l2bdbasemaclrn-ndrpdr.robot
-2n1l-10ge2p1x553-dot1q-l2xcbase-ndrpdr.robot
 2n1l-10ge2p1x553-eth-l2bdbasemaclrn-ndrpdr.robot
-2n1l-10ge2p1x553-eth-l2bdscale100kmaclrn-ndrpdr.robot
-2n1l-10ge2p1x553-eth-l2bdscale10kmaclrn-ndrpdr.robot
-2n1l-10ge2p1x553-eth-l2bdscale1mmaclrn-ndrpdr.robot
 2n1l-10ge2p1x553-eth-l2patch-ndrpdr.robot
 2n1l-10ge2p1x553-eth-l2xcbase-ndrpdr.robot
 ## ./nfv_density/dcr_memif/chain:
@@ -39,4 +21,4 @@
 ## ./srv6:
 ## ./tcp:
 ## ./vm_vhost:
-## ./vts:
-\ No newline at end of file
+## ./vts:
diff --git a/docs/job_specs/test_select_list_2n_skx.md b/docs/job_specs/test_select_list_2n_skx.md
index 94fccd6b8b..db89904d9f 100644
--- a/docs/job_specs/test_select_list_2n_skx.md
+++ b/docs/job_specs/test_select_list_2n_skx.md
@@ -8,27 +8,20 @@
 ## ./crypto:
 ## ./ip4:
 ### xxv710
+2n1l-25ge2p1xxv710-avf-dot1q-ip4base-ndrpdr.robot
 2n1l-25ge2p1xxv710-avf-ethip4-ip4base-ndrpdr.robot
 2n1l-25ge2p1xxv710-avf-ethip4-ip4scale200k-ndrpdr.robot
 2n1l-25ge2p1xxv710-avf-ethip4-ip4scale20k-ndrpdr.robot
 2n1l-25ge2p1xxv710-avf-ethip4-ip4scale2m-ndrpdr.robot
-2n1l-25ge2p1xxv710-avf-dot1q-ip4base-ndrpdr.robot
 2n1l-25ge2p1xxv710-dot1q-ip4base-ndrpdr.robot
 2n1l-25ge2p1xxv710-ethip4-ip4base-ndrpdr.robot
 2n1l-25ge2p1xxv710-ethip4-ip4scale200k-ndrpdr.robot
 2n1l-25ge2p1xxv710-ethip4-ip4scale20k-ndrpdr.robot
 2n1l-25ge2p1xxv710-ethip4-ip4scale2m-ndrpdr.robot
-2n1l-25ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
-2n1l-25ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
-2n1l-25ge2p1xxv710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
-2n1l-25ge2p1xxv710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
 2n1l-25ge2p1xxv710-ethip4udp-ip4base-nat44-ndrpdr.robot
 ### x710
 2n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr.robot
-2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot
-2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot
 2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot
-2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
 ## ./ip4_tunnels:
 ## ./ip6:
 ### xxv710
@@ -38,9 +31,7 @@
 2n1l-25ge2p1xxv710-ethip6-ip6scale20k-ndrpdr.robot
 2n1l-25ge2p1xxv710-ethip6-ip6scale2m-ndrpdr.robot
 ### x710
-2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot
 2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot
-2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
 ## ./ip6_tunnels:
 ## ./l2:
 ### xxv710
@@ -58,103 +49,109 @@
 2n1l-25ge2p1xxv710-eth-l2patch-ndrpdr.robot
 2n1l-25ge2p1xxv710-eth-l2xcbase-ndrpdr.robot
 ### x710
-+2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot
-2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
 2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
-2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
 2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
-2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
+2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot
 ## ./nfv_density/dcr_memif/chain:
 ### xxv710
 2n-25ge2p1xxv710-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot
 ## ./nfv_density/dcr_memif/pipeline:
 ### xxv710
 2n-25ge2p1xxv710-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot
 2n-25ge2p1xxv710-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr.robot
+2n-25ge2p1xxv710-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr.robot
 ## ./nfv_density/vm_vhost/chain:
-### xxv710
-2n-25ge2p1xxv710-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot
-2n-25ge2p1xxv710-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot
 ## ./nfv_density/vm_vhost/chain_dot1qip4vxlan:
-### xxv710
-2n-25ge2p1xxv710-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr.robot
-2n-25ge2p1xxv710-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr.robot
-2n-25ge2p1xxv710-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr.robot
-2n-25ge2p1xxv710-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr.robot
-2n-25ge2p1xxv710-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr.robot
-2n-25ge2p1xxv710-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr.robot
 ## ./srv6:
 ## ./tcp:
-### x710
-2n1l-25ge2p1xxv710-eth-ip4tcphttp-cps.robot
-2n1l-25ge2p1xxv710-eth-ip4tcphttp-rps.robot
 ## ./vm_vhost:
 ### xxv710
 2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
 2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
 2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
-2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
-\ No newline at end of file
+2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
+2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot
+## ./vts:
diff --git a/docs/job_specs/test_select_list_3n_dnv.md b/docs/job_specs/test_select_list_3n_dnv.md
index cea4a0cef3..e39e0fe1dc 100644
--- a/docs/job_specs/test_select_list_3n_dnv.md
+++ b/docs/job_specs/test_select_list_3n_dnv.md
@@ -10,44 +10,18 @@
 10ge2p1x553-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
 ## ./ip4:
 ### x533
-10ge2p1x553-dot1q-ip4base-ndrpdr.robot
 10ge2p1x553-ethip4-ip4base-ndrpdr.robot
-10ge2p1x553-ethip4-ip4scale200k-ndrpdr.robot
-10ge2p1x553-ethip4-ip4scale20k-ndrpdr.robot
-10ge2p1x553-ethip4-ip4scale2m-ndrpdr.robot
-10ge2p1x553-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
-10ge2p1x553-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
-10ge2p1x553-ethip4udp-ip4base-nat44-ndrpdr.robot
-10ge2p1x553-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
-10ge2p1x553-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
-10ge2p1x553-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot
 ## ./ip4_tunnels:
 ### x533
-10ge2p1x553-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot
-10ge2p1x553-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot
 10ge2p1x553-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot
 10ge2p1x553-ethip4vxlan-l2xcbase-ndrpdr.robot
 ## ./ip6:
 ### x533
-10ge2p1x553-dot1q-ip6base-ndrpdr.robot
 10ge2p1x553-ethip6-ip6base-ndrpdr.robot
-10ge2p1x553-ethip6-ip6scale200k-ndrpdr.robot
-10ge2p1x553-ethip6-ip6scale20k-ndrpdr.robot
-10ge2p1x553-ethip6-ip6scale2m-ndrpdr.robot
 ## ./ip6_tunnels:
 ## ./l2:
 ### x533
-10ge2p1x553-dot1q-l2bdbasemaclrn-ndrpdr.robot
-10ge2p1x553-dot1q-l2xcbase-ndrpdr.robot
-10ge2p1x553-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot
-10ge2p1x553-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot
-10ge2p1x553-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot
 10ge2p1x553-eth-l2bdbasemaclrn-ndrpdr.robot
-10ge2p1x553-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot
-10ge2p1x553-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot
-10ge2p1x553-eth-l2bdscale100kmaclrn-ndrpdr.robot
-10ge2p1x553-eth-l2bdscale10kmaclrn-ndrpdr.robot
-10ge2p1x553-eth-l2bdscale1mmaclrn-ndrpdr.robot
 10ge2p1x553-eth-l2patch-ndrpdr.robot
 10ge2p1x553-eth-l2xcbase-ndrpdr.robot
 ## ./nfv_density/dcr_memif/chain:
@@ -55,10 +29,6 @@
 ## ./nfv_density/vm_vhost/chain:
 ## ./nfv_density/vm_vhost/chain_dot1qip4vxlan:
 ## ./srv6:
-### x533
-10ge2p1x553-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot
-10ge2p1x553-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot
-10ge2p1x553-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot
 ## ./tcp:
 ## ./vm_vhost:
-## ./vts:
-\ No newline at end of file
+## ./vts:
diff --git a/docs/job_specs/test_select_list_3n_hsw.md b/docs/job_specs/test_select_list_3n_hsw.md
index 0cf6b9f0bc..0e4fc260e4 100644
--- a/docs/job_specs/test_select_list_3n_hsw.md
+++ b/docs/job_specs/test_select_list_3n_hsw.md
@@ -1,61 +1,104 @@
 # 3n-hsw
 ## ./container_memif:
+40ge2p1xl710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
+40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
+40ge2p1xl710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
+40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
+40ge2p1xl710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
 ## ./crypto:
 ### xl710
 40ge2p1xl710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
 40ge2p1xl710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
-40ge2p1xl710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
-40ge2p1xl710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
-40ge2p1xl710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
-40ge2p1xl710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
 40ge2p1xl710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
 40ge2p1xl710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
+40ge2p1xl710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+40ge2p1xl710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
 40ge2p1xl710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
 40ge2p1xl710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
+40ge2p1xl710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+40ge2p1xl710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
 ## ./ip4:
 ### xl710
 40ge2p1xl710-dot1q-ip4base-ndrpdr.robot
 40ge2p1xl710-ethip4-ip4base-ndrpdr.robot
+40ge2p1xl710-ethip4-ip4scale200k-ndrpdr.robot
+40ge2p1xl710-ethip4-ip4scale20k-ndrpdr.robot
 40ge2p1xl710-ethip4-ip4scale2m-ndrpdr.robot
+40ge2p1xl710-ethip4-ip4base-nat44-ndrpdr.robot
+40ge2p1xl710-ethip4-ip4base-udpsrcscale15-nat44-ndrpdr.robot
+### vic1227
+10ge2p1vic1227-ethip4-ip4base-ndrpdr.robot
+### x520
+10ge2p1x520-ethip4-ip4base-ndrpdr.robot
+### x710
+10ge2p1x710-ethip4-ip4base-ndrpdr.robot
+### vic1385
+40ge2p1vic1385-ethip4-ip4base-ndrpdr.robot
 ## ./ip4_tunnels:
 ### xl710
-40ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot
-40ge2p1xl710-ethip4vxlan-l2xcbase-ndrpdr.robot
+40ge2p1xl710-dot1q--ethip4vxlan-l2bdbscale100l2bd100vlan100vxlan-ndrpdr.robot
+40ge2p1xl710-dot1q--ethip4vxlan-l2bdbscale10l2bd10vlan10vxlan-ndrpdr.robot
+40ge2p1xl710-dot1q--ethip4vxlan-l2bdbscale1kl2bd1kvlan1kvxlan-ndrpdr.robot
+40ge2p1xl710-dot1q--ethip4vxlan-l2bdbscale1l2bd1vlan1vxlan-ndrpdr.robot
 ## ./ip6:
 ### xl710
 40ge2p1xl710-dot1q-ip6base-ndrpdr.robot
 40ge2p1xl710-ethip6-ip6base-ndrpdr.robot
+40ge2p1xl710-ethip6-ip6scale200k-ndrpdr.robot
+40ge2p1xl710-ethip6-ip6scale20k-ndrpdr.robot
 40ge2p1xl710-ethip6-ip6scale2m-ndrpdr.robot
+### vic1227
+10ge2p1vic1227-ethip6-ip6base-ndrpdr.robot
+### x520
+10ge2p1x520-ethip6-ip6base-ndrpdr.robot
+### x710
+10ge2p1x710-ethip6-ip6base-ndrpdr.robot
+### vic1385
+40ge2p1vic1385-ethip6-ip6base-ndrpdr.robot
 ## ./ip6_tunnels:
 ## ./l2:
 ### xl710
+40ge2p1xl710-dot1ad-l2xcbase-ndrpdr.robot
 40ge2p1xl710-dot1q-l2bdbasemaclrn-ndrpdr.robot
 40ge2p1xl710-dot1q-l2xcbase-ndrpdr.robot
 40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdr.robot
+40ge2p1xl710-eth-l2bdscale100kmaclrn-ndrpdr.robot
+40ge2p1xl710-eth-l2bdscale10kmaclrn-ndrpdr.robot
 40ge2p1xl710-eth-l2bdscale1mmaclrn-ndrpdr.robot
 40ge2p1xl710-eth-l2patch-ndrpdr.robot
 40ge2p1xl710-eth-l2xcbase-ndrpdr.robot
+### vic1227
+10ge2p1vic1227-eth-l2bdbasemaclrn-ndrpdr.robot
+10ge2p1vic1227-eth-l2xcbase-ndrpdr.robot
+### x520
+10ge2p1x520-eth-l2bdbasemaclrn-ndrpdr.robot
+10ge2p1x520-eth-l2xcbase-ndrpdr.robot
+### x710
+10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
+10ge2p1x710-eth-l2xcbase-ndrpdr.robot
+### vic1385
+40ge2p1vic1385-eth-l2bdbasemaclrn-ndrpdr.robot
+40ge2p1vic1385-eth-l2xcbase-ndrpdr.robot
 ## ./nfv_density/dcr_memif/chain:
 ## ./nfv_density/dcr_memif/pipeline:
 ## ./nfv_density/vm_vhost/chain:
 ## ./nfv_density/vm_vhost/chain_dot1qip4vxlan:
 ## ./srv6:
-### xl710
-40ge2p1xl710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot
-40ge2p1xl710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot
-40ge2p1xl710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot
-40ge2p1xl710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
-40ge2p1xl710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
-40ge2p1xl710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
 ## ./tcp:
 ## ./vm_vhost:
 ### xl710
+40ge2p1xl710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+40ge2p1xl710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+40ge2p1xl710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+40ge2p1xl710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
 40ge2p1xl710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+40ge2p1xl710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+40ge2p1xl710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+40ge2p1xl710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
 40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
 40ge2p1xl710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+40ge2p1xl710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
 40ge2p1xl710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
+40ge2p1xl710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot
 ## ./vts:
-### xl710
-40ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
-40ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
-40ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
-\ No newline at end of file
diff --git a/docs/job_specs/test_select_list_3n_skx.md b/docs/job_specs/test_select_list_3n_skx.md
index ac91d4fd8c..8df61b8354 100644
--- a/docs/job_specs/test_select_list_3n_skx.md
+++ b/docs/job_specs/test_select_list_3n_skx.md
@@ -1,3 +1,4 @@
+
 # 3n-skx
 ## ./container_memif:
 ### xxv710
@@ -16,6 +17,7 @@
 25ge2p1xxv710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
 ## ./ip4:
 ### xxv710
+25ge2p1xxv710-avf-dot1q-ip4base-ndrpdr.robot
 25ge2p1xxv710-avf-eth-ip4base-ndrpdr.robot
 25ge2p1xxv710-avf-ethip4-ip4scale200k-ndrpdr.robot
 25ge2p1xxv710-avf-ethip4-ip4scale20k-ndrpdr.robot
@@ -25,17 +27,11 @@
 25ge2p1xxv710-ethip4-ip4scale200k-ndrpdr.robot
 25ge2p1xxv710-ethip4-ip4scale20k-ndrpdr.robot
 25ge2p1xxv710-ethip4-ip4scale2m-ndrpdr.robot
-25ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
-25ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
-25ge2p1xxv710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
-25ge2p1xxv710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
 25ge2p1xxv710-ethip4udp-ip4base-nat44-ndrpdr.robot
+25ge2p1xxv710-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot
 ### x710
 10ge2p1x710-avf-ethip4-ip4base-ndrpdr.robot
-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot
-10ge2p1x710-dot1q-ip4base-ndrpdr.robot
 10ge2p1x710-ethip4-ip4base-ndrpdr.robot
-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
 ## ./ip4_tunnels:
 ### xxv710
 25ge2p1xxv710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot
@@ -50,65 +46,47 @@
 25ge2p1xxv710-ethip6-ip6scale20k-ndrpdr.robot
 25ge2p1xxv710-ethip6-ip6scale2m-ndrpdr.robot
 ### x710
-10ge2p1x710-dot1q-ip6base-ndrpdr.robot
 10ge2p1x710-ethip6-ip6base-ndrpdr.robot
-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
 ## ./ip6_tunnels:
 ## ./l2:
 ### xxv710
+25ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot
 25ge2p1xxv710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
 25ge2p1xxv710-avf-eth-l2patch-ndrpdr.robot
 25ge2p1xxv710-avf-eth-l2xcbase-ndrpdr.robot
+25ge2p1xxv710-dot1ad-l2xcbase-ndrpdr.robot
 25ge2p1xxv710-dot1q-l2bdbasemaclrn-ndrpdr.robot
 25ge2p1xxv710-dot1q-l2xcbase-ndrpdr.robot
-25ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot
-25ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot
-25ge2p1xxv710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot
 25ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr.robot
-25ge2p1xxv710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot
-25ge2p1xxv710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot
 25ge2p1xxv710-eth-l2bdscale100kmaclrn-ndrpdr.robot
 25ge2p1xxv710-eth-l2bdscale10kmaclrn-ndrpdr.robot
 25ge2p1xxv710-eth-l2bdscale1mmaclrn-ndrpdr.robot
 25ge2p1xxv710-eth-l2patch-ndrpdr.robot
 25ge2p1xxv710-eth-l2xcbase-ndrpdr.robot
 ### x710
-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
-10ge2p1x710-avf-eth-l2patch-ndrpdr
 10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
 10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
+10ge2p1x710-eth-l2xcbase-ndrpdr.robot
 ## ./nfv_density/dcr_memif/chain:
 ## ./nfv_density/dcr_memif/pipeline:
 ## ./nfv_density/vm_vhost/chain:
 ## ./nfv_density/vm_vhost/chain_dot1qip4vxlan:
 ## ./srv6:
-### xxv710
-25ge2p1xxv710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot
-25ge2p1xxv710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot
-25ge2p1xxv710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot
-25ge2p1xxv710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
-25ge2p1xxv710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
-25ge2p1xxv710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
 ## ./tcp:
 ## ./vm_vhost:
 ### xxv710
 25ge2p1xxv710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+25ge2p1xxv710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
 25ge2p1xxv710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+25ge2p1xxv710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
 25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
 25ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+25ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
 25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
 25ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+25ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
 25ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
-25ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
-### x710
-10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
-10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
-10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
-10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+25ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot
 ## ./vts:
-### xxv710
-25ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
-25ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
-25ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
-\ No newline at end of file
diff --git a/docs/job_specs/test_select_list_3n_tsh.md b/docs/job_specs/test_select_list_3n_tsh.md
index ef0d3ca6a7..b080e04336 100644
--- a/docs/job_specs/test_select_list_3n_tsh.md
+++ b/docs/job_specs/test_select_list_3n_tsh.md
@@ -21,18 +21,14 @@
 10ge2p1x520-ethip4-ip4scale200k-ndrpdr.robot
 10ge2p1x520-ethip4-ip4scale20k-ndrpdr.robot
 10ge2p1x520-ethip4-ip4scale2m-ndrpdr.robot
-10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
-10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
 10ge2p1x520-ethip4udp-ip4base-nat44-ndrpdr.robot
-10ge2p1x520-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
-10ge2p1x520-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
 10ge2p1x520-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot
 ## ./ip4_tunnels:
 ### x520
 10ge2p1x520-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot
+10ge2p1x520-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot
+10ge2p1x520-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot
 10ge2p1x520-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot
-10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot
-10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdr.robot
 ## ./ip6:
 ### x520
 10ge2p1x520-dot1q-ip6base-ndrpdr.robot
@@ -43,14 +39,10 @@
 ## ./ip6_tunnels:
 ## ./l2:
 ### x520
+10ge2p1x520-dot1ad-l2xcbase-ndrpdr.robot
 10ge2p1x520-dot1q-l2bdbasemaclrn-ndrpdr.robot
 10ge2p1x520-dot1q-l2xcbase-ndrpdr.robot
-10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot
-10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot
-10ge2p1x520-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot
 10ge2p1x520-eth-l2bdbasemaclrn-ndrpdr.robot
-10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot
-10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot
 10ge2p1x520-eth-l2bdscale100kmaclrn-ndrpdr.robot
 10ge2p1x520-eth-l2bdscale10kmaclrn-ndrpdr.robot
 10ge2p1x520-eth-l2bdscale1mmaclrn-ndrpdr.robot
@@ -61,25 +53,17 @@
 ## ./nfv_density/vm_vhost/chain:
 ## ./nfv_density/vm_vhost/chain_dot1qip4vxlan:
 ## ./srv6:
-### x520
-10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot
-10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot
-10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot
-10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
-10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
-10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
 ## ./tcp:
 ## ./vm_vhost:
 ### x520
-10ge2p1x520-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
-10ge2p1x520-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
 10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
 10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
 10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
 10ge2p1x520-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+10ge2p1x520-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
 10ge2p1x520-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
+10ge2p1x520-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot
 ## ./vts:
-### x520
-10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
-10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
-10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
-\ No newline at end of file