job_specs: reduce number of weekly ndrpdr tests

Remove:
- All vts tests, obsolete use cases.
- dot1q tests apart from dot1q-l2bd, superfluous combinations.
- nat44 tests
  - -pps tests, replaced by -tput tests.
  - h1-p1-s1 single session tests, unessential combination.
  - h4096-p63-s258048 tests, unessential scale combination.
- ipsec tests
  - ethip4ipsectptlispgpe.
  - policy-aes128gcm.
  - policy-aes128cbc-hmac256sha.
  - policy-aes128cbc-hmac512sha.
  - int-aes128cbc-hmac256sha.
  - scale of
    - 400tnlsw.
    - 5000tnlsw.
    - 20000tnlsw.
    - 60000tnlsw.

Change-Id: I269878218f1ff61e58f9a2d669ebdba7c8dffdbf
Signed-off-by: Maciek Konstantynowicz <mkonstan@cisco.com>

6 files changed, 108 insertions, 754 deletions

diff --git a/docs/job_specs/report_iterative/2n-clx/vpp-mlr-00.md b/docs/job_specs/report_iterative/2n-clx/vpp-mlr-00.md
index 09e09f2d33..a502751aca 100644
--- a/docs/job_specs/report_iterative/2n-clx/vpp-mlr-00.md
+++ b/docs/job_specs/report_iterative/2n-clx/vpp-mlr-00.md
@@ -1,7 +1,7 @@
 # 2n-clx
-### tests 564
-### job hrs est. 47.1
-### job hrs real 47.1
+### tests 405
+### job hrs est. 33.8
+### job hrs real ??.?
 ### test mins est. 5.01
 ### test mins real 5.01
 ## ./container_memif
@@ -11,10 +11,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2memif-1dcr
-##### dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
 ##### eth-l2xcbase-eth-2memif-1dcr
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2memif-1dcr
@@ -28,10 +24,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2memif-1dcr
-##### dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
 ##### eth-l2xcbase-eth-2memif-1dcr
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2xcbase-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2xcbase-eth-2memif-1dcr
@@ -46,10 +38,6 @@
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2bdbasemaclrn-eth-2memif-1dcr
-##### dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
 ##### eth-l2xcbase-eth-2memif-1dcr
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase-eth-2memif-1dcr
@@ -109,10 +97,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4scale2m-rnd
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4scale2m-rnd
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4scale2m-rnd
-##### dot1q-ip4base
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip4base
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip4base
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip4base
 ##### ethip4udp-ip4base-iacl50sf-10kflows
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-iacl50sf-10kflows
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-iacl50sf-10kflows
@@ -129,10 +113,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-oacl50sl-10kflows
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-oacl50sl-10kflows
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-oacl50sl-10kflows
-##### ethip4udp-nat44det-h1-p1-s1
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44det-h1-p1-s1
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44det-h1-p1-s1
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44det-h1-p1-s1
 ##### ethip4udp-nat44det-h1024-p63-s64512
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44det-h1024-p63-s64512
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44det-h1024-p63-s64512
@@ -153,10 +133,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-udir
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-udir
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-udir
-##### ethip4udp-nat44ed-h4096-p63-s258048-udir
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-udir
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-udir
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-udir
 ##### ethip4udp-nat44ed-h16384-p63-s1032192-udir
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h16384-p63-s1032192-udir
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h16384-p63-s1032192-udir
@@ -173,10 +149,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-cps
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-cps
-##### ethip4udp-nat44ed-h4096-p63-s258048-cps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-cps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-cps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-cps
 ##### ethip4udp-nat44ed-h16384-p63-s1032192-cps
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h16384-p63-s1032192-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h16384-p63-s1032192-cps
@@ -189,34 +161,10 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h262144-p63-s16515072-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h262144-p63-s16515072-cps
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h262144-p63-s16515072-cps
-##### ethip4udp-nat44ed-h1024-p63-s64512-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-pps
-##### ethip4udp-nat44ed-h4096-p63-s258048-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-pps
-##### ethip4udp-nat44ed-h16384-p63-s1032192-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h16384-p63-s1032192-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h16384-p63-s1032192-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h16384-p63-s1032192-pps
-##### ethip4udp-nat44ed-h65536-p63-s4128768-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h65536-p63-s4128768-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h65536-p63-s4128768-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h65536-p63-s4128768-pps
-##### ethip4udp-nat44ed-h262144-p63-s16515072-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h262144-p63-s16515072-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h262144-p63-s16515072-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h262144-p63-s16515072-pps
 ##### ethip4udp-nat44ed-h1024-p63-s64512-tput
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-tput
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-tput
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-tput
-##### ethip4udp-nat44ed-h4096-p63-s258048-tput
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-tput
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-tput
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-tput
 ##### ethip4udp-nat44ed-h16384-p63-s1032192-tput
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h16384-p63-s1032192-tput
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h16384-p63-s1032192-tput
@@ -233,10 +181,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-cps
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-cps
-##### ethip4udp-ip4base-h4096-p63-s258048-cps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h4096-p63-s258048-cps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h4096-p63-s258048-cps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h4096-p63-s258048-cps
 ##### ethip4udp-ip4base-h16384-p63-s1032192-cps
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h16384-p63-s1032192-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h16384-p63-s1032192-cps
@@ -249,34 +193,10 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h262144-p63-s16515072-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h262144-p63-s16515072-cps
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h262144-p63-s16515072-cps
-##### ethip4udp-ip4base-h1024-p63-s64512-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-pps
-##### ethip4udp-ip4base-h4096-p63-s258048-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h4096-p63-s258048-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h4096-p63-s258048-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h4096-p63-s258048-pps
-##### ethip4udp-ip4base-h16384-p63-s1032192-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h16384-p63-s1032192-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h16384-p63-s1032192-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h16384-p63-s1032192-pps
-##### ethip4udp-ip4base-h65536-p63-s4128768-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-pps
-##### ethip4udp-ip4base-h262144-p63-s16515072-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h262144-p63-s16515072-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h262144-p63-s16515072-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h262144-p63-s16515072-pps
 ##### ethip4tcp-nat44ed-h1024-p63-s64512-cps
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-cps
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-cps
-##### ethip4tcp-nat44ed-h4096-p63-s258048-cps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h4096-p63-s258048-cps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h4096-p63-s258048-cps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h4096-p63-s258048-cps
 ##### ethip4tcp-nat44ed-h16384-p63-s1032192-cps
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h16384-p63-s1032192-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h16384-p63-s1032192-cps
@@ -289,34 +209,10 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h262144-p63-s16515072-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h262144-p63-s16515072-cps
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h262144-p63-s16515072-cps
-##### ethip4tcp-nat44ed-h1024-p63-s64512-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-pps
-##### ethip4tcp-nat44ed-h4096-p63-s258048-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h4096-p63-s258048-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h4096-p63-s258048-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h4096-p63-s258048-pps
-##### ethip4tcp-nat44ed-h16384-p63-s1032192-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h16384-p63-s1032192-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h16384-p63-s1032192-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h16384-p63-s1032192-pps
-##### ethip4tcp-nat44ed-h65536-p63-s4128768-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h65536-p63-s4128768-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h65536-p63-s4128768-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h65536-p63-s4128768-pps
-##### ethip4tcp-nat44ed-h262144-p63-s16515072-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h262144-p63-s16515072-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h262144-p63-s16515072-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h262144-p63-s16515072-pps
 ##### ethip4tcp-nat44ed-h1024-p63-s64512-tput
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
-##### ethip4tcp-nat44ed-h4096-p63-s258048-tput
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h4096-p63-s258048-tput
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h4096-p63-s258048-tput
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h4096-p63-s258048-tput
 ##### ethip4tcp-nat44ed-h16384-p63-s1032192-tput
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
@@ -333,10 +229,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-cps
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-cps
-##### ethip4tcp-ip4base-h4096-p63-s258048-cps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h4096-p63-s258048-cps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h4096-p63-s258048-cps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h4096-p63-s258048-cps
 ##### ethip4tcp-ip4base-h16384-p63-s1032192-cps
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h16384-p63-s1032192-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h16384-p63-s1032192-cps
@@ -349,26 +241,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h262144-p63-s16515072-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h262144-p63-s16515072-cps
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h262144-p63-s16515072-cps
-##### ethip4tcp-ip4base-h1024-p63-s64512-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-pps
-##### ethip4tcp-ip4base-h4096-p63-s258048-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h4096-p63-s258048-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h4096-p63-s258048-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h4096-p63-s258048-pps
-##### ethip4tcp-ip4base-h16384-p63-s1032192-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h16384-p63-s1032192-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h16384-p63-s1032192-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h16384-p63-s1032192-pps
-##### ethip4tcp-ip4base-h65536-p63-s4128768-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h65536-p63-s4128768-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h65536-p63-s4128768-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h65536-p63-s4128768-pps
-##### ethip4tcp-ip4base-h262144-p63-s16515072-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h262144-p63-s16515072-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h262144-p63-s16515072-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h262144-p63-s16515072-pps
 #### dpdk-vfio-pci
 ##### ethip4-ip4base
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4base
@@ -398,10 +270,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4scale2m-rnd
 2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4scale2m-rnd
 4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4scale2m-rnd
-##### ethip4udp-nat44det-h1-p1-s1
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-nat44det-h1-p1-s1
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-nat44det-h1-p1-s1
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-nat44det-h1-p1-s1
 ### mellanox-cx556a
 #### rdma-core
 ##### ethip4-ip4base
@@ -432,10 +300,6 @@
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4-ip4scale2m-rnd
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4-ip4scale2m-rnd
 4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4-ip4scale2m-rnd
-##### dot1q-ip4base
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-ip4base
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-ip4base
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-ip4base
 ##### ethip4udp-ip4base-iacl50sf-10kflows
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-iacl50sf-10kflows
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-iacl50sf-10kflows
@@ -452,14 +316,6 @@
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-oacl50sl-10kflows
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-oacl50sl-10kflows
 4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-oacl50sl-10kflows
-##### ethip4udp-nat44det-h1-p1-s1
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-nat44det-h1-p1-s1
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-nat44det-h1-p1-s1
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-nat44det-h1-p1-s1
-##### ethip4udp-nat44det-h1024-p63-s64512
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-nat44det-h1024-p63-s64512
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-nat44det-h1024-p63-s64512
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-nat44det-h1024-p63-s64512
 ## ./ip4_tunnels
 ### intel-xxv710
 #### avf
@@ -533,10 +389,6 @@
 1c AND 78b AND ndrpdr AND xxv710 AND drv_avf AND ethip6-ip6scale2m-rnd
 2c AND 78b AND ndrpdr AND xxv710 AND drv_avf AND ethip6-ip6scale2m-rnd
 4c AND 78b AND ndrpdr AND xxv710 AND drv_avf AND ethip6-ip6scale2m-rnd
-##### dot1q-ip6base
-1c AND 78b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip6base
-2c AND 78b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip6base
-4c AND 78b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip6base
 #### dpdk-vfio-pci
 ##### ethip6-ip6base
 1c AND 78b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip6-ip6base
@@ -596,10 +448,6 @@
 1c AND 78b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip6-ip6scale2m-rnd
 2c AND 78b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip6-ip6scale2m-rnd
 4c AND 78b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip6-ip6scale2m-rnd
-##### dot1q-ip6base
-1c AND 78b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-ip6base
-2c AND 78b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-ip6base
-4c AND 78b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-ip6base
 ## ./ip6_tunnels
 ## ./l2
 ### intel-x710
@@ -643,10 +491,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
-##### dot1q-l2xcbase
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase
 ##### eth-l2patch
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2patch
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2patch
@@ -702,10 +546,6 @@
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase
 4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase
-##### dot1q-l2xcbase
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2xcbase
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2xcbase
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2xcbase
 ##### eth-l2patch
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2patch
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2patch
@@ -729,14 +569,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-##### dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-##### dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 ##### eth-l2xcbase-eth-2vhostvr1024-1vm
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm
@@ -745,14 +577,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-##### dot1q-l2xcbase-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-##### dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 #### dpdk-vfio-pci
 ##### eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm
@@ -772,42 +596,4 @@
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-##### dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-##### dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-##### eth-l2xcbase-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase-eth-2vhostvr1024-1vm
-##### eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-##### dot1q-l2xcbase-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-##### dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 ## ./vts
-### intel-xxv710
-#### avf
-##### ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm
-1c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm
-2c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm
-4c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm
-##### ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm
-1c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm
-2c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm
-4c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm
-##### ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm
-1c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm
-2c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm
-4c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm
diff --git a/docs/job_specs/report_iterative/2n-skx/vpp-mlr-00.md b/docs/job_specs/report_iterative/2n-skx/vpp-mlr-00.md
index 026271bda8..004b2c2017 100644
--- a/docs/job_specs/report_iterative/2n-skx/vpp-mlr-00.md
+++ b/docs/job_specs/report_iterative/2n-skx/vpp-mlr-00.md
@@ -1,7 +1,7 @@
 # 2n-skx
-### tests 462
-### job hrs est. 40.7
-### job hrs real 40.7
+### tests 336
+### job hrs est. 29.6
+### job hrs real ??.?
 ### test mins est. 5.29
 ### test mins real 5.29
 ## ./container_memif
@@ -11,10 +11,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2memif-1dcr
-##### dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
 ##### eth-l2xcbase-eth-2memif-1dcr
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2memif-1dcr
@@ -28,10 +24,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2memif-1dcr
-##### dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
 ##### eth-l2xcbase-eth-2memif-1dcr
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2xcbase-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2xcbase-eth-2memif-1dcr
@@ -91,10 +83,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4scale2m-rnd
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4scale2m-rnd
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4scale2m-rnd
-##### dot1q-ip4base
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip4base
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip4base
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip4base
 ##### ethip4udp-ip4base-iacl50sf-10kflows
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-iacl50sf-10kflows
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-iacl50sf-10kflows
@@ -111,10 +99,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-oacl50sl-10kflows
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-oacl50sl-10kflows
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-oacl50sl-10kflows
-##### ethip4udp-nat44det-h1-p1-s1
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44det-h1-p1-s1
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44det-h1-p1-s1
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44det-h1-p1-s1
 ##### ethip4udp-nat44det-h1024-p63-s64512
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44det-h1024-p63-s64512
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44det-h1024-p63-s64512
@@ -135,10 +119,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-udir
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-udir
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-udir
-##### ethip4udp-nat44ed-h4096-p63-s258048-udir
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-udir
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-udir
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-udir
 ##### ethip4udp-nat44ed-h16384-p63-s1032192-udir
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h16384-p63-s1032192-udir
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h16384-p63-s1032192-udir
@@ -155,10 +135,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-cps
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-cps
-##### ethip4udp-nat44ed-h4096-p63-s258048-cps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-cps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-cps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-cps
 ##### ethip4udp-nat44ed-h16384-p63-s1032192-cps
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h16384-p63-s1032192-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h16384-p63-s1032192-cps
@@ -171,34 +147,10 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h262144-p63-s16515072-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h262144-p63-s16515072-cps
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h262144-p63-s16515072-cps
-##### ethip4udp-nat44ed-h1024-p63-s64512-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-pps
-##### ethip4udp-nat44ed-h4096-p63-s258048-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-pps
-##### ethip4udp-nat44ed-h16384-p63-s1032192-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h16384-p63-s1032192-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h16384-p63-s1032192-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h16384-p63-s1032192-pps
-##### ethip4udp-nat44ed-h65536-p63-s4128768-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h65536-p63-s4128768-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h65536-p63-s4128768-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h65536-p63-s4128768-pps
-##### ethip4udp-nat44ed-h262144-p63-s16515072-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h262144-p63-s16515072-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h262144-p63-s16515072-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h262144-p63-s16515072-pps
 ##### ethip4udp-nat44ed-h1024-p63-s64512-tput
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-tput
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-tput
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h1024-p63-s64512-tput
-##### ethip4udp-nat44ed-h4096-p63-s258048-tput
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-tput
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-tput
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h4096-p63-s258048-tput
 ##### ethip4udp-nat44ed-h16384-p63-s1032192-tput
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h16384-p63-s1032192-tput
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h16384-p63-s1032192-tput
@@ -215,10 +167,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-cps
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-cps
-##### ethip4udp-ip4base-h4096-p63-s258048-cps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h4096-p63-s258048-cps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h4096-p63-s258048-cps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h4096-p63-s258048-cps
 ##### ethip4udp-ip4base-h16384-p63-s1032192-cps
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h16384-p63-s1032192-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h16384-p63-s1032192-cps
@@ -231,34 +179,10 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h262144-p63-s16515072-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h262144-p63-s16515072-cps
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h262144-p63-s16515072-cps
-##### ethip4udp-ip4base-h1024-p63-s64512-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-pps
-##### ethip4udp-ip4base-h4096-p63-s258048-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h4096-p63-s258048-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h4096-p63-s258048-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h4096-p63-s258048-pps
-##### ethip4udp-ip4base-h16384-p63-s1032192-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h16384-p63-s1032192-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h16384-p63-s1032192-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h16384-p63-s1032192-pps
-##### ethip4udp-ip4base-h65536-p63-s4128768-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-pps
-##### ethip4udp-ip4base-h262144-p63-s16515072-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h262144-p63-s16515072-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h262144-p63-s16515072-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h262144-p63-s16515072-pps
 ##### ethip4tcp-nat44ed-h1024-p63-s64512-cps
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-cps
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-cps
-##### ethip4tcp-nat44ed-h4096-p63-s258048-cps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h4096-p63-s258048-cps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h4096-p63-s258048-cps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h4096-p63-s258048-cps
 ##### ethip4tcp-nat44ed-h16384-p63-s1032192-cps
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h16384-p63-s1032192-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h16384-p63-s1032192-cps
@@ -271,34 +195,10 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h262144-p63-s16515072-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h262144-p63-s16515072-cps
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h262144-p63-s16515072-cps
-##### ethip4tcp-nat44ed-h1024-p63-s64512-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-pps
-##### ethip4tcp-nat44ed-h4096-p63-s258048-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h4096-p63-s258048-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h4096-p63-s258048-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h4096-p63-s258048-pps
-##### ethip4tcp-nat44ed-h16384-p63-s1032192-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h16384-p63-s1032192-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h16384-p63-s1032192-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h16384-p63-s1032192-pps
-##### ethip4tcp-nat44ed-h65536-p63-s4128768-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h65536-p63-s4128768-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h65536-p63-s4128768-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h65536-p63-s4128768-pps
-##### ethip4tcp-nat44ed-h262144-p63-s16515072-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h262144-p63-s16515072-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h262144-p63-s16515072-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h262144-p63-s16515072-pps
 ##### ethip4tcp-nat44ed-h1024-p63-s64512-tput
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
-##### ethip4tcp-nat44ed-h4096-p63-s258048-tput
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h4096-p63-s258048-tput
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h4096-p63-s258048-tput
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h4096-p63-s258048-tput
 ##### ethip4tcp-nat44ed-h16384-p63-s1032192-tput
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
@@ -315,10 +215,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-cps
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-cps
-##### ethip4tcp-ip4base-h4096-p63-s258048-cps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h4096-p63-s258048-cps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h4096-p63-s258048-cps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h4096-p63-s258048-cps
 ##### ethip4tcp-ip4base-h16384-p63-s1032192-cps
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h16384-p63-s1032192-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h16384-p63-s1032192-cps
@@ -331,26 +227,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h262144-p63-s16515072-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h262144-p63-s16515072-cps
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h262144-p63-s16515072-cps
-##### ethip4tcp-ip4base-h1024-p63-s64512-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-pps
-##### ethip4tcp-ip4base-h4096-p63-s258048-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h4096-p63-s258048-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h4096-p63-s258048-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h4096-p63-s258048-pps
-##### ethip4tcp-ip4base-h16384-p63-s1032192-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h16384-p63-s1032192-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h16384-p63-s1032192-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h16384-p63-s1032192-pps
-##### ethip4tcp-ip4base-h65536-p63-s4128768-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h65536-p63-s4128768-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h65536-p63-s4128768-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h65536-p63-s4128768-pps
-##### ethip4tcp-ip4base-h262144-p63-s16515072-pps
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h262144-p63-s16515072-pps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h262144-p63-s16515072-pps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h262144-p63-s16515072-pps
 #### dpdk-vfio-pci
 ##### ethip4-ip4base
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4base
@@ -380,10 +256,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4scale2m-rnd
 2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4scale2m-rnd
 4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4scale2m-rnd
-##### ethip4udp-nat44det-h1-p1-s1
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-nat44det-h1-p1-s1
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-nat44det-h1-p1-s1
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-nat44det-h1-p1-s1
 ## ./ip4_tunnels
 ### intel-xxv710
 #### avf
@@ -549,10 +421,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
-##### dot1q-l2xcbase
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase
 ##### eth-l2patch
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2patch
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2patch
@@ -601,14 +469,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-##### dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-##### dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 ##### eth-l2xcbase-eth-2vhostvr1024-1vm
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm
@@ -617,14 +477,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-##### dot1q-l2xcbase-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-##### dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 #### dpdk-vfio-pci
 ##### eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm
@@ -634,14 +486,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-##### dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-##### dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 ##### eth-l2xcbase-eth-2vhostvr1024-1vm
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2xcbase-eth-2vhostvr1024-1vm
 2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2xcbase-eth-2vhostvr1024-1vm
@@ -651,17 +495,3 @@
 2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 ## ./vts
-### intel-xxv710
-#### avf
-##### ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm
-1c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm
-2c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm
-4c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm
-##### ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm
-1c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm
-2c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm
-4c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm
-##### ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm
-1c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm
-2c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm
-4c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm
diff --git a/docs/job_specs/report_iterative/2n-tx2/vpp-mlr-00.md b/docs/job_specs/report_iterative/2n-tx2/vpp-mlr-00.md
index 80228d44a2..ae73740bf8 100644
--- a/docs/job_specs/report_iterative/2n-tx2/vpp-mlr-00.md
+++ b/docs/job_specs/report_iterative/2n-tx2/vpp-mlr-00.md
@@ -1,7 +1,7 @@
 # 2n-tx2
-### tests 99
-### job hrs est. 9.4
-### job hrs real 9.4
+### tests 150
+### job hrs est. 14.2
+### job hrs real ??.?
 ### test mins est. 5.68
 ### test mins real 5.68
 ## ./container_memif
@@ -11,10 +11,6 @@
 1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 4c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2memif-1dcr
-##### dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-4c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
 ##### eth-l2xcbase-eth-2memif-1dcr
 1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND eth-l2xcbase-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND eth-l2xcbase-eth-2memif-1dcr
@@ -26,95 +22,81 @@
 ## ./crypto
 ### intel-xl710
 #### dpdk-vfio-pci
-# Run crypto tests only in mrr-daily due to time constraints
-# But also leave them commented out here to document the difference between mrr-daily and ndrpdr
 ##### ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-#1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-#2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-#4c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-#1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-#2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-#4c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
+1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
+2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
+4c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
+1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
+2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
+4c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
 ##### ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir
-#1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir
-#2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir
-#4c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir
-#1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir
-#2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir
-#4c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir
+1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir
+2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir
+4c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir
+1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir
+2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir
+4c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir
 ##### ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir
-#1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir
-#2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir
-#4c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir
-#1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir
-#2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir
-#4c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir
+1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir
+2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir
+4c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir
+1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir
+2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir
+4c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir
 ##### ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-#1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-#2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-#4c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-#1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-#2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-#4c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
+1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
+2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
+4c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
+1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
+2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
+4c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
 ##### ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir
-#1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir
-#2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir
-#4c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir
-#1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir
-#2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir
-#4c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir
+1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir
+2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir
+4c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir
+1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir
+2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir
+4c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir
 ##### ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir
-#1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir
-#2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir
-#4c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir
-#1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir
-#2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir
-#4c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir
+1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir
+2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir
+4c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir
+1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir
+2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir
+4c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir
 ##### ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-#1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-#2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-#4c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-#1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-#2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-#4c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
+1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
+2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
+4c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
+1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
+2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
+4c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
 ##### ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir
-#1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir
-#2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir
-#4c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir
-#1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir
-#2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir
-#4c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir
+1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir
+2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir
+4c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir
+1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir
+2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir
+4c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir
 ##### ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir
-#1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir
-#2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir
-#4c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir
-#1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir
-#2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir
-#4c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir
+1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir
+2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir
+4c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir
+1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir
+2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir
+4c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir
 ##### ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-udir
-#1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-udir
-#2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-udir
-#4c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-udir
+1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-udir
+2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-udir
+4c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-udir
 ##### ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-udir
-#1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-udir
-#2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-udir
-#4c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-udir
+1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-udir
+2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-udir
+4c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-udir
 ##### ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-udir
-#1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-udir
-#2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-udir
-#4c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-udir
-##### ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir
-#1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir
-#2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir
-#4c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir
-##### ethip4ipsec40tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir
-#1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir
-#2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir
-#4c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir
-##### ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir
-#1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir
-#2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir
-#4c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir
+1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-udir
+2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-udir
+4c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-udir
 ## ./ip4
 ### intel-xl710
 #### dpdk-vfio-pci
@@ -134,10 +116,6 @@
 1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4-ip4scale2m
 2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4-ip4scale2m
 4c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4-ip4scale2m
-##### dot1q-ip4base
-1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND dot1q-ip4base
-2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND dot1q-ip4base
-4c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND dot1q-ip4base
 ##### ethip4-ip4base-iacldstbase
 1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4-ip4base-iacldstbase
 2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4-ip4base-iacldstbase
@@ -178,10 +156,6 @@
 1c AND 78b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip6-ip6scale2m
 2c AND 78b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip6-ip6scale2m
 4c AND 78b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip6-ip6scale2m
-##### dot1q-ip6base
-1c AND 78b AND ndrpdr AND xl710 AND drv_vfio_pci AND dot1q-ip6base
-2c AND 78b AND ndrpdr AND xl710 AND drv_vfio_pci AND dot1q-ip6base
-4c AND 78b AND ndrpdr AND xl710 AND drv_vfio_pci AND dot1q-ip6base
 ##### ethip6-ip6base-iacldstbase
 1c AND 78b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip6-ip6base-iacldstbase
 2c AND 78b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip6-ip6base-iacldstbase
@@ -214,10 +188,6 @@
 1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND eth-l2xcbase
 2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND eth-l2xcbase
 4c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND eth-l2xcbase
-##### dot1q-l2xcbase
-1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND dot1q-l2xcbase
-2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND dot1q-l2xcbase
-4c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND dot1q-l2xcbase
 ##### eth-l2patch
 1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND eth-l2patch
 2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND eth-l2patch
diff --git a/docs/job_specs/report_iterative/2n-zn2/vpp-mlr-00.md b/docs/job_specs/report_iterative/2n-zn2/vpp-mlr-00.md
index ca2a68f513..b15a6ad856 100644
--- a/docs/job_specs/report_iterative/2n-zn2/vpp-mlr-00.md
+++ b/docs/job_specs/report_iterative/2n-zn2/vpp-mlr-00.md
@@ -1,7 +1,7 @@
 # 2n-zn2
-### tests 402
-### job hrs est. 31.9
-### job hrs real 31.9
+### tests 327
+### job hrs est. 25.9
+### job hrs real ??.?
 ### test mins est. 4.76
 ### test mins real 4.76
 ## ./container_memif
@@ -11,10 +11,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2memif-1dcr
-##### dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
 ##### eth-l2xcbase-eth-2memif-1dcr
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2memif-1dcr
@@ -28,10 +24,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2memif-1dcr
-##### dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
 ##### eth-l2xcbase-eth-2memif-1dcr
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2xcbase-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2xcbase-eth-2memif-1dcr
@@ -46,10 +38,6 @@
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2bdbasemaclrn-eth-2memif-1dcr
-##### dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
 ##### eth-l2xcbase-eth-2memif-1dcr
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase-eth-2memif-1dcr
@@ -109,10 +97,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4scale2m-rnd
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4scale2m-rnd
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4scale2m-rnd
-##### dot1q-ip4base
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip4base
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip4base
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip4base
 ##### ethip4udp-ip4base-iacl50sf-10kflows
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-iacl50sf-10kflows
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-iacl50sf-10kflows
@@ -129,14 +113,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-oacl50sl-10kflows
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-oacl50sl-10kflows
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-oacl50sl-10kflows
-##### ethip4udp-nat44det-h1-p1-s1
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44det-h1-p1-s1
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44det-h1-p1-s1
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44det-h1-p1-s1
-##### ethip4udp-nat44det-h1-p63-s63
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44det-h1-p63-s63
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44det-h1-p63-s63
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44det-h1-p63-s63
 ##### ethip4udp-nat44det-h1024-p63-s64512
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44det-h1024-p63-s64512
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44det-h1024-p63-s64512
@@ -182,10 +158,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4scale2m-rnd
 2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4scale2m-rnd
 4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4scale2m-rnd
-##### ethip4udp-nat44det-h1-p1-s1
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-nat44det-h1-p1-s1
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-nat44det-h1-p1-s1
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-nat44det-h1-p1-s1
 ### mellanox-cx556a
 #### rdma-core
 ##### ethip4-ip4base
@@ -216,10 +188,6 @@
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4-ip4scale2m-rnd
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4-ip4scale2m-rnd
 4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4-ip4scale2m-rnd
-##### dot1q-ip4base
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-ip4base
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-ip4base
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-ip4base
 ##### ethip4udp-ip4base-iacl50sf-10kflows
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-iacl50sf-10kflows
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-iacl50sf-10kflows
@@ -236,14 +204,6 @@
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-oacl50sl-10kflows
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-oacl50sl-10kflows
 4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-oacl50sl-10kflows
-##### ethip4udp-nat44det-h1-p1-s1
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-nat44det-h1-p1-s1
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-nat44det-h1-p1-s1
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-nat44det-h1-p1-s1
-##### ethip4udp-nat44det-h1024-p63-s64512
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-nat44det-h1024-p63-s64512
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-nat44det-h1024-p63-s64512
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-nat44det-h1024-p63-s64512
 ## ./ip4_tunnels
 ### intel-xxv710
 #### avf
@@ -317,10 +277,6 @@
 1c AND 78b AND ndrpdr AND xxv710 AND drv_avf AND ethip6-ip6scale2m-rnd
 2c AND 78b AND ndrpdr AND xxv710 AND drv_avf AND ethip6-ip6scale2m-rnd
 4c AND 78b AND ndrpdr AND xxv710 AND drv_avf AND ethip6-ip6scale2m-rnd
-##### dot1q-ip6base
-1c AND 78b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip6base
-2c AND 78b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip6base
-4c AND 78b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip6base
 #### dpdk-vfio-pci
 ##### ethip6-ip6base
 1c AND 78b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip6-ip6base
@@ -380,10 +336,6 @@
 1c AND 78b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip6-ip6scale2m-rnd
 2c AND 78b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip6-ip6scale2m-rnd
 4c AND 78b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip6-ip6scale2m-rnd
-##### dot1q-ip6base
-1c AND 78b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-ip6base
-2c AND 78b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-ip6base
-4c AND 78b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-ip6base
 ## ./ip6_tunnels
 ## ./l2
 ### intel-x710
@@ -427,10 +379,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
-##### dot1q-l2xcbase
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase
 ##### eth-l2patch
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2patch
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2patch
@@ -486,10 +434,6 @@
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase
 4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase
-##### dot1q-l2xcbase
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2xcbase
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2xcbase
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2xcbase
 ##### eth-l2patch
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2patch
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2patch
@@ -513,14 +457,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-##### dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-##### dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 ##### eth-l2xcbase-eth-2vhostvr1024-1vm
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm
@@ -529,14 +465,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-##### dot1q-l2xcbase-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-##### dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 #### dpdk-vfio-pci
 ##### eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm
@@ -556,14 +484,6 @@
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-##### dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-##### dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 ##### eth-l2xcbase-eth-2vhostvr1024-1vm
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase-eth-2vhostvr1024-1vm
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase-eth-2vhostvr1024-1vm
@@ -572,26 +492,4 @@
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-##### dot1q-l2xcbase-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-##### dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 ## ./vts
-### intel-xxv710
-#### avf
-##### ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm
-1c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm
-2c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm
-4c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm
-##### ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm
-1c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm
-2c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm
-4c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm
-##### ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm
-1c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm
-2c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm
-4c AND 114b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm
diff --git a/docs/job_specs/report_iterative/3n-skx/vpp-mlr-00.md b/docs/job_specs/report_iterative/3n-skx/vpp-mlr-00.md
index 056e04442a..99b18f7c5c 100644
--- a/docs/job_specs/report_iterative/3n-skx/vpp-mlr-00.md
+++ b/docs/job_specs/report_iterative/3n-skx/vpp-mlr-00.md
@@ -1,7 +1,7 @@
 # 3n-skx
-### tests 324
-### job hrs est. 29.9
-### job hrs real x
+### tests 267
+### job hrs est. 24.6
+### job hrs real ??.?
 ### test mins est. 5.54
 ### test mins real 5.54
 ## ./container_memif
@@ -11,10 +11,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2memif-1lxc
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2memif-1lxc
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2memif-1lxc
-##### dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
 ##### eth-l2xcbase-eth-2memif-1dcr
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2memif-1dcr
@@ -175,10 +171,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4scale2m
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4scale2m
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4scale2m
-##### dot1q-ip4base
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip4base
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip4base
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip4base
 #### dpdk-vfio-pci
 ##### ethip4-ip4base
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4base
@@ -191,14 +183,6 @@
 ## ./ip4_tunnels
 ### intel-xxv710
 #### avf
-##### dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan
-##### dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan
 ##### ethip4vxlan-l2bdbasemaclrn
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4vxlan-l2bdbasemaclrn
@@ -246,10 +230,6 @@
 1c AND 78b AND ndrpdr AND xxv710 AND drv_avf AND ethip6-ip6scale2m
 2c AND 78b AND ndrpdr AND xxv710 AND drv_avf AND ethip6-ip6scale2m
 4c AND 78b AND ndrpdr AND xxv710 AND drv_avf AND ethip6-ip6scale2m
-##### dot1q-ip6base
-1c AND 78b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip6base
-2c AND 78b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip6base
-4c AND 78b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-ip6base
 #### dpdk-vfio-pci
 ##### ethip6-ip6base
 1c AND 78b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip6-ip6base
@@ -306,10 +286,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
-##### dot1q-l2xcbase
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase
 ##### eth-l2patch
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2patch
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2patch
@@ -369,41 +345,9 @@
 ## ./vm_vhost
 ### intel-x710
 #### avf
-##### 2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND x710 AND drv_avf AND 2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND x710 AND drv_avf AND 2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND x710 AND drv_avf AND 2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-##### 2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND x710 AND drv_avf AND 2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND x710 AND drv_avf AND 2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND x710 AND drv_avf AND 2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-##### 2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND x710 AND drv_avf AND 2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND x710 AND drv_avf AND 2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND x710 AND drv_avf AND 2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm
-##### 2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND x710 AND drv_avf AND 2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND x710 AND drv_avf AND 2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND x710 AND drv_avf AND 2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 #### dpdk-vfio-pci
 ### intel-xxv710
 #### avf
-##### 1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND 1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND 1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND 1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-##### 1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND 1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND 1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND 1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-##### 1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND 1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND 1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND 1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm
-##### 1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND 1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND 1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND 1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 ##### eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm
@@ -412,14 +356,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-##### dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-##### dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 ##### eth-l2xcbase-eth-2vhostvr1024-1vm
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm
@@ -428,14 +364,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-##### dot1q-l2xcbase-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-##### dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 ##### ethip4-ip4base-eth-2vhostvr1024-1vm
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4base-eth-2vhostvr1024-1vm
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4base-eth-2vhostvr1024-1vm
@@ -457,10 +385,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm
 2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm
 4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-##### dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
 ##### eth-l2xcbase-eth-2vhostvr1024-1vm
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2xcbase-eth-2vhostvr1024-1vm
 2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2xcbase-eth-2vhostvr1024-1vm
diff --git a/docs/job_specs/report_iterative/3n-tsh/vpp-mlr-00.md b/docs/job_specs/report_iterative/3n-tsh/vpp-mlr-00.md
index b3afcb230b..2e4e6b6bee 100644
--- a/docs/job_specs/report_iterative/3n-tsh/vpp-mlr-00.md
+++ b/docs/job_specs/report_iterative/3n-tsh/vpp-mlr-00.md
@@ -1,7 +1,7 @@
 # 3n-tsh
-### tests 198
-### job hrs est. 23.3
-### job hrs real 23.3
+### tests 195
+### job hrs est. 23.0
+### job hrs real ??.?
 ### test mins est. 7.07
 ### test mins real 7.07
 ## ./container_memif
@@ -11,10 +11,6 @@
 1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2memif-1lxc
 2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2memif-1lxc
 4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2memif-1lxc
-##### dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
-4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2memif-1dcr
 ##### eth-l2xcbase-eth-2memif-1dcr
 1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND eth-l2xcbase-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND eth-l2xcbase-eth-2memif-1dcr
@@ -30,8 +26,6 @@
 ## ./crypto
 ### intel-x520-da2
 #### dpdk-vfio-pci
-# Run more crypto tests in mrr-daily due to time constraints
-# But leave the rest commented out here to document the difference between mrr-daily and ndrpdr
 ##### ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha
 1c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha
 2c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha
@@ -40,12 +34,12 @@
 2c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha
 4c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha
 ##### ethip4ipsec4tnlsw-ip4base-int-aes128gcm
-#1c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm
-#2c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm
-#4c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm
-#1c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm
-#2c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm
-#4c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm
+1c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm
+2c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm
+4c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm
+1c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm
+2c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm
+4c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes128gcm
 ##### ethip4ipsec4tnlsw-ip4base-int-aes256gcm
 1c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes256gcm
 2c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec4tnlsw-ip4base-int-aes256gcm
@@ -61,12 +55,12 @@
 2c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha
 4c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha
 ##### ethip4ipsec1000tnlsw-ip4base-int-aes128gcm
-#1c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm
-#2c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm
-#4c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm
-#1c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm
-#2c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm
-#4c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm
+1c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm
+2c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm
+4c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm
+1c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm
+2c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm
+4c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes128gcm
 ##### ethip4ipsec1000tnlsw-ip4base-int-aes256gcm
 1c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes256gcm
 2c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-int-aes256gcm
@@ -82,12 +76,12 @@
 2c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha
 4c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha
 ##### ethip4ipsec10000tnlsw-ip4base-int-aes128gcm
-#1c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm
-#2c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm
-#4c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm
-#1c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm
-#2c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm
-#4c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm
+1c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm
+2c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm
+4c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm
+1c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm
+2c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm
+4c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes128gcm
 ##### ethip4ipsec10000tnlsw-ip4base-int-aes256gcm
 1c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes256gcm
 2c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes256gcm
@@ -96,29 +90,17 @@
 2c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes256gcm
 4c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-ip4base-int-aes256gcm
 ##### ethip4ipsec1tnlsw-ip4base-policy-aes256gcm
-#1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes256gcm
-#2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes256gcm
-#4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes256gcm
+1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes256gcm
+2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes256gcm
+4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes256gcm
 ##### ethip4ipsec40tnlsw-ip4base-policy-aes256gcm
-#1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-policy-aes256gcm
-#2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-policy-aes256gcm
-#4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-policy-aes256gcm
+1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-policy-aes256gcm
+2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-policy-aes256gcm
+4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-policy-aes256gcm
 ##### ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm
-#1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm
-#2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm
-#4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm
-##### ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha
-#1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha
-#2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha
-#4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha
-##### ethip4ipsec40tnlsw-ip4base-policy-aes128cbc-hmac512sha
-#1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-policy-aes128cbc-hmac512sha
-#2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-policy-aes128cbc-hmac512sha
-#4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-policy-aes128cbc-hmac512sha
-##### ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha
-#1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha
-#2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha
-#4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha
+1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm
+2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm
+4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm
 ## ./ip4
 ### intel-x520-da2
 #### dpdk-vfio-pci
@@ -138,10 +120,6 @@
 1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4-ip4scale2m
 2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4-ip4scale2m
 4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4-ip4scale2m
-##### dot1q-ip4base
-1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-ip4base
-2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-ip4base
-4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-ip4base
 ##### ethip4udp-ip4base-iacl50sf-10kflows
 1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-iacl50sf-10kflows
 2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-iacl50sf-10kflows
@@ -161,14 +139,6 @@
 ## ./ip4_tunnels
 ### intel-x520-da2
 #### dpdk-vfio-pci
-##### dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan
-1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan
-2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan
-4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan
-##### dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan
-1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan
-2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan
-4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan
 ##### ethip4vxlan-l2bdbasemaclrn
 1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4vxlan-l2bdbasemaclrn
 2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4vxlan-l2bdbasemaclrn
@@ -196,10 +166,6 @@
 1c AND 78b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip6-ip6scale2m
 2c AND 78b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip6-ip6scale2m
 4c AND 78b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip6-ip6scale2m
-##### dot1q-ip6base
-1c AND 78b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-ip6base
-2c AND 78b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-ip6base
-4c AND 78b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-ip6base
 ## ./ip6_tunnels
 ## ./l2
 ### intel-x520-da2
@@ -228,10 +194,6 @@
 1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND eth-l2xcbase
 2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND eth-l2xcbase
 4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND eth-l2xcbase
-##### dot1q-l2xcbase
-1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-l2xcbase
-2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-l2xcbase
-4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-l2xcbase
 ##### eth-l2patch
 1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND eth-l2patch
 2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND eth-l2patch
@@ -301,14 +263,6 @@
 1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-##### dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-##### dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 ##### eth-l2xcbase-eth-2vhostvr1024-1vm
 1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND eth-l2xcbase-eth-2vhostvr1024-1vm
 2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND eth-l2xcbase-eth-2vhostvr1024-1vm
@@ -317,14 +271,6 @@
 1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-##### dot1q-l2xcbase-eth-2vhostvr1024-1vm
-1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-l2xcbase-eth-2vhostvr1024-1vm
-##### dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 ##### ethip4-ip4base-eth-2vhostvr1024-1vm
 1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4-ip4base-eth-2vhostvr1024-1vm
 2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4-ip4base-eth-2vhostvr1024-1vm