job_specs: use test tag ethip4udp-snat44det-h1-p1-s1 not ethip4udp-ip4base-nat44

Change-Id: Idb7b415995f0a3474e379b0c023f64a96e886a55
Signed-off-by: Jan Gelety <jgelety@cisco.com>

13 files changed, 90 insertions, 149 deletions

diff --git a/docs/job_specs/report_coverage/2n-clx/ip4-01.md b/docs/job_specs/report_coverage/2n-clx/ip4-01.md
index 71ad7f869f..77f039a67b 100644
--- a/docs/job_specs/report_coverage/2n-clx/ip4-01.md
+++ b/docs/job_specs/report_coverage/2n-clx/ip4-01.md
@@ -39,16 +39,16 @@
 1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4base-ipolicemarkbase
 2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4base-ipolicemarkbase
 4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4base-ipolicemarkbase
-##### ethip4udp-ip4base-nat44
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-1c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-2c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-1c AND 9000b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
+##### ethip4udp-snat44det-h1-p1-s1
+1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+1c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+2c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+1c AND 9000b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
 #### dpdk-vfio-pci
 ##### ethip4-ip4base-copwhtlistbase
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4base-copwhtlistbase
@@ -80,16 +80,16 @@
 1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
 2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
 4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
-##### ethip4udp-ip4base-nat44
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND 9000b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
+##### ethip4udp-snat44det-h1-p1-s1
+1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+1c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+2c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+1c AND 9000b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
 ## ./ip4_tunnels
 ## ./ip6
 ## ./ip6_tunnels
diff --git a/docs/job_specs/report_coverage/2n-dnv/ip4-01.md b/docs/job_specs/report_coverage/2n-dnv/ip4-01.md
index dc55be8f67..8c25a3ab45 100644
--- a/docs/job_specs/report_coverage/2n-dnv/ip4-01.md
+++ b/docs/job_specs/report_coverage/2n-dnv/ip4-01.md
@@ -39,16 +39,16 @@
 1c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
 2c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
 4c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
-##### ethip4udp-ip4base-nat44
-1c AND 64b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 64b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND 64b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND 9000b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
+##### ethip4udp-snat44det-h1-p1-s1
+1c AND 64b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+2c AND 64b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+4c AND 64b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+1c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+2c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+1c AND 9000b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+1c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+2c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+4c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
 ## ./ip4_tunnels
 ## ./ip6
 ## ./ip6_tunnels
diff --git a/docs/job_specs/report_coverage/2n-skx/ip4-01.md b/docs/job_specs/report_coverage/2n-skx/ip4-01.md
index 1df42e731a..210fc76398 100644
--- a/docs/job_specs/report_coverage/2n-skx/ip4-01.md
+++ b/docs/job_specs/report_coverage/2n-skx/ip4-01.md
@@ -39,16 +39,16 @@
 1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4base-ipolicemarkbase
 2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4base-ipolicemarkbase
 4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4base-ipolicemarkbase
-##### ethip4udp-ip4base-nat44
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-1c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-2c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-1c AND 9000b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
+##### ethip4udp-snat44det-h1-p1-s1
+1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+1c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+2c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+1c AND 9000b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
 #### dpdk-vfio-pci
 ##### ethip4-ip4base-copwhtlistbase
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4base-copwhtlistbase
@@ -80,16 +80,16 @@
 1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
 2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
 4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
-##### ethip4udp-ip4base-nat44
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND 9000b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
+##### ethip4udp-snat44det-h1-p1-s1
+1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+1c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+2c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+1c AND 9000b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
 ## ./ip4_tunnels
 ## ./ip6
 ## ./ip6_tunnels
diff --git a/docs/job_specs/report_coverage/3n-dnv/ip4-01.md b/docs/job_specs/report_coverage/3n-dnv/ip4-01.md
index dc42184a73..d58fac3022 100644
--- a/docs/job_specs/report_coverage/3n-dnv/ip4-01.md
+++ b/docs/job_specs/report_coverage/3n-dnv/ip4-01.md
@@ -39,16 +39,6 @@
 1c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
 2c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
 4c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
-##### ethip4udp-ip4base-nat44
-1c AND 64b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 64b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND 64b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND 9000b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
 ## ./ip4_tunnels
 ## ./ip6
 ## ./ip6_tunnels
diff --git a/docs/job_specs/report_coverage/3n-hsw/ip4-01.md b/docs/job_specs/report_coverage/3n-hsw/ip4-01.md
index b6e4c500cf..7eb8430c6a 100644
--- a/docs/job_specs/report_coverage/3n-hsw/ip4-01.md
+++ b/docs/job_specs/report_coverage/3n-hsw/ip4-01.md
@@ -33,14 +33,6 @@
 1c AND 9000b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
 1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
 2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
-##### ethip4udp-ip4base-nat44
-1c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 64b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 1518b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND 9000b AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND imix AND ndrpdr AND xl710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
 ## ./ip4_tunnels
 ## ./ip6
 ## ./ip6_tunnels
diff --git a/docs/job_specs/report_coverage/3n-skx/ip4-01.md b/docs/job_specs/report_coverage/3n-skx/ip4-01.md
index 0f641cf0c6..6d43ef5577 100644
--- a/docs/job_specs/report_coverage/3n-skx/ip4-01.md
+++ b/docs/job_specs/report_coverage/3n-skx/ip4-01.md
@@ -39,16 +39,6 @@
 1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4base-ipolicemarkbase
 2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4base-ipolicemarkbase
 4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4-ip4base-ipolicemarkbase
-##### ethip4udp-ip4base-nat44
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-1c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-2c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-1c AND 9000b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
 #### dpdk-vfio-pci
 ##### ethip4-ip4base-copwhtlistbase
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4base-copwhtlistbase
@@ -80,16 +70,6 @@
 1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
 2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
 4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
-##### ethip4udp-ip4base-nat44
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND 9000b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
 ## ./ip4_tunnels
 ## ./ip6
 ## ./ip6_tunnels
diff --git a/docs/job_specs/report_coverage/3n-tsh/ip4-01.md b/docs/job_specs/report_coverage/3n-tsh/ip4-01.md
index 534b7ffdc3..55b2f66a54 100644
--- a/docs/job_specs/report_coverage/3n-tsh/ip4-01.md
+++ b/docs/job_specs/report_coverage/3n-tsh/ip4-01.md
@@ -48,19 +48,6 @@
 1c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
 2c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
 4c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase
-##### ethip4udp-ip4base-nat44
-1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND 1518b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND 9000b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 9000b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND 9000b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-1c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND imix AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
 ## ./ip4_tunnels
 ## ./ip6
 ## ./ip6_tunnels
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 4dccc227b8..29e5238909 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
@@ -129,10 +129,10 @@
 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-ip4base-nat44
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
+##### ethip4udp-snat44det-h1-p1-s1
+1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
 ##### ethip4udp-snat44det-h1024-p63-s64512
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1024-p63-s64512
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1024-p63-s64512
@@ -166,10 +166,10 @@
 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-ip4base-nat44
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
+##### ethip4udp-snat44det-h1-p1-s1
+1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
 ### mellanox-cx556a
 #### rdma-core
 ##### ethip4-ip4base
@@ -220,10 +220,10 @@
 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-ip4base-nat44
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-nat44
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-nat44
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-nat44
+##### ethip4udp-snat44det-h1-p1-s1
+1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-snat44det-h1-p1-s1
+2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-snat44det-h1-p1-s1
+4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-snat44det-h1-p1-s1
 ##### ethip4udp-snat44det-h1024-p63-s64512
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-snat44det-h1024-p63-s64512
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND ethip4udp-snat44det-h1024-p63-s64512
diff --git a/docs/job_specs/report_iterative/2n-clx/vpp-mrr-00.md b/docs/job_specs/report_iterative/2n-clx/vpp-mrr-00.md
index d37ee78b25..4cfb6a7e59 100644
--- a/docs/job_specs/report_iterative/2n-clx/vpp-mrr-00.md
+++ b/docs/job_specs/report_iterative/2n-clx/vpp-mrr-00.md
@@ -129,10 +129,10 @@
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-oacl50sl-10kflows
 2c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-oacl50sl-10kflows
 4c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-oacl50sl-10kflows
-##### ethip4udp-ip4base-nat44
-1c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-2c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-4c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
+##### ethip4udp-snat44det-h1-p1-s1
+1c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+2c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+4c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
 ##### ethip4udp-snat44det-h1024-p63-s64512
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1024-p63-s64512
 2c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1024-p63-s64512
@@ -166,10 +166,10 @@
 1c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4-ip4scale2m-rnd
 2c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4-ip4scale2m-rnd
 4c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4-ip4scale2m-rnd
-##### ethip4udp-ip4base-nat44
-1c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
+##### ethip4udp-snat44det-h1-p1-s1
+1c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+2c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+4c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
 ### mellanox-cx556a
 #### rdma-core
 ##### ethip4-ip4base
@@ -220,10 +220,10 @@
 1c AND 64b AND mrr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-oacl50sl-10kflows
 2c AND 64b AND mrr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-oacl50sl-10kflows
 4c AND 64b AND mrr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-oacl50sl-10kflows
-##### ethip4udp-ip4base-nat44
-1c AND 64b AND mrr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-nat44
-2c AND 64b AND mrr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-nat44
-4c AND 64b AND mrr AND cx556a AND drv_rdma_core AND ethip4udp-ip4base-nat44
+##### ethip4udp-snat44det-h1-p1-s1
+1c AND 64b AND mrr AND cx556a AND drv_rdma_core AND ethip4udp-snat44det-h1-p1-s1
+2c AND 64b AND mrr AND cx556a AND drv_rdma_core AND ethip4udp-snat44det-h1-p1-s1
+4c AND 64b AND mrr AND cx556a AND drv_rdma_core AND ethip4udp-snat44det-h1-p1-s1
 ##### ethip4udp-snat44det-h1024-p63-s64512
 1c AND 64b AND mrr AND cx556a AND drv_rdma_core AND ethip4udp-snat44det-h1024-p63-s64512
 2c AND 64b AND mrr AND cx556a AND drv_rdma_core AND ethip4udp-snat44det-h1024-p63-s64512
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 bd46602e66..caf5c5eba5 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
@@ -111,10 +111,10 @@
 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-ip4base-nat44
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
+##### ethip4udp-snat44det-h1-p1-s1
+1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
 ##### ethip4udp-snat44det-h1024-p63-s64512
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1024-p63-s64512
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1024-p63-s64512
@@ -148,10 +148,10 @@
 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-ip4base-nat44
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
+##### ethip4udp-snat44det-h1-p1-s1
+1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
 ## ./ip4_tunnels
 ## ./ip6
 ### intel-x710
diff --git a/docs/job_specs/report_iterative/2n-skx/vpp-mrr-00.md b/docs/job_specs/report_iterative/2n-skx/vpp-mrr-00.md
index fa92bc81cf..fcbb8c6b51 100644
--- a/docs/job_specs/report_iterative/2n-skx/vpp-mrr-00.md
+++ b/docs/job_specs/report_iterative/2n-skx/vpp-mrr-00.md
@@ -111,10 +111,10 @@
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-oacl50sl-10kflows
 2c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-oacl50sl-10kflows
 4c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-oacl50sl-10kflows
-##### ethip4udp-ip4base-nat44
-1c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-2c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
-4c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-nat44
+##### ethip4udp-snat44det-h1-p1-s1
+1c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+2c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
+4c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1-p1-s1
 ##### ethip4udp-snat44det-h1024-p63-s64512
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1024-p63-s64512
 2c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-snat44det-h1024-p63-s64512
@@ -148,10 +148,10 @@
 1c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4-ip4scale2m-rnd
 2c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4-ip4scale2m-rnd
 4c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4-ip4scale2m-rnd
-##### ethip4udp-ip4base-nat44
-1c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
+##### ethip4udp-snat44det-h1-p1-s1
+1c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+2c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
+4c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4udp-snat44det-h1-p1-s1
 ## ./ip4_tunnels
 ## ./ip6
 ### intel-x710
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 25ec4e91e2..ce570f27bc 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
@@ -111,10 +111,6 @@
 1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-oacl50sl-10kflows
 2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-oacl50sl-10kflows
 4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-oacl50sl-10kflows
-##### ethip4udp-ip4base-nat44
-1c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND 64b AND ndrpdr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
 ## ./ip4_tunnels
 ### intel-x520-da2
 #### dpdk-vfio-pci
diff --git a/docs/job_specs/report_iterative/3n-tsh/vpp-mrr-00.md b/docs/job_specs/report_iterative/3n-tsh/vpp-mrr-00.md
index 6b4dfdb4ab..11eb14429c 100644
--- a/docs/job_specs/report_iterative/3n-tsh/vpp-mrr-00.md
+++ b/docs/job_specs/report_iterative/3n-tsh/vpp-mrr-00.md
@@ -111,10 +111,6 @@
 1c AND 64b AND mrr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-oacl50sl-10kflows
 2c AND 64b AND mrr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-oacl50sl-10kflows
 4c AND 64b AND mrr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-oacl50sl-10kflows
-##### ethip4udp-ip4base-nat44
-1c AND 64b AND mrr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-2c AND 64b AND mrr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
-4c AND 64b AND mrr AND x520-da2 AND drv_vfio_pci AND ethip4udp-ip4base-nat44
 ## ./ip4_tunnels
 ### intel-x520-da2
 #### dpdk-vfio-pci