8 files changed, 796 insertions, 116 deletions
diff --git a/docs/cpta/index.rst b/docs/cpta/index.rst
index fff9a5ccd1..6dc3a3cfc6 100644
--- a/docs/cpta/index.rst
+++ b/docs/cpta/index.rst
@@ -31,6 +31,7 @@ analysis and anomaly detection methodology.
     trending/ip6
     trending/srv6
     trending/ip4_tunnels
+    trending/nat44
     trending/vhost
     trending/container_memif
     trending/ipsec
@@ -47,6 +48,7 @@ analysis and anomaly detection methodology.
     ndrpdr_trending/ip6
     ndrpdr_trending/srv6
     ndrpdr_trending/ip4_tunnels
+    ndrpdr_trending/nat44
     ndrpdr_trending/vhost
     ndrpdr_trending/container_memif
     ndrpdr_trending/ipsec
diff --git a/docs/cpta/ndrpdr_trending/ip4-2n-clx-xxv710.rst b/docs/cpta/ndrpdr_trending/ip4-2n-clx-xxv710.rst
index 9bd1b78e4e..48de927bb9 100644
--- a/docs/cpta/ndrpdr_trending/ip4-2n-clx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4-2n-clx-xxv710.rst
@@ -96,37 +96,6 @@
     <p><br></p>
     </center>
 
-64b-ip4routing-features-nat44det-avf
-````````````````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-nat44det-avf-ndr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-features-nat44det-avf-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-nat44det-avf-pdr"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-features-nat44det-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
 64b-ip4routing-base-scale-dpdk
 ``````````````````````````````
 
diff --git a/docs/cpta/ndrpdr_trending/nat44-2n-clx-xxv710.rst b/docs/cpta/ndrpdr_trending/nat44-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..610f8946a3
--- /dev/null
+++ b/docs/cpta/ndrpdr_trending/nat44-2n-clx-xxv710.rst
@@ -0,0 +1,189 @@
+2n-clx-xxv710
+-------------
+
+64b-nat44det-ip4routing-stl-bidir-avf
+`````````````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-stl-bidir-avf-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-stl-bidir-avf-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-nat44ed-ip4routing-stl-unidir-avf
+`````````````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-stl-unidir-avf-ndr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-stl-unidir-avf-pdr"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+..
+    64b-nat44ed-ip4routing-udp-stf-cps-avf
+    ``````````````````````````````````````
+
+    2t1c-ndr
+    ::::::::
+
+    .. raw:: html
+
+        <a name="64b-2t1c-udp-stf-cps-avf-ndr"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr.html"></iframe>
+        <p><br></p>
+        </center>
+
+    2t1c-pdr
+    ::::::::
+
+    .. raw:: html
+
+        <a name="64b-2t1c-udp-stf-cps-avf-pdr"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr.html"></iframe>
+        <p><br></p>
+        </center>
+
+    64b-nat44ed-ip4routing-tcp-stf-cps-avf
+    ``````````````````````````````````````
+
+    2t1c-ndr
+    ::::::::
+
+    .. raw:: html
+
+        <a name="64b-2t1c-tcp-stf-cps-avf-ndr"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr.html"></iframe>
+        <p><br></p>
+        </center>
+
+    2t1c-pdr
+    ::::::::
+
+    .. raw:: html
+
+        <a name="64b-2t1c-tcp-stf-cps-avf-pdr"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr.html"></iframe>
+        <p><br></p>
+        </center>
+
+    64b-nat44ed-ip4routing-udp-stf-pps-avf
+    ``````````````````````````````````````
+
+    2t1c-ndr
+    ::::::::
+
+    .. raw:: html
+
+        <a name="64b-2t1c-udp-stf-pps-avf-ndr"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr.html"></iframe>
+        <p><br></p>
+        </center>
+
+    2t1c-pdr
+    ::::::::
+
+    .. raw:: html
+
+        <a name="64b-2t1c-udp-stf-pps-avf-pdr"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr.html"></iframe>
+        <p><br></p>
+        </center>
+
+    64b-nat44ed-ip4routing-tcp-stf-pps-avf
+    ``````````````````````````````````````
+
+    2t1c-ndr
+    ::::::::
+
+    .. raw:: html
+
+        <a name="64b-2t1c-tcp-stf-pps-avf-ndr"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr.html"></iframe>
+        <p><br></p>
+        </center>
+
+    2t1c-pdr
+    ::::::::
+
+    .. raw:: html
+
+        <a name="64b-2t1c-tcp-stf-pps-avf-pdr"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr.html"></iframe>
+        <p><br></p>
+        </center>
diff --git a/docs/cpta/ndrpdr_trending/nat44.rst b/docs/cpta/ndrpdr_trending/nat44.rst
new file mode 100644
index 0000000000..d0b898c7a8
--- /dev/null
+++ b/docs/cpta/ndrpdr_trending/nat44.rst
@@ -0,0 +1,6 @@
+NAT44 IPv4 Routing
+==================
+
+.. toctree::
+
+    nat44-2n-clx-xxv710
diff --git a/docs/cpta/trending/ip4-2n-clx-xxv710.rst b/docs/cpta/trending/ip4-2n-clx-xxv710.rst
index 9ab1f547e3..8a08debeb4 100644
--- a/docs/cpta/trending/ip4-2n-clx-xxv710.rst
+++ b/docs/cpta/trending/ip4-2n-clx-xxv710.rst
@@ -183,48 +183,3 @@
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-8t4c-ip4-features-avf.html"></iframe>
     <p><br></p>
     </center>
-
-64b-ip4routing-features-nat44det-avf
-````````````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-nat44det-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-features-nat44det-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-features-nat44det-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-4t2c-ip4-features-nat44det-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
-    <a name="64b-8t4c-features-nat44det-avf"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-8t4c-ip4-features-nat44det-avf.html"></iframe>
-    <p><br></p>
-    </center>
diff --git a/docs/cpta/trending/nat44-2n-clx-xxv710.rst b/docs/cpta/trending/nat44-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..f1243c5e8c
--- /dev/null
+++ b/docs/cpta/trending/nat44-2n-clx-xxv710.rst
@@ -0,0 +1,273 @@
+2n-clx-xxv710
+-------------
+
+64b-nat44det-ip4routing-stl-bidir-avf
+`````````````````````````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-stl-bidir-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-stl-bidir-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-stl-bidir-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-nat44ed-ip4routing-stl-unidir-avf
+`````````````````````````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-stl-unidir-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-stl-unidir-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-stl-unidir-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+..
+    64b-nat44ed-ip4routing-udp-stf-cps-avf
+    ``````````````````````````````````````
+
+    2t1c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-2t1c-udp-stf-cps-avf"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    4t2c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-4t2c-udp-stf-cps-avf"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    8t4c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-8t4c-udp-stf-cps-avf"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    64b-nat44ed-ip4routing-tcp-stf-cps-avf
+    ``````````````````````````````````````
+
+    2t1c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-2t1c-tcp-stf-cps-avf"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    4t2c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-4t2c-tcp-stf-cps-avf"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    8t4c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-8t4c-tcp-stf-cps-avf"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    64b-nat44ed-ip4routing-udp-stf-pps-avf
+    ``````````````````````````````````````
+
+    2t1c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-2t1c-udp-stf-pps-avf"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    4t2c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-4t2c-udp-stf-pps-avf"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    8t4c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-8t4c-udp-stf-pps-avf"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    64b-nat44ed-ip4routing-tcp-stf-pps-avf
+    ``````````````````````````````````````
+
+    2t1c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-2t1c-tcp-stf-pps-avf"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    4t2c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-4t2c-tcp-stf-pps-avf"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    8t4c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-8t4c-tcp-stf-pps-avf"></a>
+        <center>
+        Links to builds:
+        <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+        <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf.html"></iframe>
+        <p><br></p>
+        </center>
diff --git a/docs/cpta/trending/nat44.rst b/docs/cpta/trending/nat44.rst
new file mode 100644
index 0000000000..d0b898c7a8
--- /dev/null
+++ b/docs/cpta/trending/nat44.rst
@@ -0,0 +1,6 @@
+NAT44 IPv4 Routing
+==================
+
+.. toctree::
+
+    nat44-2n-clx-xxv710
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 5bad39c2ba..c1de0650a4 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -2916,42 +2916,204 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-8t4c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-features-nat44det-base-avf"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-features-nat44det-avf"
+    - title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-mrr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H1-P63-S63-Mrr.64B-2t1c-avf-ethip4udp-nat44det-h1-p63-s63-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H16384-P63-S1032192-Mrr.64B-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H262144-P63-S16515072-Mrr.64B-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H65536-P63-S4128758-Mrr.64B-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr.64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr.64b-2t1c-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr.64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr.64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr.64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-4t2c-features-nat44det-base-avf"
-      output-file-name: "2n-clx-xxv710-64b-4t2c-ip4-features-nat44det-avf"
+    - title: "2n-clx-xxv710-64b-4t2c-nat44det-ip4routing-stl-bidir-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-nat44det-ip4routing-stl-bidir-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-mrr.64B-4t2c-avf-ethip4udp-nat44det-h1-p1-s1-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H1-P63-S63-Mrr.64B-4t2c-avf-ethip4udp-nat44det-h1-p63-s63-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-4t2c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H16384-P63-S1032192-Mrr.64B-4t2c-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H262144-P63-S16515072-Mrr.64B-4t2c-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H65536-P63-S4128758-Mrr.64B-4t2c-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr.64b-4t2c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr.64b-4t2c-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr.64b-4t2c-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr.64b-4t2c-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr.64b-4t2c-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-8t4c-features-nat44det-base-avf"
-      output-file-name: "2n-clx-xxv710-64b-8t4c-ip4-features-nat44det-avf"
+    - title: "2n-clx-xxv710-64b-8t4c-nat44det-ip4routing-stl-bidir-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-nat44det-ip4routing-stl-bidir-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-mrr.64B-8t4c-avf-ethip4udp-nat44det-h1-p1-s1-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H1-P63-S63-Mrr.64B-8t4c-avf-ethip4udp-nat44det-h1-p63-s63-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-8t4c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H16384-P63-S1032192-Mrr.64B-8t4c-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H262144-P63-S16515072-Mrr.64B-8t4c-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H65536-P63-S4128758-Mrr.64B-8t4c-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr.64b-8t4c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr.64b-8t4c-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr.64b-8t4c-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr.64b-8t4c-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr.64b-8t4c-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
       layout: "plot-cpta"
 
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-stl-unidir-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-stl-unidir-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-stl-unidir-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-stl-unidir-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr"
+      layout: "plot-cpta"
+
+#    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf"
+#      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf"
+#      data: "plot-performance-trending-vpp-2n-clx"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-cps-avf"
+#      output-file-name: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-cps-avf"
+#      data: "plot-performance-trending-vpp-2n-clx"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-cps-avf"
+#      output-file-name: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-cps-avf"
+#      data: "plot-performance-trending-vpp-2n-clx"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf"
+#      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf"
+#      data: "plot-performance-trending-vpp-2n-clx"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-tcp-stf-cps-avf"
+#      output-file-name: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-tcp-stf-cps-avf"
+#      data: "plot-performance-trending-vpp-2n-clx"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-tcp-stf-cps-avf"
+#      output-file-name: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-tcp-stf-cps-avf"
+#      data: "plot-performance-trending-vpp-2n-clx"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf"
+#      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf"
+#      data: "plot-performance-trending-vpp-2n-clx"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-pps-avf"
+#      output-file-name: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-pps-avf"
+#      data: "plot-performance-trending-vpp-2n-clx"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-pps-avf"
+#      output-file-name: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-pps-avf"
+#      data: "plot-performance-trending-vpp-2n-clx"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-bidir-avf"
+#      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-bidir-avf"
+#      data: "plot-performance-trending-vpp-2n-clx"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-stl-bidir-avf"
+#      output-file-name: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-stl-bidir-avf"
+#      data: "plot-performance-trending-vpp-2n-clx"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-stl-bidir-avf"
+#      output-file-name: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-stl-bidir-avf"
+#      data: "plot-performance-trending-vpp-2n-clx"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr"
+#      layout: "plot-cpta"
+
     - title: "2n-clx-cx556a-64b-2t1c-rdma-ip4base"
       output-file-name: "2n-clx-cx556a-64b-2t1c-rdma-ip4base"
       data: "plot-performance-trending-vpp-2n-clx"
@@ -6268,19 +6430,78 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-ip4-features-nat44det-avf-ndr"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-features-nat44det-avf-ndr"
+    - title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H1-P63-S63-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p63-s63-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H16384-P63-S1032192-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H262144-P63-S16515072-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H65536-P63-S4128758-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
       layout: "plot-cpta"
 
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
+      layout: "plot-cpta"
+
+#    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr"
+#      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr"
+#      data: "plot-ndrpdr-comparison-2n-clx"
+#      include-tests: "NDR"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr"
+#      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr"
+#      data: "plot-ndrpdr-comparison-2n-clx"
+#      include-tests: "NDR"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr"
+#      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr"
+#      data: "plot-ndrpdr-comparison-2n-clx"
+#      include-tests: "NDR"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+#      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+#      data: "plot-ndrpdr-comparison-2n-clx"
+#      include-tests: "NDR"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#      layout: "plot-cpta"
+
     - title: "2n-clx-xxv710-64b-2t1c-ip4-base-scale-avf-pdr"
       output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-scale-avf-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
@@ -6316,19 +6537,78 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-ip4-features-nat44det-avf-pdr"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-features-nat44det-avf-pdr"
+    - title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H1-P63-S63-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p63-s63-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H16384-P63-S1032192-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H262144-P63-S16515072-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H65536-P63-S4128758-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
       layout: "plot-cpta"
 
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
+      layout: "plot-cpta"
+
+#    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr"
+#      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr"
+#      data: "plot-ndrpdr-comparison-2n-clx"
+#      include-tests: "PDR"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr"
+#      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr"
+#      data: "plot-ndrpdr-comparison-2n-clx"
+#      include-tests: "PDR"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr"
+#      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr"
+#      data: "plot-ndrpdr-comparison-2n-clx"
+#      include-tests: "PDR"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
+#      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
+#      data: "plot-ndrpdr-comparison-2n-clx"
+#      include-tests: "PDR"
+#      include:
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#      layout: "plot-cpta"
+
     - title: "2n-clx-xxv710-64b-2t1c-ip4-base-scale-dpdk-ndr"
       output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-scale-dpdk-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"