Trending: Implement the latest changes in job specs

Graphs:
 - MRR
   - 2n-clx
   - 2n-skx
   - 3n-skx
   - 3n-hsw
   - 3n-tsh
 - NDRPDR
   - 2n-skx
   - 3n-skx
   - 3n-hsw
   - 2n-clx

Change-Id: Ieab26ba1d2ee56e66c5c8598c4dba240a14e53e9
Signed-off-by: Tibor Frank <tifrank@cisco.com>

diff --git a/docs/cpta/index.rst b/docs/cpta/index.rst
index 20685d9..fff9a5c 100644 (file)
--- a/docs/cpta/index.rst
+++ b/docs/cpta/index.rst
@@ -47,9 +47,10 @@ analysis and anomaly detection methodology.
     ndrpdr_trending/ip6
     ndrpdr_trending/srv6
     ndrpdr_trending/ip4_tunnels
-    ndrpdr_trending/ip6_tunnels
     ndrpdr_trending/vhost
     ndrpdr_trending/container_memif
+    ndrpdr_trending/ipsec
+    ndrpdr_trending/vts
 
 .. toctree::
     :maxdepth: 2

diff --git a/docs/cpta/ndrpdr_trending/container_memif-2n-clx-x710.rst b/docs/cpta/ndrpdr_trending/container_memif-2n-clx-cx556a.rst
similarity index 71%
rename from docs/cpta/ndrpdr_trending/container_memif-2n-clx-x710.rst
rename to docs/cpta/ndrpdr_trending/container_memif-2n-clx-cx556a.rst
index 5e1d406..43353c1 100644 (file)
--- a/docs/cpta/ndrpdr_trending/container_memif-2n-clx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/container_memif-2n-clx-cx556a.rst
@@ -1,7 +1,7 @@
-2n-clx-x710
------------
+2n-clx-cx556a
+-------------
 
-64b-memif-base-dpdk
+64b-memif-base-rdma
 ```````````````````
 
 2t1c-ndr
@@ -9,12 +9,12 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-base-rdma-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-x710-64b-2t1c-memif-base-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-rdma-l2-eth-2memif-1dcr-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -23,11 +23,11 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-base-rdma-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-x710-64b-2t1c-memif-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-rdma-l2-eth-2memif-1dcr-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/container_memif-2n-clx-xxv710.rst b/docs/cpta/ndrpdr_trending/container_memif-2n-clx-xxv710.rst
index b138776..8851377 100644 (file)
--- a/docs/cpta/ndrpdr_trending/container_memif-2n-clx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/container_memif-2n-clx-xxv710.rst
@@ -1,6 +1,37 @@
 2n-clx-xxv710
 -------------
 
+64b-memif-base-avf
+``````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-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-memif-base-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-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-memif-base-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
 64b-memif-base-dpdk
 ```````````````````
 

diff --git a/docs/cpta/ndrpdr_trending/container_memif-2n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/container_memif-2n-skx-xxv710.rst
index 0d37436..0aeb221 100644 (file)
--- a/docs/cpta/ndrpdr_trending/container_memif-2n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/container_memif-2n-skx-xxv710.rst
@@ -1,6 +1,37 @@
 2n-skx-xxv710
 -------------
 
+64b-memif-base-avf
+``````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-memif-base-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-memif-base-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
 64b-memif-base-dpdk
 ```````````````````
 

diff --git a/docs/cpta/ndrpdr_trending/container_memif-3n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/container_memif-3n-skx-xxv710.rst
index c9e4afc..82b7922 100644 (file)
--- a/docs/cpta/ndrpdr_trending/container_memif-3n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/container_memif-3n-skx-xxv710.rst
@@ -1,6 +1,37 @@
 3n-skx-xxv710
 -------------
 
+64b-memif-base-avf
+``````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-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-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-memif-base-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-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-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-memif-base-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
 64b-memif-base-dpdk
 ```````````````````
 

diff --git a/docs/cpta/ndrpdr_trending/container_memif.rst b/docs/cpta/ndrpdr_trending/container_memif.rst
index bcdc140..096f02d 100644 (file)
--- a/docs/cpta/ndrpdr_trending/container_memif.rst
+++ b/docs/cpta/ndrpdr_trending/container_memif.rst
@@ -3,12 +3,7 @@ LXC/DRC Container Memif
 
 .. toctree::
 
+    container_memif-2n-clx-xxv710
+    container_memif-2n-clx-cx556a
     container_memif-2n-skx-xxv710
-    container_memif-2n-skx-x710
     container_memif-3n-skx-xxv710
-    container_memif-3n-skx-x710
-    container_memif-2n-clx-xxv710
-    container_memif-2n-clx-x710
-    container_memif-3n-hsw-xl710
-    container_memif-3n-hsw-x710
-    container_memif-3n-hsw-x520

diff --git a/docs/cpta/ndrpdr_trending/l2-3n-hsw-x710.rst b/docs/cpta/ndrpdr_trending/ip4-2n-clx-cx556a.rst
similarity index 60%
rename from docs/cpta/ndrpdr_trending/l2-3n-hsw-x710.rst
rename to docs/cpta/ndrpdr_trending/ip4-2n-clx-cx556a.rst
index be5a1fe..1a0e372 100644 (file)
--- a/docs/cpta/ndrpdr_trending/l2-3n-hsw-x710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4-2n-clx-cx556a.rst
@@ -1,95 +1,95 @@
-3n-hsw-x710
------------
+2n-clx-cx556a
+-------------
 
-64b-l2switching-base-dpdk
-`````````````````````````
+64b-ip4routing-base-rdma
+````````````````````````
 
-1t1c-ndr
+2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-base-rdma-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-l2-base-dpdk-ndr.html"></iframe>
+    <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-cx556a-64b-2t1c-ip4-base-rdma-ndr.html"></iframe>
     <p><br></p>
     </center>
 
-1t1c-pdr
+2t1c-pdr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-base-rdma-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-l2-base-dpdk-pdr.html"></iframe>
+    <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-cx556a-64b-2t1c-ip4-base-rdma-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-l2switching-base-scale-dpdk
-```````````````````````````````
+64b-ip4routing-scale-rdma
+`````````````````````````
 
-1t1c-ndr
+2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-scale-dpdk-ndr"></a>
+    <a name="64b-2t1c-base-rdma-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-l2-base-scale-dpdk-ndr.html"></iframe>
+    <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-cx556a-64b-2t1c-ip4-scale-rdma-ndr.html"></iframe>
     <p><br></p>
     </center>
 
-1t1c-pdr
+2t1c-pdr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-scale-pdr"></a>
+    <a name="64b-2t1c-base-rdma-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-l2-base-scale-dpdk-pdr.html"></iframe>
+    <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-cx556a-64b-2t1c-ip4-scale-rdma-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-l2switching-l2-features-iacl1-dpdk
-``````````````````````````````````````
+64b-ip4routing-features-rdma
+````````````````````````````
 
-1t1c-ndr
+2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-features-iacl1-dpdk-ndr"></a>
+    <a name="64b-2t1c-base-rdma-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-l2-features-iacl1-dpdk-ndr.html"></iframe>
+    <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-cx556a-64b-2t1c-ip4-features-rdma-ndr.html"></iframe>
     <p><br></p>
     </center>
 
-1t1c-pdr
+2t1c-pdr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-features-iacl1-pdr"></a>
+    <a name="64b-2t1c-base-rdma-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-l2-features-iacl1-dpdk-pdr.html"></iframe>
+    <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-cx556a-64b-2t1c-ip4-features-rdma-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/ip4-2n-clx-x710.rst b/docs/cpta/ndrpdr_trending/ip4-2n-clx-x710.rst
index c98fa26..bfb1d8a 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip4-2n-clx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4-2n-clx-x710.rst
@@ -33,65 +33,3 @@
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-ip4-base-avf-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
-
-64b-ip4routing-scale-dpdk
-`````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-scale-dpdk-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-x710-64b-2t1c-ip4-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-scale-dpdk-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-x710-64b-2t1c-ip4-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-dpdk
-````````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk-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-x710-64b-2t1c-ip4-features-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk-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-x710-64b-2t1c-ip4-features-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>

diff --git a/docs/cpta/ndrpdr_trending/ip4-2n-clx-xxv710.rst b/docs/cpta/ndrpdr_trending/ip4-2n-clx-xxv710.rst
index 0e0f9e5..48de927 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip4-2n-clx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4-2n-clx-xxv710.rst
@@ -1,8 +1,8 @@
 2n-clx-xxv710
 -------------
 
-64b-ip4routing-base-avf-dpdk
-````````````````````````````
+64b-ip4routing-base-scale-avf
+`````````````````````````````
 
 2t1c-ndr
 ::::::::
@@ -10,12 +10,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-ndr"></a>
-    <a name="64b-2t1c-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-scale-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-base-avf-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -25,29 +25,92 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-pdr"></a>
-    <a name="64b-2t1c-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-scale-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-base-avf-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-ip4routing-scale-dpdk
-`````````````````````````
+64b-ip4routing-scale-avf-rnd
+````````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
+    <a name="64b-2t1c-scale-avf-rnd-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-scale-avf-rnd-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-scale-avf-rnd-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-scale-avf-rnd-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-ip4routing-features-avf
+```````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-features-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-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-features-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-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-ip4routing-base-scale-dpdk
+``````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-dpdk-ndr"></a>
     <a name="64b-2t1c-scale-dpdk-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-scale-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -56,12 +119,44 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-pdr"></a>
     <a name="64b-2t1c-scale-dpdk-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-scale-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-base-scale-dpdk-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-ip4routing-scale-dpdk-rnd
+`````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-scale-dpdk-rnd-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-scale-dpdk-rnd-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-scale-dpdk-rnd-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-scale-dpdk-rnd-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -78,7 +173,7 @@
     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-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-base-features-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -92,6 +187,6 @@
     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-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-base-features-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/ip4-2n-skx-x710.rst b/docs/cpta/ndrpdr_trending/ip4-2n-skx-x710.rst
index fcc0891..64060fe 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip4-2n-skx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4-2n-skx-x710.rst
@@ -1,8 +1,8 @@
 2n-skx-x710
 -----------
 
-64b-ip4routing-base-avf-dpdk
-````````````````````````````
+64b-ip4routing-base-scale-avf-dpdk
+``````````````````````````````````
 
 2t1c-ndr
 ::::::::
@@ -11,11 +11,13 @@
 
     <a name="64b-2t1c-base-avf-ndr"></a>
     <a name="64b-2t1c-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-scale-avf-ndr"></a>
+    <a name="64b-2t1c-scale-dpdk-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-ip4-base-avf-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-ip4-base-scale-avf-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -26,72 +28,12 @@
 
     <a name="64b-2t1c-base-avf-pdr"></a>
     <a name="64b-2t1c-base-dpdk-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-ip4-base-avf-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-scale-dpdk
-`````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-scale-dpdk-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-ip4-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
+    <a name="64b-2t1c-scale-avf-pdr"></a>
     <a name="64b-2t1c-scale-dpdk-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-ip4-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-dpdk
-````````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-ip4-features-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-ip4-features-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-ip4-base-scale-avf-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/ip4-2n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/ip4-2n-skx-xxv710.rst
index 30e6ae0..dc212bf 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip4-2n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4-2n-skx-xxv710.rst
@@ -1,8 +1,8 @@
 2n-skx-xxv710
 -------------
 
-64b-ip4routing-base-avf-dpdk
-````````````````````````````
+64b-ip4routing-base-avf
+```````````````````````
 
 2t1c-ndr
 ::::::::
@@ -10,12 +10,11 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-ndr"></a>
-    <a name="64b-2t1c-base-dpdk-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-base-avf-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-base-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -25,29 +24,28 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-pdr"></a>
-    <a name="64b-2t1c-base-dpdk-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-base-avf-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-base-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-ip4routing-scale-dpdk
-`````````````````````````
+64b-ip4routing-scale-avf
+````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-scale-dpdk-ndr"></a>
+    <a name="64b-2t1c-scale-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -56,29 +54,61 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-scale-dpdk-pdr"></a>
+    <a name="64b-2t1c-scale-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-scale-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-ip4routing-features-avf
+```````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-features-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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-features-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-features-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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-features-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-ip4routing-features-dpdk
-````````````````````````````
+64b-ip4routing-base-features-dpdk
+`````````````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-ndr"></a>
     <a name="64b-2t1c-features-dpdk-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-features-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-base-features-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -87,11 +117,43 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-pdr"></a>
     <a name="64b-2t1c-features-dpdk-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-features-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-base-features-dpdk-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-ip4routing-scale-dpdk
+`````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-scale-dpdk-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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-scale-dpdk-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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/ip4-3n-hsw-x520.rst b/docs/cpta/ndrpdr_trending/ip4-3n-hsw-x520.rst
deleted file mode 100644 (file)
index fcea2e7..0000000
--- a/docs/cpta/ndrpdr_trending/ip4-3n-hsw-x520.rst
+++ /dev/null
@@ -1,283 +0,0 @@
-3n-hsw-x520
------------
-
-64b-ip4routing-base-features-dpdk
-`````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-ndr"></a>
-    <a name="64b-1t1c-features-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-base-features-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-pdr"></a>
-    <a name="64b-1t1c-features-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-base-features-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-base-scale-dpdk
-``````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-scale-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-base-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-scale-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-base-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-iacl1-dpdk
-``````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl1-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-iacl1-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl1-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-iacl1-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-iacl10-dpdk
-```````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl10-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-iacl10-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl10-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-iacl10-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-iacl50-dpdk
-```````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl50-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-iacl50-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl50-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-iacl50-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-oacl1-dpdk
-``````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl1-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-oacl1-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl1-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-oacl1-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-oacl10-dpdk
-```````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl10-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-oacl10-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl10-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-oacl10-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-oacl50-dpdk
-```````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl50-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-oacl50-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl50-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-oacl50-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-udp-dpdk
-````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-udp-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-udp-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-udp-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-features-udp-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>

diff --git a/docs/cpta/ndrpdr_trending/ip4-3n-hsw-x710.rst b/docs/cpta/ndrpdr_trending/ip4-3n-hsw-x710.rst
deleted file mode 100644 (file)
index 25e29f9..0000000
--- a/docs/cpta/ndrpdr_trending/ip4-3n-hsw-x710.rst
+++ /dev/null
@@ -1,100 +0,0 @@
-3n-hsw-x710
------------
-
-64b-ip4routing-base-features-dpdk
-`````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-ndr"></a>
-    <a name="64b-1t1c-features-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-base-features-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-pdr"></a>
-    <a name="64b-1t1c-features-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-base-features-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-base-scale-dpdk
-``````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-scale-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-base-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-scale-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-base-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-udp-dpdk
-````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-udp-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-features-udp-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-udp-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-features-udp-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-
-

diff --git a/docs/cpta/ndrpdr_trending/ip4-3n-hsw-xl710.rst b/docs/cpta/ndrpdr_trending/ip4-3n-hsw-xl710.rst
index 57e0dd6..b4f4204 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip4-3n-hsw-xl710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4-3n-hsw-xl710.rst
@@ -1,8 +1,8 @@
 3n-hsw-xl710
 ------------
 
-64b-ip4routing-base-dpdk
-````````````````````````
+64b-ip4routing-base-scale-dpdk
+``````````````````````````````
 
 1t1c-ndr
 ::::::::
@@ -10,11 +10,12 @@
 .. raw:: html
 
     <a name="64b-1t1c-base-dpdk-ndr"></a>
+    <a name="64b-1t1c-scale-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4-base-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -24,10 +25,11 @@
 .. raw:: html
 
     <a name="64b-1t1c-base-dpdk-pdr"></a>
+    <a name="64b-1t1c-scale-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/ip4-3n-skx-x710.rst b/docs/cpta/ndrpdr_trending/ip4-3n-skx-x710.rst
index 515c0ec..a60c38b 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip4-3n-skx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4-3n-skx-x710.rst
@@ -1,8 +1,8 @@
 3n-skx-x710
 -----------
 
-64b-ip4routing-base-avf-dpdk
-````````````````````````````
+64b-ip4routing-base-avf
+```````````````````````
 
 2t1c-ndr
 ::::::::
@@ -10,12 +10,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-ndr"></a>
-    <a name="64b-2t1c-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-scale-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-base-avf-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -25,73 +25,11 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-pdr"></a>
-    <a name="64b-2t1c-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-scale-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-base-avf-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-scale-dpdk
-`````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-scale-dpdk-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-scale-dpdk-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-dpdk
-````````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-features-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-features-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/ip4-3n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/ip4-3n-skx-xxv710.rst
index f217925..b0d9611 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip4-3n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4-3n-skx-xxv710.rst
@@ -1,8 +1,8 @@
 3n-skx-xxv710
 -------------
 
-64b-ip4routing-base-avf-dpdk
-````````````````````````````
+64b-ip4routing-base-avf
+```````````````````````
 
 2t1c-ndr
 ::::::::
@@ -10,12 +10,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-ndr"></a>
-    <a name="64b-2t1c-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-scale-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-base-avf-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -25,29 +25,30 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-pdr"></a>
-    <a name="64b-2t1c-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-scale-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-base-avf-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-ip4routing-scale-dpdk
-`````````````````````````
+64b-ip4routing-base-dpdk
+````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-ndr"></a>
     <a name="64b-2t1c-scale-dpdk-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -56,42 +57,12 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-scale-dpdk-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-features-dpdk
-````````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-features-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk-pdr"></a>
+    <a name="64b-2t1c-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-dpdk-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-features-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/ip4.rst b/docs/cpta/ndrpdr_trending/ip4.rst
index c10e627..4ba4dc8 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip4.rst
+++ b/docs/cpta/ndrpdr_trending/ip4.rst
@@ -3,12 +3,11 @@ IPv4 Routing
 
 .. toctree::
 
+    ip4-2n-clx-xxv710
+    ip4-2n-clx-x710
+    ip4-2n-clx-cx556a
     ip4-2n-skx-xxv710
     ip4-2n-skx-x710
     ip4-3n-skx-xxv710
     ip4-3n-skx-x710
-    ip4-2n-clx-xxv710
-    ip4-2n-clx-x710
     ip4-3n-hsw-xl710
-    ip4-3n-hsw-x710
-    ip4-3n-hsw-x520

diff --git a/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-hsw-x710.rst b/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-hsw-x710.rst
deleted file mode 100644 (file)
index aa5866f..0000000
--- a/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-hsw-x710.rst
+++ /dev/null
@@ -1,64 +0,0 @@
-3n-hsw-x710
------------
-
-64b-ip4tunnel-dot1q-base-scale-dpdk
-```````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-dot1q-base-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-tunnels-dot1q-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-dot1q-base-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-tunnels-dot1q-base-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4tunnel-eth-base-scale-dpdk
-`````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-eth-base-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-tunnels-eth-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-eth-base-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-ip4-tunnels-eth-base-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>

diff --git a/docs/cpta/ndrpdr_trending/container_memif-3n-hsw-xl710.rst b/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-hsw-xl710.rst
similarity index 71%
rename from docs/cpta/ndrpdr_trending/container_memif-3n-hsw-xl710.rst
rename to docs/cpta/ndrpdr_trending/ip4_tunnels-3n-hsw-xl710.rst
index a94056c..b5a5b63 100644 (file)
--- a/docs/cpta/ndrpdr_trending/container_memif-3n-hsw-xl710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-hsw-xl710.rst
@@ -1,20 +1,20 @@
 3n-hsw-xl710
 ------------
 
-64b-memif-base-dpdk
-```````````````````
+64b-ip4tunnel-eth-base-dpdk
+```````````````````````````
 
 1t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-base-dpdk-ndr"></a>
+    <a name="64b-1t1c-eth-base-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-memif-base-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -23,11 +23,11 @@
 
 .. raw:: html
 
-    <a name="64b-1t1c-base-dpdk-pdr"></a>
+    <a name="64b-1t1c-eth-base-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-memif-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-skx-x710.rst b/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-skx-xxv710.rst
similarity index 68%
rename from docs/cpta/ndrpdr_trending/ip4_tunnels-3n-skx-x710.rst
rename to docs/cpta/ndrpdr_trending/ip4_tunnels-3n-skx-xxv710.rst
index e4f000f..f4022e0 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-skx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-skx-xxv710.rst
@@ -1,20 +1,20 @@
-3n-skx-x710
------------
+3n-skx-xxv710
+-------------
 
-64b-ip4tunnel-dot1q-base-scale-dpdk
-```````````````````````````````````
+64b-ip4tunnel-base-avf
+``````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-dot1q-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-base-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-tunnels-dot1q-base-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -23,29 +23,29 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-dot1q-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-base-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-tunnels-dot1q-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-ip4tunnel-eth-base-scale-dpdk
-`````````````````````````````````
+64b-ip4tunnel-base-dpdk
+```````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-eth-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-base-dpdk-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-tunnels-eth-base-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,11 +54,11 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-eth-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-base-dpdk-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-tunnels-eth-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/ip4_tunnels.rst b/docs/cpta/ndrpdr_trending/ip4_tunnels.rst
index d847bef..0a644b0 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip4_tunnels.rst
+++ b/docs/cpta/ndrpdr_trending/ip4_tunnels.rst
@@ -3,6 +3,5 @@ IPv4 Tunnels
 
 .. toctree::
 
-    ip4_tunnels-3n-skx-x710
-    ip4_tunnels-3n-hsw-x710
-    ip4_tunnels-3n-hsw-x520
+    ip4_tunnels-3n-skx-xxv710
+    ip4_tunnels-3n-hsw-xl710

diff --git a/docs/cpta/ndrpdr_trending/container_memif-3n-hsw-x520.rst b/docs/cpta/ndrpdr_trending/ip6-2n-clx-cx556a.rst
similarity index 53%
rename from docs/cpta/ndrpdr_trending/container_memif-3n-hsw-x520.rst
rename to docs/cpta/ndrpdr_trending/ip6-2n-clx-cx556a.rst
index 8264e02..941281a 100644 (file)
--- a/docs/cpta/ndrpdr_trending/container_memif-3n-hsw-x520.rst
+++ b/docs/cpta/ndrpdr_trending/ip6-2n-clx-cx556a.rst
@@ -1,33 +1,35 @@
-3n-hsw-x520
------------
+2n-clx-cx556a
+-------------
 
-64b-memif-base-dpdk
-```````````````````
+78b-ip6routing-base-scale-rdma
+``````````````````````````````
 
-1t1c-ndr
+2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-base-dpdk-ndr"></a>
+    <a name="78b-2t1c-base-rdma-ndr"></a>
+    <a name="78b-2t1c-scale-rdma-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-memif-base-dpdk-ndr.html"></iframe>
+    <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-x710-78b-2t1c-ip6-base-scale-rdma-ndr.html"></iframe>
     <p><br></p>
     </center>
 
-1t1c-pdr
+2t1c-pdr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-base-dpdk-pdr"></a>
+    <a name="78b-2t1c-base-rdma-pdr"></a>
+    <a name="78b-2t1c-scale-rdma-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-memif-base-dpdk-pdr.html"></iframe>
+    <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-x710-78b-2t1c-ip6-base-scale-rdma-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/ip6-2n-clx-x710.rst b/docs/cpta/ndrpdr_trending/ip6-2n-clx-x710.rst
index a2177d5..16d96b5 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip6-2n-clx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/ip6-2n-clx-x710.rst
@@ -1,53 +1,23 @@
 2n-clx-x710
 -----------
 
-78b-ip6routing-base-features-dpdk
-`````````````````````````````````
+78b-ip6routing-base-scale-avf-dpdk
+``````````````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
+    <a name="78b-2t1c-base-avf-ndr"></a>
+    <a name="78b-2t1c-scale-avf-ndr"></a>
     <a name="78b-2t1c-base-dpdk-ndr"></a>
-    <a name="78b-2t1c-features-dpdk-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-x710-78b-2t1c-ip6-base-features-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-2t1c-base-dpdk-pdr"></a>
-    <a name="78b-2t1c-features-dpdk-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-x710-78b-2t1c-ip6-base-features-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-78b-ip6routing-base-scale-dpdk
-``````````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
     <a name="78b-2t1c-scale-dpdk-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-x710-78b-2t1c-ip6-base-scale-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -56,11 +26,14 @@
 
 .. raw:: html
 
+    <a name="78b-2t1c-base-avf-pdr"></a>
+    <a name="78b-2t1c-scale-avf-pdr"></a>
+    <a name="78b-2t1c-base-dpdk-pdr"></a>
     <a name="78b-2t1c-scale-dpdk-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-x710-78b-2t1c-ip6-base-scale-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/ip6-2n-clx-xxv710.rst b/docs/cpta/ndrpdr_trending/ip6-2n-clx-xxv710.rst
index b0915df..b11d859 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip6-2n-clx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/ip6-2n-clx-xxv710.rst
@@ -1,6 +1,39 @@
 2n-clx-xxv710
 -------------
 
+78b-ip6routing-base-scale-avf
+`````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="78b-2t1c-base-avf-ndr"></a>
+    <a name="78b-2t1c-scale-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-78b-2t1c-ip6-base-scale-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="78b-2t1c-base-avf-pdr"></a>
+    <a name="78b-2t1c-scale-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-78b-2t1c-ip6-base-scale-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
 78b-ip6routing-base-scale-dpdk
 ``````````````````````````````
 

diff --git a/docs/cpta/ndrpdr_trending/ip6-2n-skx-x710.rst b/docs/cpta/ndrpdr_trending/ip6-2n-skx-x710.rst
index 3c2a826..074109f 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip6-2n-skx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/ip6-2n-skx-x710.rst
@@ -1,16 +1,18 @@
 2n-skx-x710
 -----------
 
-78b-ip6routing-base-features-dpdk
-`````````````````````````````````
+78b-ip6routing-base-scale-avf-dpdk
+``````````````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
+    <a name="78b-2t1c-base-avf-ndr"></a>
+    <a name="78b-2t1c-scale-avf-ndr"></a>
     <a name="78b-2t1c-base-dpdk-ndr"></a>
-    <a name="78b-2t1c-features-dpdk-ndr"></a>
+    <a name="78b-2t1c-scale-dpdk-ndr"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
@@ -24,43 +26,14 @@
 
 .. raw:: html
 
+    <a name="78b-2t1c-base-avf-pdr"></a>
+    <a name="78b-2t1c-scale-avf-pdr"></a>
     <a name="78b-2t1c-base-dpdk-pdr"></a>
-    <a name="78b-2t1c-features-dpdk-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-78b-2t1c-ip6-base-features-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-78b-ip6routing-base-scale-dpdk
-``````````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-2t1c-scale-dpdk-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
     <a name="78b-2t1c-scale-dpdk-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-78b-2t1c-ip6-base-features-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/ip6-2n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/ip6-2n-skx-xxv710.rst
index b579779..68a6a20 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip6-2n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/ip6-2n-skx-xxv710.rst
@@ -1,6 +1,39 @@
 2n-skx-xxv710
 -------------
 
+78b-ip6routing-base-scale-avf
+`````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="78b-2t1c-base-avf-ndr"></a>
+    <a name="78b-2t1c-scale-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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="78b-2t1c-base-avf-pdr"></a>
+    <a name="78b-2t1c-scale-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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
 78b-ip6routing-base-scale-dpdk
 ``````````````````````````````
 

diff --git a/docs/cpta/ndrpdr_trending/ip6-3n-hsw-x520.rst b/docs/cpta/ndrpdr_trending/ip6-3n-hsw-x520.rst
deleted file mode 100644 (file)
index 2aa172e..0000000
--- a/docs/cpta/ndrpdr_trending/ip6-3n-hsw-x520.rst
+++ /dev/null
@@ -1,66 +0,0 @@
-3n-hsw-x520
------------
-
-78b-ip6routing-base-features-dpdk
-`````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-base-dpdk-ndr"></a>
-    <a name="78b-1t1c-features-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-78b-1t1c-ip6-base-features-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-base-dpdk-pdr"></a>
-    <a name="78b-1t1c-features-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-78b-1t1c-ip6-base-features-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-78b-ip6routing-base-scale-dpdk
-``````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-scale-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-78b-1t1c-ip6-base-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-scale-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-78b-1t1c-ip6-base-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>

diff --git a/docs/cpta/ndrpdr_trending/ip6-3n-hsw-x710.rst b/docs/cpta/ndrpdr_trending/ip6-3n-hsw-x710.rst
deleted file mode 100644 (file)
index 466f607..0000000
--- a/docs/cpta/ndrpdr_trending/ip6-3n-hsw-x710.rst
+++ /dev/null
@@ -1,66 +0,0 @@
-3n-hsw-x710
------------
-
-78b-ip6routing-base-features-dpdk
-`````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-base-dpdk-ndr"></a>
-    <a name="78b-1t1c-features-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-78b-1t1c-ip6-base-features-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-base-dpdk-pdr"></a>
-    <a name="78b-1t1c-features-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-78b-1t1c-ip6-base-features-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-78b-ip6routing-base-scale-dpdk
-``````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-scale-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-78b-1t1c-ip6-base-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-scale-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-78b-1t1c-ip6-base-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>

diff --git a/docs/cpta/ndrpdr_trending/ip6-3n-hsw-xl710.rst b/docs/cpta/ndrpdr_trending/ip6-3n-hsw-xl710.rst
index 754ee7d..f4dc91b 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip6-3n-hsw-xl710.rst
+++ b/docs/cpta/ndrpdr_trending/ip6-3n-hsw-xl710.rst
@@ -1,8 +1,8 @@
 3n-hsw-xl710
 ------------
 
-78b-ip6routing-base-dpdk
-````````````````````````
+78b-ip6routing-base-scale-dpdk
+``````````````````````````````
 
 1t1c-ndr
 ::::::::
@@ -10,11 +10,12 @@
 .. raw:: html
 
     <a name="78b-1t1c-base-dpdk-ndr"></a>
+    <a name="78b-1t1c-scale-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-78b-1t1c-ip6-base-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -24,10 +25,11 @@
 .. raw:: html
 
     <a name="78b-1t1c-base-dpdk-pdr"></a>
+    <a name="78b-1t1c-scale-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-78b-1t1c-ip6-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/ip6-3n-skx-x710.rst b/docs/cpta/ndrpdr_trending/ip6-3n-skx-x710.rst
index 75ce02a..6ef374c 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip6-3n-skx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/ip6-3n-skx-x710.rst
@@ -1,21 +1,21 @@
 3n-skx-x710
 -----------
 
-78b-ip6routing-base-features-dpdk
-`````````````````````````````````
+78b-ip6routing-base-scale-avf
+`````````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="78b-2t1c-base-dpdk-ndr"></a>
-    <a name="78b-2t1c-features-dpdk-ndr"></a>
+    <a name="78b-2t1c-base-avf-ndr"></a>
+    <a name="78b-2t1c-scale-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-2t1c-ip6-base-features-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-2t1c-ip6-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -24,43 +24,12 @@
 
 .. raw:: html
 
-    <a name="78b-2t1c-base-dpdk-pdr"></a>
-    <a name="78b-2t1c-features-dpdk-pdr"></a>
+    <a name="78b-2t1c-base-avf-pdr"></a>
+    <a name="78b-2t1c-scale-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-2t1c-ip6-base-features-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-78b-ip6routing-base-scale-dpdk
-``````````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-2t1c-scale-dpdk-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-2t1c-scale-dpdk-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-2t1c-ip6-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/ip6-3n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/ip6-3n-skx-xxv710.rst
index 64d1312..0e2499c 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip6-3n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/ip6-3n-skx-xxv710.rst
@@ -1,6 +1,39 @@
 3n-skx-xxv710
 -------------
 
+78b-ip6routing-base-scale-avf
+`````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="78b-2t1c-base-avf-ndr"></a>
+    <a name="78b-2t1c-scale-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-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="78b-2t1c-base-avf-pdr"></a>
+    <a name="78b-2t1c-scale-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-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
 78b-ip6routing-base-scale-dpdk
 ``````````````````````````````
 

diff --git a/docs/cpta/ndrpdr_trending/ip6.rst b/docs/cpta/ndrpdr_trending/ip6.rst
index be519df..95cf931 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip6.rst
+++ b/docs/cpta/ndrpdr_trending/ip6.rst
@@ -3,12 +3,10 @@ IPv6 Routing
 
 .. toctree::
 
+    ip6-2n-clx-xxv710
+    ip6-2n-clx-x710
+    ip6-2n-clx-cx556a
     ip6-2n-skx-xxv710
     ip6-2n-skx-x710
     ip6-3n-skx-xxv710
-    ip6-3n-skx-x710
     ip6-3n-hsw-xl710
-    ip6-3n-hsw-x710
-    ip6-3n-hsw-x520
-    ip6-2n-clx-xxv710
-    ip6-2n-clx-x710

diff --git a/docs/cpta/ndrpdr_trending/ip6_tunnels-3n-hsw-x520.rst b/docs/cpta/ndrpdr_trending/ip6_tunnels-3n-hsw-x520.rst
deleted file mode 100644 (file)
index 685f03f..0000000
--- a/docs/cpta/ndrpdr_trending/ip6_tunnels-3n-hsw-x520.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-3n-hsw-x520
------------
-
-78b-ip6tunnel-eth-base-dpdk
-```````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-eth-base-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-78b-1t1c-ip6-tunnels-eth-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="78b-1t1c-eth-base-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-78b-1t1c-ip6-tunnels-eth-base-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>

diff --git a/docs/cpta/ndrpdr_trending/ip6_tunnels.rst b/docs/cpta/ndrpdr_trending/ip6_tunnels.rst
deleted file mode 100644 (file)
index d7ef850..0000000
--- a/docs/cpta/ndrpdr_trending/ip6_tunnels.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-IPv6 Tunnels
-============
-
-.. toctree::
-
-    ip6_tunnels-3n-hsw-x520

diff --git a/docs/cpta/ndrpdr_trending/ipsec-3n-hsw-xl710.rst b/docs/cpta/ndrpdr_trending/ipsec-3n-hsw-xl710.rst
new file mode 100644 (file)
index 0000000..555cf66
--- /dev/null
+++ b/docs/cpta/ndrpdr_trending/ipsec-3n-hsw-xl710.rst
@@ -0,0 +1,68 @@
+3n-hsw-xl710
+------------
+
+imix-ipsec-ip4routing-base-scale-sw-dpdk
+````````````````````````````````````````
+
+1t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="imix-1t1c-base-sw-dpdk-ndr"></a>
+    <a name="imix-1t1c-scale-sw-dpdk-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-mrr-daily-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-base-scale-sw-dpdk-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+1t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="imix-1t1c-base-sw-dpdk-pdr"></a>
+    <a name="imix-1t1c-scale-sw-dpdk-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-mrr-daily-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-base-scale-sw-dpdk-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+imix-ipsec-ip4routing-base-scale-hw-dpdk
+````````````````````````````````````````
+
+1t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="imix-1t1c-base-hw-dpdk-ndr"></a>
+    <a name="imix-1t1c-scale-hw-dpdk-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-mrr-daily-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-base-scale-hw-dpdk-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+1t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="imix-1t1c-base-hw-dpdk-pdr"></a>
+    <a name="imix-1t1c-scale-hw-dpdk-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-mrr-daily-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-base-scale-hw-dpdk-pdr.html"></iframe>
+    <p><br></p>
+    </center>

diff --git a/docs/cpta/ndrpdr_trending/ipsec-3n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/ipsec-3n-skx-xxv710.rst
new file mode 100644 (file)
index 0000000..8c13b3a
--- /dev/null
+++ b/docs/cpta/ndrpdr_trending/ipsec-3n-skx-xxv710.rst
@@ -0,0 +1,134 @@
+3n-skx-xxv710
+-------------
+
+imix-ipsec-ip4routing-base-scale-sw-avf
+```````````````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="imix-2t1c-base-sw-avf-ndr"></a>
+    <a name="imix-2t1c-scale-sw-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-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="imix-2t1c-base-sw-avf-pdr"></a>
+    <a name="imix-2t1c-scale-sw-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-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+imix-ipsec-ip4routing-base-scale-sw-dpdk
+````````````````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="imix-2t1c-base-sw-dpdk-ndr"></a>
+    <a name="imix-2t1c-scale-sw-dpdk-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-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-dpdk-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="imix-2t1c-base-sw-dpdk-pdr"></a>
+    <a name="imix-2t1c-scale-sw-dpdk-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-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-dpdk-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+1518b-ipsec-ip4routing-base-scale-sw-avf
+````````````````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="1518b-2t1c-base-sw-avf-ndr"></a>
+    <a name="1518b-2t1c-scale-sw-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-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="1518b-2t1c-base-sw-avf-pdr"></a>
+    <a name="1518b-2t1c-scale-sw-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-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+1518b-ipsec-ip4routing-base-scale-sw-dpdk
+`````````````````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="1518b-2t1c-base-sw-dpdk-ndr"></a>
+    <a name="1518b-2t1c-scale-sw-dpdk-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-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-dpdk-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="1518b-2t1c-base-sw-dpdk-pdr"></a>
+    <a name="1518b-2t1c-scale-sw-dpdk-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-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-dpdk-pdr.html"></iframe>
+    <p><br></p>
+    </center>

diff --git a/docs/cpta/ndrpdr_trending/ipsec.rst b/docs/cpta/ndrpdr_trending/ipsec.rst
new file mode 100644 (file)
index 0000000..31328af
--- /dev/null
+++ b/docs/cpta/ndrpdr_trending/ipsec.rst
@@ -0,0 +1,7 @@
+IPSec IPv4 Routing
+==================
+
+.. toctree::
+
+    ipsec-3n-skx-xxv710
+    ipsec-3n-hsw-xl710

diff --git a/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-hsw-x520.rst b/docs/cpta/ndrpdr_trending/l2-2n-clx-cx556a.rst
similarity index 57%
rename from docs/cpta/ndrpdr_trending/ip4_tunnels-3n-hsw-x520.rst
rename to docs/cpta/ndrpdr_trending/l2-2n-clx-cx556a.rst
index ddb8208..d5242e6 100644 (file)
--- a/docs/cpta/ndrpdr_trending/ip4_tunnels-3n-hsw-x520.rst
+++ b/docs/cpta/ndrpdr_trending/l2-2n-clx-cx556a.rst
@@ -1,64 +1,64 @@
-3n-hsw-x520
------------
+2n-clx-cx556a
+-------------
 
-64b-ip4tunnel-dot1q-base-scale-dpdk
-```````````````````````````````````
+64b-l2switching-base-rdma
+`````````````````````````
 
-1t1c-ndr
+2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-dot1q-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-base-rdma-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-tunnels-dot1q-base-dpdk-ndr.html"></iframe>
+    <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-cx556a-64b-2t1c-l2-base-rdma-ndr.html"></iframe>
     <p><br></p>
     </center>
 
-1t1c-pdr
+2t1c-pdr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-dot1q-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-base-rdma-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-tunnels-dot1q-base-dpdk-pdr.html"></iframe>
+    <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-cx556a-64b-2t1c-l2-base-rdma-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-ip4tunnel-eth-base-scale-dpdk
-`````````````````````````````````
+64b-l2switching-base-scale-rdma
+```````````````````````````````
 
-1t1c-ndr
+2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-eth-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-scale-rdma-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-tunnels-eth-base-dpdk-ndr.html"></iframe>
+    <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-cx556a-64b-2t1c-l2-base-scale-rdma-ndr.html"></iframe>
     <p><br></p>
     </center>
 
-1t1c-pdr
+2t1c-pdr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-eth-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-scale-rdma-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-ip4-tunnels-eth-base-dpdk-pdr.html"></iframe>
+    <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-cx556a-64b-2t1c-l2-base-scale-rdma-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/l2-2n-clx-x710.rst b/docs/cpta/ndrpdr_trending/l2-2n-clx-x710.rst
index 5c72f51..a6a6fe4 100644 (file)
--- a/docs/cpta/ndrpdr_trending/l2-2n-clx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/l2-2n-clx-x710.rst
@@ -1,8 +1,8 @@
 2n-clx-x710
 -----------
 
-64b-l2switching-base-avf
-````````````````````````
+64b-l2switching-base-scale-avf-dpdk
+```````````````````````````````````
 
 2t1c-ndr
 ::::::::
@@ -10,73 +10,14 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-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-x710-64b-2t1c-l2-base-avf-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-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-x710-64b-2t1c-l2-base-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-base-dpdk
-`````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
+    <a name="64b-2t1c-scale-avf-ndr"></a>
     <a name="64b-2t1c-base-dpdk-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-x710-64b-2t1c-l2-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk-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-x710-64b-2t1c-l2-base-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-base-scale-dpdk
-```````````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
     <a name="64b-2t1c-scale-dpdk-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-x710-64b-2t1c-l2-base-scale-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-l2-base-scale-avf-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -85,11 +26,14 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-avf-pdr"></a>
+    <a name="64b-2t1c-scale-avf-pdr"></a>
+    <a name="64b-2t1c-base-dpdk-pdr"></a>
     <a name="64b-2t1c-scale-dpdk-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-x710-64b-2t1c-l2-base-scale-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-2t1c-l2-base-scale-avf-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/l2-2n-clx-xxv710.rst b/docs/cpta/ndrpdr_trending/l2-2n-clx-xxv710.rst
index 8c78418..cce010d 100644 (file)
--- a/docs/cpta/ndrpdr_trending/l2-2n-clx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/l2-2n-clx-xxv710.rst
@@ -32,20 +32,20 @@
     <p><br></p>
     </center>
 
-64b-l2switching-base-dpdk
-`````````````````````````
+64b-l2switching-base-scale-avf
+```````````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-scale-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-l2-base-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-l2-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,12 +54,12 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-scale-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-l2-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-l2-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -71,6 +71,7 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-ndr"></a>
     <a name="64b-2t1c-scale-dpdk-ndr"></a>
     <center>
     Links to builds:
@@ -85,6 +86,7 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-pdr"></a>
     <a name="64b-2t1c-scale-dpdk-pdr"></a>
     <center>
     Links to builds:

diff --git a/docs/cpta/ndrpdr_trending/l2-2n-skx-x710.rst b/docs/cpta/ndrpdr_trending/l2-2n-skx-x710.rst
index ad34eeb..a126ba8 100644 (file)
--- a/docs/cpta/ndrpdr_trending/l2-2n-skx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/l2-2n-skx-x710.rst
@@ -1,8 +1,8 @@
 2n-skx-x710
 -----------
 
-64b-l2switching-base-avf
-````````````````````````
+64b-l2switching-base-scale-avf
+``````````````````````````````
 
 2t1c-ndr
 ::::::::
@@ -10,11 +10,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-ndr"></a>
+    <a name="64b-2t1c-scale-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-avf-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -24,42 +25,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-pdr"></a>
+    <a name="64b-2t1c-scale-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-base-dpdk
-`````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -71,6 +42,7 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-ndr"></a>
     <a name="64b-2t1c-scale-dpdk-ndr"></a>
     <center>
     Links to builds:
@@ -85,6 +57,7 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-pdr"></a>
     <a name="64b-2t1c-scale-dpdk-pdr"></a>
     <center>
     Links to builds:

diff --git a/docs/cpta/ndrpdr_trending/l2-2n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/l2-2n-skx-xxv710.rst
index bb50da9..9ffa7d6 100644 (file)
--- a/docs/cpta/ndrpdr_trending/l2-2n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/l2-2n-skx-xxv710.rst
@@ -63,6 +63,37 @@
     <p><br></p>
     </center>
 
+64b-l2switching-base-scale-avf
+``````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-scale-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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-l2-base-scale-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-scale-dpdk-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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-l2-base-scale-avf-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
 64b-l2switching-base-scale-dpdk
 ```````````````````````````````
 

diff --git a/docs/cpta/ndrpdr_trending/l2-3n-hsw-vic1227.rst b/docs/cpta/ndrpdr_trending/l2-3n-hsw-vic1227.rst
deleted file mode 100644 (file)
index c8853b7..0000000
--- a/docs/cpta/ndrpdr_trending/l2-3n-hsw-vic1227.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-3n-hsw-vic1227
---------------
-
-64b-l2switching-base-dpdk
-`````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-vic1227-64b-1t1c-l2-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-vic1227-64b-1t1c-l2-base-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>

diff --git a/docs/cpta/ndrpdr_trending/l2-3n-hsw-vic1385.rst b/docs/cpta/ndrpdr_trending/l2-3n-hsw-vic1385.rst
deleted file mode 100644 (file)
index 7f204d5..0000000
--- a/docs/cpta/ndrpdr_trending/l2-3n-hsw-vic1385.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-3n-hsw-vic1385
---------------
-
-64b-l2switching-base-dpdk
-`````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-vic1385-64b-1t1c-l2-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-vic1385-64b-1t1c-l2-base-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>

diff --git a/docs/cpta/ndrpdr_trending/l2-3n-hsw-x520.rst b/docs/cpta/ndrpdr_trending/l2-3n-hsw-x520.rst
deleted file mode 100644 (file)
index e174180..0000000
--- a/docs/cpta/ndrpdr_trending/l2-3n-hsw-x520.rst
+++ /dev/null
@@ -1,343 +0,0 @@
-3n-hsw-x520
------------
-
-64b-l2switching-base-dpdk
-`````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-base-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-base-scale-dpdk
-```````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-scale-dpdk-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-base-scale-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-scale-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-base-scale-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-l2-features-iacl1-dpdk
-``````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl1-dpdk-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-iacl1-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl1-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-iacl1-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-l2-features-iacl10-dpdk
-```````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl10-dpdk-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-iacl10-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl10-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-iacl10-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-l2-features-iacl50-dpdk
-```````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl50-dpdk-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-iacl50-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-iacl50-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-iacl50-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-l2-features-oacl1-dpdk
-``````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl1-dpdk-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-oacl1-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl1-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-oacl1-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-l2-features-oacl10-dpdk
-```````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl10-dpdk-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-oacl10-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl10-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-oacl10-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-l2-features-oacl50-dpdk
-```````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl50-dpdk-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-oacl50-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-oacl50-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-oacl50-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-l2-features-macip-iacl1-dpdk
-````````````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-macip-iacl1-dpdk-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-macip-iacl1-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-macip-iacl1-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-macip-iacl1-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-l2-features-macip-iacl10-dpdk
-`````````````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-macip-iacl10-dpdk-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-macip-iacl10-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-macip-iacl10-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-macip-iacl10-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-l2-features-macip-iacl50-dpdk
-`````````````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-macip-iacl50-dpdk-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-macip-iacl50-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-features-macip-iacl50-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-l2-features-macip-iacl50-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>

diff --git a/docs/cpta/ndrpdr_trending/l2-3n-hsw-xl710.rst b/docs/cpta/ndrpdr_trending/l2-3n-hsw-xl710.rst
index 2451bc7..e412903 100644 (file)
--- a/docs/cpta/ndrpdr_trending/l2-3n-hsw-xl710.rst
+++ b/docs/cpta/ndrpdr_trending/l2-3n-hsw-xl710.rst
@@ -1,8 +1,8 @@
 3n-hsw-xl710
 ------------
 
-64b-l2switching-base-dpdk
-`````````````````````````
+64b-l2switching-base-scale-dpdk
+```````````````````````````````
 
 1t1c-ndr
 ::::::::
@@ -10,11 +10,12 @@
 .. raw:: html
 
     <a name="64b-1t1c-base-dpdk-ndr"></a>
+    <a name="64b-1t1c-scale-dpdk-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-l2-base-dpdk-ndr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-l2-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -24,10 +25,11 @@
 .. raw:: html
 
     <a name="64b-1t1c-base-dpdk-pdr"></a>
+    <a name="64b-1t1c-scale-dpdk-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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-l2-base-dpdk-pdr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-64b-1t1c-l2-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/l2-3n-skx-x710.rst b/docs/cpta/ndrpdr_trending/l2-3n-skx-x710.rst
index 229eee7..e352701 100644 (file)
--- a/docs/cpta/ndrpdr_trending/l2-3n-skx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/l2-3n-skx-x710.rst
@@ -1,8 +1,8 @@
 3n-skx-x710
 -----------
 
-64b-l2switching-base-avf
-````````````````````````
+64b-l2switching-base-scale-avf
+``````````````````````````````
 
 2t1c-ndr
 ::::::::
@@ -10,11 +10,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-ndr"></a>
+    <a name="64b-2t1c-scale-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-l2-base-avf-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-l2-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -24,42 +25,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf-pdr"></a>
+    <a name="64b-2t1c-scale-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-l2-base-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-l2switching-base-dpdk
-`````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-l2-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-l2-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-l2-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -71,6 +42,7 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-ndr"></a>
     <a name="64b-2t1c-scale-dpdk-ndr"></a>
     <center>
     Links to builds:
@@ -85,6 +57,7 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-pdr"></a>
     <a name="64b-2t1c-scale-dpdk-pdr"></a>
     <center>
     Links to builds:

diff --git a/docs/cpta/ndrpdr_trending/l2-3n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/l2-3n-skx-xxv710.rst
index 3c175f5..9e91767 100644 (file)
--- a/docs/cpta/ndrpdr_trending/l2-3n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/l2-3n-skx-xxv710.rst
@@ -32,7 +32,7 @@
     <p><br></p>
     </center>
 
-64b-l2switching-base-dpdk
+64b-l2switching-scale-avf
 `````````````````````````
 
 2t1c-ndr
@@ -40,12 +40,12 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-ndr"></a>
+    <a name="64b-2t1c-scale-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-l2-base-dpdk-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-l2-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,12 +54,12 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-pdr"></a>
+    <a name="64b-2t1c-scale-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-l2-base-dpdk-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-l2-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -71,6 +71,7 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-ndr"></a>
     <a name="64b-2t1c-scale-dpdk-ndr"></a>
     <center>
     Links to builds:
@@ -85,6 +86,7 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-dpdk-pdr"></a>
     <a name="64b-2t1c-scale-dpdk-pdr"></a>
     <center>
     Links to builds:

diff --git a/docs/cpta/ndrpdr_trending/l2.rst b/docs/cpta/ndrpdr_trending/l2.rst
index d2c0e05..3b67542 100644 (file)
--- a/docs/cpta/ndrpdr_trending/l2.rst
+++ b/docs/cpta/ndrpdr_trending/l2.rst
@@ -3,14 +3,11 @@ L2 Ethernet Switching
 
 .. toctree::
 
+    l2-2n-clx-xxv710
+    l2-2n-clx-x710
+    l2-2n-clx-cx556a
     l2-2n-skx-xxv710
     l2-2n-skx-x710
     l2-3n-skx-xxv710
     l2-3n-skx-x710
     l2-3n-hsw-xl710
-    l2-3n-hsw-x710
-    l2-3n-hsw-x520
-    l2-3n-hsw-vic1227
-    l2-3n-hsw-vic1385
-    l2-2n-clx-xxv710
-    l2-2n-clx-x710

diff --git a/docs/cpta/ndrpdr_trending/srv6-3n-hsw-x520.rst b/docs/cpta/ndrpdr_trending/srv6-3n-hsw-xl710.rst
similarity index 73%
rename from docs/cpta/ndrpdr_trending/srv6-3n-hsw-x520.rst
rename to docs/cpta/ndrpdr_trending/srv6-3n-hsw-xl710.rst
index 7899b1c..e3c8528 100644 (file)
--- a/docs/cpta/ndrpdr_trending/srv6-3n-hsw-x520.rst
+++ b/docs/cpta/ndrpdr_trending/srv6-3n-hsw-xl710.rst
@@ -1,5 +1,5 @@
-3n-hsw-x520
------------
+3n-hsw-xl710
+------------
 
 78b-srv6-ip6routing-base-dpdk
 `````````````````````````````
@@ -13,8 +13,8 @@
     <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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-srv6-base-dpdk-ndr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-78b-1t1c-srv6-base-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -27,7 +27,7 @@
     <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" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-srv6-base-dpdk-pdr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-78b-1t1c-srv6-base-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/container_memif-3n-hsw-x710.rst b/docs/cpta/ndrpdr_trending/srv6-3n-skx-xxv710.rst
similarity index 51%
rename from docs/cpta/ndrpdr_trending/container_memif-3n-hsw-x710.rst
rename to docs/cpta/ndrpdr_trending/srv6-3n-skx-xxv710.rst
index d2aad2e..53ad259 100644 (file)
--- a/docs/cpta/ndrpdr_trending/container_memif-3n-hsw-x710.rst
+++ b/docs/cpta/ndrpdr_trending/srv6-3n-skx-xxv710.rst
@@ -1,33 +1,33 @@
-3n-hsw-x710
------------
+3n-skx-xxv710
+-------------
 
-64b-memif-base-dpdk
-```````````````````
+78b-srv6-ip6routing-base-avf
+````````````````````````````
 
-1t1c-ndr
+2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-base-dpdk-ndr"></a>
+    <a name="78b-1t1c-base-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-memif-base-dpdk-ndr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-2t1c-srv6-base-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
-1t1c-pdr
+2t1c-pdr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-1t1c-base-dpdk-pdr"></a>
+    <a name="78b-1t1c-base-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-memif-base-dpdk-pdr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-2t1c-srv6-base-avf-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/srv6.rst b/docs/cpta/ndrpdr_trending/srv6.rst
index f317449..3bfb4b5 100644 (file)
--- a/docs/cpta/ndrpdr_trending/srv6.rst
+++ b/docs/cpta/ndrpdr_trending/srv6.rst
@@ -3,4 +3,5 @@ SRv6 Routing
 
 .. toctree::
 
-    srv6-3n-hsw-x520
+    srv6-3n-skx-xxv710
+    srv6-3n-hsw-xl710

diff --git a/docs/cpta/ndrpdr_trending/vhost-2n-clx-x710.rst b/docs/cpta/ndrpdr_trending/vhost-2n-clx-cx556a.rst
similarity index 72%
rename from docs/cpta/ndrpdr_trending/vhost-2n-clx-x710.rst
rename to docs/cpta/ndrpdr_trending/vhost-2n-clx-cx556a.rst
index fbf679f..8127d69 100644 (file)
--- a/docs/cpta/ndrpdr_trending/vhost-2n-clx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/vhost-2n-clx-cx556a.rst
@@ -1,7 +1,7 @@
-2n-clx-x710
------------
+2n-clx-cx556a
+-------------
 
-64b-vhost-base-dpdk-testpmd
+64b-vhost-base-rdma-testpmd
 ```````````````````````````
 
 2t1c-ndr
@@ -9,12 +9,12 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-testpmd-ndr"></a>
+    <a name="64b-2t1c-base-rdma-testpmd-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-x710-64b-2t1c-vhost-base-dpdk-testpmd-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-vhost-base-rdma-testpmd-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -23,16 +23,16 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-testpmd-pdr"></a>
+    <a name="64b-2t1c-base-rdma-testpmd-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-x710-64b-2t1c-vhost-base-dpdk-testpmd-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-vhost-base-rdma-testpmd-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-vhost-base-dpdk-vpp
+64b-vhost-base-rdma-vpp
 ```````````````````````
 
 2t1c-ndr
@@ -40,12 +40,12 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-vpp-ndr"></a>
+    <a name="64b-2t1c-base-rdma-vpp-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-x710-64b-2t1c-vhost-base-dpdk-vpp-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-vhost-base-rdma-vpp-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,11 +54,11 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-vpp-pdr"></a>
+    <a name="64b-2t1c-base-rdma-vpp-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-x710-64b-2t1c-vhost-base-dpdk-vpp-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-64b-2t1c-vhost-base-rdma-vpp-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/vhost-2n-clx-xxv710.rst b/docs/cpta/ndrpdr_trending/vhost-2n-clx-xxv710.rst
index 4fcbac4..bdaa714 100644 (file)
--- a/docs/cpta/ndrpdr_trending/vhost-2n-clx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/vhost-2n-clx-xxv710.rst
@@ -1,20 +1,21 @@
 2n-clx-xxv710
 -------------
 
-64b-vhost-base-dpdk-testpmd
-```````````````````````````
+64b-vhost-base-avf-dpdk-testpmd
+```````````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-avf-testpmd-ndr"></a>
     <a name="64b-2t1c-base-dpdk-testpmd-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-vhost-base-dpdk-testpmd-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-testpmd-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -23,29 +24,31 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-avf-testpmd-pdr"></a>
     <a name="64b-2t1c-base-dpdk-testpmd-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-vhost-base-dpdk-testpmd-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-testpmd-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-vhost-base-dpdk-vpp
-```````````````````````
+64b-vhost-base-avf-dpdk-vpp
+```````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-avf-vpp-ndr"></a>
     <a name="64b-2t1c-base-dpdk-vpp-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-vhost-base-dpdk-vpp-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-vpp-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,11 +57,12 @@
 
 .. raw:: html
 
+    <a name="64b-2t1c-base-avf-vpp-pdr"></a>
     <a name="64b-2t1c-base-dpdk-vpp-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-vhost-base-dpdk-vpp-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-vpp-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/vhost-2n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/vhost-2n-skx-xxv710.rst
index ed78cb3..a109c4e 100644 (file)
--- a/docs/cpta/ndrpdr_trending/vhost-2n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/vhost-2n-skx-xxv710.rst
@@ -1,6 +1,68 @@
 2n-skx-xxv710
 -------------
 
+64b-vhost-base-avf-testpmd
+``````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-testpmd-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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-testpmd-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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-vhost-base-avf-vpp
+``````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-vpp-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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-vpp-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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
 64b-vhost-base-dpdk-testpmd
 ```````````````````````````
 

diff --git a/docs/cpta/ndrpdr_trending/vhost-3n-hsw-x520.rst b/docs/cpta/ndrpdr_trending/vhost-3n-hsw-x520.rst
deleted file mode 100644 (file)
index 4a2a33a..0000000
--- a/docs/cpta/ndrpdr_trending/vhost-3n-hsw-x520.rst
+++ /dev/null
@@ -1,126 +0,0 @@
-3n-hsw-x520
------------
-
-64b-link-bonding-vhost-base-dpdk-testpmd
-````````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-link-bonding-dpdk-testpmd-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-link-bonding-vhost-base-dpdk-testpmd-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-link-bonding-dpdk-testpmd-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-link-bonding-vhost-base-dpdk-testpmd-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-link-bonding-vhost-base-dpdk-vpp
-````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-link-bonding-dpdk-vpp-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-link-bonding-vhost-base-dpdk-vpp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-link-bonding-dpdk-vpp-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-link-bonding-vhost-base-dpdk-vpp-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-vhost-base-dpdk-testpmd
-```````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-testpmd-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-vhost-base-dpdk-testpmd-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-testpmd-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-vhost-base-dpdk-testpmd-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-vhost-base-dpdk-vpp
-```````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-vpp-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-vhost-base-dpdk-vpp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-vpp-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x520-64b-1t1c-vhost-base-dpdk-vpp-pdr.html"></iframe>
-    <p><br></p>
-    </center>

diff --git a/docs/cpta/ndrpdr_trending/vhost-3n-hsw-x710.rst b/docs/cpta/ndrpdr_trending/vhost-3n-hsw-x710.rst
deleted file mode 100644 (file)
index 4d45463..0000000
--- a/docs/cpta/ndrpdr_trending/vhost-3n-hsw-x710.rst
+++ /dev/null
@@ -1,126 +0,0 @@
-3n-hsw-x710
------------
-
-64b-link-bonding-vhost-base-dpdk-testpmd
-````````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-link-bonding-dpdk-testpmd-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-link-bonding-vhost-base-dpdk-testpmd-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-link-bonding-dpdk-testpmd-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-link-bonding-vhost-base-dpdk-testpmd-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-link-bonding-vhost-base-dpdk-vpp
-````````````````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-link-bonding-dpdk-vpp-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-link-bonding-vhost-base-dpdk-vpp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-link-bonding-dpdk-vpp-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-link-bonding-vhost-base-dpdk-vpp-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-vhost-base-dpdk-testpmd
-```````````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-testpmd-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-vhost-base-dpdk-testpmd-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-testpmd-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-vhost-base-dpdk-testpmd-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-vhost-base-dpdk-vpp
-```````````````````````
-
-1t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-vpp-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-vhost-base-dpdk-vpp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-1t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-1t1c-base-dpdk-vpp-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-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-x710-64b-1t1c-vhost-base-dpdk-vpp-pdr.html"></iframe>
-    <p><br></p>
-    </center>

diff --git a/docs/cpta/ndrpdr_trending/vhost-3n-skx-x710.rst b/docs/cpta/ndrpdr_trending/vhost-3n-skx-x710.rst
index 9812bf9..456ae66 100644 (file)
--- a/docs/cpta/ndrpdr_trending/vhost-3n-skx-x710.rst
+++ b/docs/cpta/ndrpdr_trending/vhost-3n-skx-x710.rst
@@ -1,20 +1,20 @@
 3n-skx-x710
 -----------
 
-64b-link-bonding-vhost-base-dpdk-testpmd
-````````````````````````````````````````
+64b-link-bonding-vhost-base-avf-testpmd
+```````````````````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-link-bonding-dpdk-testpmd-ndr"></a>
+    <a name="64b-2t1c-base-link-bonding-avf-testpmd-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-testpmd-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -23,16 +23,16 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-link-bonding-dpdk-testpmd-pdr"></a>
+    <a name="64b-2t1c-base-link-bonding-avf-testpmd-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-testpmd-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-link-bonding-vhost-base-dpdk-vpp
+64b-link-bonding-vhost-base-avf-vpp
 ````````````````````````````````````
 
 2t1c-ndr
@@ -40,12 +40,12 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-link-bonding-dpdk-vpp-ndr"></a>
+    <a name="64b-2t1c-base-link-bonding-avf-vpp-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-vpp-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,73 +54,11 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-link-bonding-dpdk-vpp-pdr"></a>
+    <a name="64b-2t1c-base-link-bonding-avf-vpp-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-vhost-base-dpdk-testpmd
-```````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk-testpmd-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-vhost-base-dpdk-testpmd-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk-testpmd-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-vhost-base-dpdk-testpmd-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-vhost-base-dpdk-vpp
-```````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk-vpp-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-vhost-base-dpdk-vpp-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk-vpp-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-vhost-base-dpdk-vpp-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-vpp-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/vhost-3n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/vhost-3n-skx-xxv710.rst
index 226d958..9c12dda 100644 (file)
--- a/docs/cpta/ndrpdr_trending/vhost-3n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/vhost-3n-skx-xxv710.rst
@@ -1,20 +1,20 @@
 3n-skx-xxv710
 -------------
 
-64b-vhost-base-dpdk-testpmd
-```````````````````````````
+64b-link-bonding-vhost-base-avf-testpmd
+```````````````````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-testpmd-ndr"></a>
+    <a name="64b-2t1c-base-link-bonding-avf-testpmd-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -23,29 +23,60 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-testpmd-pdr"></a>
+    <a name="64b-2t1c-base-link-bonding-avf-testpmd-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-link-bonding-vhost-base-avf-vpp
+````````````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-link-bonding-avf-vpp-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-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-vpp-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-link-bonding-avf-vpp-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-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-vpp-pdr.html"></iframe>
     <p><br></p>
     </center>
 
-64b-vhost-base-dpdk-vpp
-```````````````````````
+64b-vhost-base-avf-testpmd
+``````````````````````````
 
 2t1c-ndr
 ::::::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-vpp-ndr"></a>
+    <a name="64b-2t1c-base-avf-testpmd-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,11 +85,73 @@
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-vpp-pdr"></a>
+    <a name="64b-2t1c-base-avf-testpmd-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-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-vhost-base-avf-vpp
+``````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-vpp-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-vpp-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-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-vhost-base-dpdk-testpmd
+```````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-dpdk-testpmd-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-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-dpdk-testpmd-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-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-pdr.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/ndrpdr_trending/vhost.rst b/docs/cpta/ndrpdr_trending/vhost.rst
index f197eda..1d39dd9 100644 (file)
--- a/docs/cpta/ndrpdr_trending/vhost.rst
+++ b/docs/cpta/ndrpdr_trending/vhost.rst
@@ -3,12 +3,9 @@ VMs vhost-user
 
 .. toctree::
 
+    vhost-2n-clx-xxv710
+    vhost-2n-clx-cx556a
     vhost-2n-skx-xxv710
-    vhost-2n-skx-x710
     vhost-3n-skx-xxv710
     vhost-3n-skx-x710
     vhost-3n-hsw-xl710
-    vhost-3n-hsw-x710
-    vhost-3n-hsw-x520
-    vhost-2n-clx-xxv710
-    vhost-2n-clx-x710

diff --git a/docs/cpta/ndrpdr_trending/vts-2n-clx-xxv710.rst b/docs/cpta/ndrpdr_trending/vts-2n-clx-xxv710.rst
new file mode 100644 (file)
index 0000000..1978958
--- /dev/null
+++ b/docs/cpta/ndrpdr_trending/vts-2n-clx-xxv710.rst
@@ -0,0 +1,34 @@
+2n-clx-xxv710
+-------------
+
+114b-vts-l2switching-base-avf
+`````````````````````````````
+
+2t1c-ndr
+::::::::
+
+.. raw:: html
+
+    <a name="114b-2t1c-base-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-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-114b-2t1c-vts-l2switching-base-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+
+2t1c-pdr
+::::::::
+
+.. raw:: html
+
+    <a name="114b-2t1c-base-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-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-114b-2t1c-vts-l2switching-base-avf-ndr.html"></iframe>
+    <p><br></p>
+    </center>

diff --git a/docs/cpta/ndrpdr_trending/vts.rst b/docs/cpta/ndrpdr_trending/vts.rst
new file mode 100644 (file)
index 0000000..5b7cd10
--- /dev/null
+++ b/docs/cpta/ndrpdr_trending/vts.rst
@@ -0,0 +1,6 @@
+Virtual Topology System
+=======================
+
+.. toctree::
+
+    vts-2n-clx-xxv710

diff --git a/docs/cpta/trending/container_memif.rst b/docs/cpta/trending/container_memif.rst
index 17784c4..43e5e9d 100644 (file)
--- a/docs/cpta/trending/container_memif.rst
+++ b/docs/cpta/trending/container_memif.rst
@@ -3,8 +3,8 @@ LXC/DRC Container Memif
 
 .. toctree::
 
+    container_memif-2n-clx-xxv710
+    container_memif-2n-clx-cx556a
     container_memif-2n-skx-xxv710
     container_memif-3n-skx-xxv710
     container_memif-3n-tsh-x520
-    container_memif-2n-clx-xxv710
-    container_memif-2n-clx-cx556a

diff --git a/docs/cpta/trending/ip4-2n-clx-xxv710.rst b/docs/cpta/trending/ip4-2n-clx-xxv710.rst
index c7b4af2..fdb6830 100644 (file)
--- a/docs/cpta/trending/ip4-2n-clx-xxv710.rst
+++ b/docs/cpta/trending/ip4-2n-clx-xxv710.rst
@@ -1,8 +1,8 @@
 2n-clx-xxv710
 -------------
 
-64b-ip4routing-base-avf
-```````````````````````
+64b-ip4routing-base-avf-dpdk
+````````````````````````````
 
 2t1c
 ::::
@@ -10,6 +10,7 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf"></a>
+    <a name="64b-2t1c-base-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
@@ -24,6 +25,7 @@
 .. raw:: html
 
     <a name="64b-4t2c-base-avf"></a>
+    <a name="64b-4t2c-base-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
@@ -38,56 +40,12 @@
 .. raw:: html
 
     <a name="64b-8t4c-base-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-base-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-ip4routing-base-dpdk
-````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk"></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-base-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-base-dpdk"></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-base-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
     <a name="64b-8t4c-base-dpdk"></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-base-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-8t4c-ip4-base-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -180,48 +138,3 @@
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-8t4c-ip4-scale-dpdk.html"></iframe>
     <p><br></p>
     </center>
-
-64b-features-ip4routing-base-dpdk
-`````````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk"></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-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-features-dpdk"></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-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
-    <a name="64b-8t4c-features-dpdk"></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-dpdk.html"></iframe>
-    <p><br></p>
-    </center>

diff --git a/docs/cpta/trending/ip4-3n-skx-xxv710.rst b/docs/cpta/trending/ip4-3n-skx-xxv710.rst
index fb1680f..85cf460 100644 (file)
--- a/docs/cpta/trending/ip4-3n-skx-xxv710.rst
+++ b/docs/cpta/trending/ip4-3n-skx-xxv710.rst
@@ -97,98 +97,99 @@
     <p><br></p>
     </center>
 
-64b-features-ip4routing-base-avf
-````````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-avf"></a>
-    <a name="64b-2t1c-features-iacl50-avf"></a>
-    <a name="64b-2t1c-features-oacl50-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-features-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-features-avf"></a>
-    <a name="64b-4t2c-features-iacl50-avf"></a>
-    <a name="64b-4t2c-features-oacl50-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-ip4-features-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
-    <a name="64b-8t4c-features-avf"></a>
-    <a name="64b-8t4c-features-iacl50-avf"></a>
-    <a name="64b-8t4c-features-oacl50-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-ip4-features-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-64b-features-ip4routing-base-dpdk
-`````````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-dpdk"></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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-features-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-features-dpdk"></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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-ip4-features-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
-    <a name="64b-8t4c-features-dpdk"></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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-ip4-features-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
+..
+    64b-features-ip4routing-base-avf
+    ````````````````````````````````
+
+    2t1c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-2t1c-features-avf"></a>
+        <a name="64b-2t1c-features-iacl50-avf"></a>
+        <a name="64b-2t1c-features-oacl50-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-3n-skx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-features-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    4t2c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-4t2c-features-avf"></a>
+        <a name="64b-4t2c-features-iacl50-avf"></a>
+        <a name="64b-4t2c-features-oacl50-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-3n-skx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-ip4-features-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    8t4c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-8t4c-features-avf"></a>
+        <a name="64b-8t4c-features-iacl50-avf"></a>
+        <a name="64b-8t4c-features-oacl50-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-3n-skx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-ip4-features-avf.html"></iframe>
+        <p><br></p>
+        </center>
+
+    64b-features-ip4routing-base-dpdk
+    `````````````````````````````````
+
+    2t1c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-2t1c-features-dpdk"></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-3n-skx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-features-dpdk.html"></iframe>
+        <p><br></p>
+        </center>
+
+    4t2c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-4t2c-features-dpdk"></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-3n-skx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-ip4-features-dpdk.html"></iframe>
+        <p><br></p>
+        </center>
+
+    8t4c
+    ::::
+
+    .. raw:: html
+
+        <a name="64b-8t4c-features-dpdk"></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-3n-skx" target="_blank">csit-ref</a>
+        <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-ip4-features-dpdk.html"></iframe>
+        <p><br></p>
+        </center>

diff --git a/docs/cpta/trending/ip4.rst b/docs/cpta/trending/ip4.rst
index 5b5b495..39f73ff 100644 (file)
--- a/docs/cpta/trending/ip4.rst
+++ b/docs/cpta/trending/ip4.rst
@@ -3,6 +3,9 @@ IPv4 Routing
 
 .. toctree::
 
+    ip4-2n-clx-xxv710
+    ip4-2n-clx-x710
+    ip4-2n-clx-cx556a
     ip4-2n-skx-xxv710
     ip4-2n-skx-x710
     ip4-3n-skx-xxv710
@@ -11,6 +14,3 @@ IPv4 Routing
     ip4-3n-tsh-x520
     ip4-2n-dnv-x553
     ip4-3n-dnv-x553
-    ip4-2n-clx-xxv710
-    ip4-2n-clx-x710
-    ip4-2n-clx-cx556a

diff --git a/docs/cpta/trending/ip6.rst b/docs/cpta/trending/ip6.rst
index 8b83575..02ddee8 100644 (file)
--- a/docs/cpta/trending/ip6.rst
+++ b/docs/cpta/trending/ip6.rst
@@ -3,6 +3,9 @@ IPv6 Routing
 
 .. toctree::
 
+    ip6-2n-clx-xxv710
+    ip6-2n-clx-x710
+    ip6-2n-clx-cx556a
     ip6-2n-skx-xxv710
     ip6-2n-skx-x710
     ip6-3n-skx-xxv710
@@ -11,6 +14,3 @@ IPv6 Routing
     ip6-3n-tsh-x520
     ip6-2n-dnv-x553
     ip6-3n-dnv-x553
-    ip6-2n-clx-xxv710
-    ip6-2n-clx-x710
-    ip6-2n-clx-cx556a

diff --git a/docs/cpta/trending/ipsec-3n-tsh-x520.rst b/docs/cpta/trending/ipsec-3n-tsh-x520.rst
index fd1f76f..a437766 100644 (file)
--- a/docs/cpta/trending/ipsec-3n-tsh-x520.rst
+++ b/docs/cpta/trending/ipsec-3n-tsh-x520.rst
@@ -4,14 +4,6 @@
 imix-ipsec-ip4routing-base-scale-sw-ixgbe
 `````````````````````````````````````````
 
-..
-    10ge2p1x520-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr
-    10ge2p1x520-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
-    10ge2p1x520-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr
-    10ge2p1x520-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
-    10ge2p1x520-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr
-    10ge2p1x520-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
-
 1t1c
 ::::
 
@@ -56,3 +48,51 @@ imix-ipsec-ip4routing-base-scale-sw-ixgbe
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-imix-4t4c-ipsec-base-scale-sw-ixgbe.html"></iframe>
     <p><br></p>
     </center>
+
+1518b-ipsec-ip4routing-base-scale-sw-ixgbe
+``````````````````````````````````````````
+
+1t1c
+::::
+
+.. raw:: html
+
+    <a name="1518b-1t1c-base-sw-ixgbe"></a>
+    <a name="1518b-1t1c-scale-sw-ixgbe"></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-3n-tsh" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-1518b-1t1c-ipsec-base-scale-sw-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+::::
+
+.. raw:: html
+
+    <a name="1518b-2t2c-base-sw-ixgbe"></a>
+    <a name="1518b-2t2c-scale-sw-ixgbe"></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-3n-tsh" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-1518b-2t2c-ipsec-base-scale-sw-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+::::
+
+.. raw:: html
+
+    <a name="1518b-4t4c-base-sw-ixgbe"></a>
+    <a name="1518b-4t4c-scale-sw-ixgbe"></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-3n-tsh" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-1518b-4t4c-ipsec-base-scale-sw-ixgbe.html"></iframe>
+    <p><br></p>
+    </center>

diff --git a/docs/cpta/trending/l2-2n-clx-x710.rst b/docs/cpta/trending/l2-2n-clx-x710.rst
index dfc1781..9343c3a 100644 (file)
--- a/docs/cpta/trending/l2-2n-clx-x710.rst
+++ b/docs/cpta/trending/l2-2n-clx-x710.rst
@@ -1,8 +1,8 @@
 2n-clx-x710
 -----------
 
-64b-l2switching-base-scale-avf
-``````````````````````````````
+64b-l2switching-base-scale-avf-dpdk
+```````````````````````````````````
 
 2t1c
 ::::
@@ -11,6 +11,8 @@
 
     <a name="64b-2t1c-base-avf"></a>
     <a name="64b-2t1c-scale-avf"></a>
+    <a name="64b-2t1c-base-dpdk"></a>
+    <a name="64b-2t1c-scale-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
@@ -26,6 +28,8 @@
 
     <a name="64b-4t2c-base-avf"></a>
     <a name="64b-4t2c-scale-avf"></a>
+    <a name="64b-4t2c-base-dpdk"></a>
+    <a name="64b-4t2c-scale-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
@@ -41,59 +45,12 @@
 
     <a name="64b-8t4c-base-avf"></a>
     <a name="64b-8t4c-scale-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-x710-64b-8t4c-l2-base-scale-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-
-64b-l2switching-base-scale-avf-dpdk
-```````````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-base-dpdk"></a>
-    <a name="64b-2t1c-scale-dpdk"></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-x710-64b-2t1c-l2-base-scale-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-base-dpdk"></a>
-    <a name="64b-4t2c-scale-dpdk"></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-x710-64b-4t2c-l2-base-scale-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
     <a name="64b-8t4c-base-dpdk"></a>
     <a name="64b-8t4c-scale-dpdk"></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-x710-64b-8t4c-l2-base-scale-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-8t4c-l2-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/trending/l2-2n-skx-x710.rst b/docs/cpta/trending/l2-2n-skx-x710.rst
index e557f6c..720c4af 100644 (file)
--- a/docs/cpta/trending/l2-2n-skx-x710.rst
+++ b/docs/cpta/trending/l2-2n-skx-x710.rst
@@ -1,8 +1,8 @@
 2n-skx-x710
 -----------
 
-64b-l2switching-base-scale-avf-dpdk
-```````````````````````````````````
+64b-l2switching-base-scale-avf
+``````````````````````````````
 
 2t1c
 ::::
@@ -10,14 +10,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf"></a>
-    <a name="64b-2t1c-base-avf"></a>
-    <a name="64b-2t1c-scale-dpdk"></a>
-    <a name="64b-2t1c-scale-dpdk"></a>
+    <a name="64b-2t1c-scale-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-scale-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -27,14 +25,12 @@
 .. raw:: html
 
     <a name="64b-4t2c-base-avf"></a>
-    <a name="64b-4t2c-base-avf"></a>
-    <a name="64b-4t2c-scale-dpdk"></a>
-    <a name="64b-4t2c-scale-dpdk"></a>
+    <a name="64b-4t2c-scale-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-4t2c-l2-base-scale-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-4t2c-l2-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -44,13 +40,59 @@
 .. raw:: html
 
     <a name="64b-8t4c-base-avf"></a>
-    <a name="64b-8t4c-base-avf"></a>
-    <a name="64b-8t4c-scale-dpdk"></a>
+    <a name="64b-8t4c-scale-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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-8t4c-l2-base-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-l2switching-base-scale-dpdk
+```````````````````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-dpdk"></a>
+    <a name="64b-2t1c-scale-dpdk"></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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-2t1c-l2-base-scale-dpdk.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-dpdk"></a>
+    <a name="64b-4t2c-scale-dpdk"></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-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-4t2c-l2-base-scale-dpdk.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-dpdk"></a>
     <a name="64b-8t4c-scale-dpdk"></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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-8t4c-l2-base-scale-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-x710-64b-8t4c-l2-base-scale-dpdk.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/trending/l2-3n-skx-xxv710.rst b/docs/cpta/trending/l2-3n-skx-xxv710.rst
index 93dbe05..236f4e9 100644 (file)
--- a/docs/cpta/trending/l2-3n-skx-xxv710.rst
+++ b/docs/cpta/trending/l2-3n-skx-xxv710.rst
@@ -91,8 +91,8 @@
     <p><br></p>
     </center>
 
-64b-l2switching-base-scale-dpdk
-```````````````````````````````
+64b-l2switching-base-scale-avf-dpdk
+```````````````````````````````````
 
 2t1c
 ::::
@@ -138,57 +138,3 @@
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-l2-base-scale-dpdk.html"></iframe>
     <p><br></p>
     </center>
-
-64b-features-l2switching-base-avf
-`````````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="64b-2t1c-features-avf"></a>
-    <a name="64b-2t1c-features-iacl50-avf"></a>
-    <a name="64b-2t1c-features-oacl50-avf"></a>
-    <a name="64b-2t1c-features-macip-iacl50-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-l2-features-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="64b-4t2c-features-avf"></a>
-    <a name="64b-4t2c-features-iacl50-avf"></a>
-    <a name="64b-4t2c-features-oacl50-avf"></a>
-    <a name="64b-4t2c-features-macip-iacl50-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-l2-features-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
-    <a name="64b-8t4c-features-avf"></a>
-    <a name="64b-8t4c-features-iacl50-avf"></a>
-    <a name="64b-8t4c-features-oacl50-avf"></a>
-    <a name="64b-8t4c-features-macip-iacl50-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-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-l2-features-avf.html"></iframe>
-    <p><br></p>
-    </center>

diff --git a/docs/cpta/trending/l2.rst b/docs/cpta/trending/l2.rst
index 3d7e6c7..2d40875 100644 (file)
--- a/docs/cpta/trending/l2.rst
+++ b/docs/cpta/trending/l2.rst
@@ -3,6 +3,9 @@ L2 Ethernet Switching
 
 .. toctree::
 
+    l2-2n-clx-xxv710
+    l2-2n-clx-x710
+    l2-2n-clx-cx556a
     l2-2n-skx-xxv710
     l2-2n-skx-x710
     l2-3n-skx-xxv710
@@ -11,6 +14,3 @@ L2 Ethernet Switching
     l2-3n-tsh-x520
     l2-2n-dnv-x553
     l2-3n-dnv-x553
-    l2-2n-clx-xxv710
-    l2-2n-clx-x710
-    l2-2n-clx-cx556a

diff --git a/docs/cpta/trending/srv6.rst b/docs/cpta/trending/srv6.rst
index 96451d8..6c177ac 100644 (file)
--- a/docs/cpta/trending/srv6.rst
+++ b/docs/cpta/trending/srv6.rst
@@ -3,9 +3,9 @@ SRv6 Routing
 
 .. toctree::
 
-    srv6-3n-skx-xxv710
     srv6-3n-hsw-xl710
     srv6-3n-tsh-x520
 
 ..
+    srv6-3n-skx-xxv710
     srv6-3n-dnv-x553

diff --git a/docs/cpta/trending/vhost.rst b/docs/cpta/trending/vhost.rst
index e9e869f..a33e599 100644 (file)
--- a/docs/cpta/trending/vhost.rst
+++ b/docs/cpta/trending/vhost.rst
@@ -3,13 +3,13 @@ VMs vhost-user
 
 .. toctree::
 
+    vhost-2n-clx-xxv710
+    vhost-2n-clx-cx556a
     vhost-2n-skx-xxv710
     vhost-3n-skx-xxv710
     vhost-3n-skx-x710
     vhost-3n-hsw-xl710
     vhost-3n-tsh-x520
-    vhost-2n-clx-xxv710
-    vhost-2n-clx-cx556a
 
 ..
     vhost-3n-skx-x710 - keeps failing

diff --git a/docs/cpta/trending/vts-2n-skx-xxv710.rst b/docs/cpta/trending/vts-2n-skx-xxv710.rst
index 417b0ef..697f6ec 100644 (file)
--- a/docs/cpta/trending/vts-2n-skx-xxv710.rst
+++ b/docs/cpta/trending/vts-2n-skx-xxv710.rst
@@ -1,21 +1,20 @@
 2n-skx-xxv710
 -------------
 
-114b-vts-l2switching-base-avf-dpdk
-``````````````````````````````````
+114b-vts-l2switching-base-avf
+`````````````````````````````
 
 2t1c
 ::::
 
 .. raw:: html
 
-    <a name="114b-2t1c-base-dpdk"></a>
     <a name="114b-2t1c-base-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-2t1c-vts-l2switching-base-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-2t1c-vts-l2switching-base-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -24,13 +23,12 @@
 
 .. raw:: html
 
-    <a name="114b-4t2c-base-dpdk"></a>
     <a name="114b-4t2c-base-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-4t2c-vts-l2switching-base-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-4t2c-vts-l2switching-base-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -39,12 +37,11 @@
 
 .. raw:: html
 
-    <a name="114b-8t4c-base-dpdk"></a>
     <a name="114b-8t4c-base-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-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-8t4c-vts-l2switching-base-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-8t4c-vts-l2switching-base-avf.html"></iframe>
     <p><br></p>
     </center>

diff --git a/docs/cpta/trending/vts.rst b/docs/cpta/trending/vts.rst
index e5836f4..8966e92 100644 (file)
--- a/docs/cpta/trending/vts.rst
+++ b/docs/cpta/trending/vts.rst
@@ -3,4 +3,5 @@ Virtual Topology System
 
 .. toctree::
 
+    vts-2n-clx-xxv710
     vts-2n-skx-xxv710

diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index fa41ab4..bd9b64f 100644 (file)
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -2305,7 +2305,6 @@
       include:
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-2t1c-eth-l2xcbase-eth-2memif-1lxc-mrr"
-        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
@@ -2316,7 +2315,6 @@
       include:
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-4t2c-eth-l2xcbase-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-4t2c-eth-l2xcbase-eth-2memif-1lxc-mrr"
-        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-4t2c-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
@@ -2327,7 +2325,6 @@
       include:
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-8t4c-eth-l2xcbase-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-8t4c-eth-l2xcbase-eth-2memif-1lxc-mrr"
-        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-8t4c-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
@@ -2369,11 +2366,9 @@
       output-file-name: "2n-clx-x710-64b-2t1c-ip4-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Mrr.64B-2t1c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-mrr.64B-2t1c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-2t1c-avf-ethip4-ip4scale2m-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-mrr.64B-2t1c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
@@ -2381,11 +2376,9 @@
       output-file-name: "2n-clx-x710-64b-4t2c-ip4-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Mrr.64B-4t2c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-mrr.64B-4t2c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-4t2c-avf-ethip4-ip4scale2m-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-4t2c-avf-ethip4-ip4scale2m-rnd-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-mrr.64B-4t2c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
@@ -2393,36 +2386,37 @@
       output-file-name: "2n-clx-x710-64b-8t4c-ip4-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Mrr.64B-8t4c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-mrr.64B-8t4c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-8t4c-avf-ethip4-ip4scale2m-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-8t4c-avf-ethip4-ip4scale2m-rnd-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-mrr.64B-8t4c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-ip4routing-base-avf"
+    - title: "2n-clx-xxv710-64b-2t1c-ip4routing-base-avf-dpdk"
       output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-2t1c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-2t1c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-4t2c-ip4routing-base-avf"
+    - title: "2n-clx-xxv710-64b-4t2c-ip4routing-base-avf-dpdk"
       output-file-name: "2n-clx-xxv710-64b-4t2c-ip4-base-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-4t2c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-4t2c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-8t4c-ip4routing-base-avf"
+    - title: "2n-clx-xxv710-64b-8t4c-ip4routing-base-avf-dpdk"
       output-file-name: "2n-clx-xxv710-64b-8t4c-ip4-base-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-8t4c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-8t4c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-2t1c-ip4routing-scale-avf"
@@ -2461,30 +2455,6 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-8t4c-avf-ethip4-ip4scale2m-rnd-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-ip4routing-base-dpdk"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-dpdk"
-      data: "plot-performance-trending-vpp-2n-clx"
-      include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-mrr.64B-2t1c-dot1q-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-clx-xxv710-64b-4t2c-ip4routing-base-dpdk"
-      output-file-name: "2n-clx-xxv710-64b-4t2c-ip4-base-dpdk"
-      data: "plot-performance-trending-vpp-2n-clx"
-      include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-mrr.64B-4t2c-dot1q-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-clx-xxv710-64b-8t4c-ip4routing-base-dpdk"
-      output-file-name: "2n-clx-xxv710-64b-8t4c-ip4-base-dpdk"
-      data: "plot-performance-trending-vpp-2n-clx"
-      include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-mrr.64B-8t4c-dot1q-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
-      layout: "plot-cpta"
-
     - title: "2n-clx-xxv710-64b-2t1c-ip4routing-scale-dpdk"
       output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
@@ -2557,30 +2527,6 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Mrr.64B-8t4c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-features-ip4routing-base-dpdk"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-features-dpdk"
-      data: "plot-performance-trending-vpp-2n-clx"
-      include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-2t1c-ethip4udp-ip4base-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-clx-xxv710-64b-4t2c-features-ip4routing-base-dpdk"
-      output-file-name: "2n-clx-xxv710-64b-4t2c-ip4-features-dpdk"
-      data: "plot-performance-trending-vpp-2n-clx"
-      include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-4t2c-ethip4udp-ip4base-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-clx-xxv710-64b-8t4c-features-ip4routing-base-dpdk"
-      output-file-name: "2n-clx-xxv710-64b-8t4c-ip4-features-dpdk"
-      data: "plot-performance-trending-vpp-2n-clx"
-      include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-8t4c-ethip4udp-ip4base-nat44-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"
@@ -2714,11 +2660,9 @@
       output-file-name: "2n-skx-x710-64b-2t1c-ip4-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Mrr.64B-2t1c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-mrr.64B-2t1c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-2t1c-avf-ethip4-ip4scale2m-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-mrr.64B-2t1c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
@@ -2726,11 +2670,9 @@
       output-file-name: "2n-skx-x710-64b-4t2c-ip4-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Mrr.64B-4t2c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-mrr.64B-4t2c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-4t2c-avf-ethip4-ip4scale2m-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-4t2c-avf-ethip4-ip4scale2m-rnd-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-mrr.64B-4t2c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
@@ -2738,11 +2680,9 @@
       output-file-name: "2n-skx-x710-64b-8t4c-ip4-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Mrr.64B-8t4c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-mrr.64B-8t4c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-8t4c-avf-ethip4-ip4scale2m-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-8t4c-avf-ethip4-ip4scale2m-rnd-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-mrr.64B-8t4c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
@@ -2965,8 +2905,6 @@
       include:
         - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-mrr.64B-1t1c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-mrr.64B-1t1c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-ip4scale20k-mrr.64B-1t1c-ethip4-ip4scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-ip4scale200k-mrr.64B-1t1c-ethip4-ip4scale200k-mrr"
         - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-mrr.64B-1t1c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
@@ -2976,8 +2914,6 @@
       include:
         - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-mrr.64B-2t2c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-mrr.64B-2t2c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-ip4scale20k-mrr.64B-2t2c-ethip4-ip4scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-ip4scale200k-mrr.64B-2t2c-ethip4-ip4scale200k-mrr"
         - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-mrr.64B-2t2c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
@@ -2987,8 +2923,6 @@
       include:
         - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-mrr.64B-4t4c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-mrr.64B-4t4c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-ip4scale20k-mrr.64B-4t4c-ethip4-ip4scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-ip4scale200k-mrr.64B-4t4c-ethip4-ip4scale200k-mrr"
         - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-mrr.64B-4t4c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
@@ -2996,7 +2930,6 @@
       output-file-name: "3n-skx-x710-64b-2t1c-ip4-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Dot1Q-Ip4Base-Mrr.64B-2t1c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Mrr.64B-2t1c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Mrr.64B-2t1c-avf-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
@@ -3005,7 +2938,6 @@
       output-file-name: "3n-skx-x710-64b-4t2c-ip4-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Dot1Q-Ip4Base-Mrr.64B-4t2c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Mrr.64B-4t2c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Mrr.64B-4t2c-avf-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
@@ -3014,7 +2946,6 @@
       output-file-name: "3n-skx-x710-64b-8t4c-ip4-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Dot1Q-Ip4Base-Mrr.64B-8t4c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Mrr.64B-8t4c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Mrr.64B-8t4c-avf-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
@@ -3056,7 +2987,6 @@
       output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-mrr.64B-2t1c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-mrr.64B-2t1c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
@@ -3065,7 +2995,6 @@
       output-file-name: "3n-skx-xxv710-64b-4t2c-ip4-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-mrr.64B-4t2c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-mrr.64B-4t2c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
@@ -3074,71 +3003,10 @@
       output-file-name: "3n-skx-xxv710-64b-8t4c-ip4-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-mrr.64B-8t4c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-mrr.64B-8t4c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-features-avf"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-2t1c-avf-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-mrr.64B-2t1c-avf-ethip4udp-ip4base-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-4t2c-features-ip4routing-base-avf"
-      output-file-name: "3n-skx-xxv710-64b-4t2c-ip4-features-avf"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-4t2c-avf-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-mrr.64B-4t2c-avf-ethip4udp-ip4base-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-8t4c-features-ip4routing-base-avf"
-      output-file-name: "3n-skx-xxv710-64b-8t4c-ip4-features-avf"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-8t4c-avf-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-mrr.64B-8t4c-avf-ethip4udp-ip4base-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-features-dpdk"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-2t1c-ethip4udp-ip4base-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-4t2c-features-ip4routing-base-dpdk"
-      output-file-name: "3n-skx-xxv710-64b-4t2c-ip4-features-dpdk"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-4t2c-ethip4udp-ip4base-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-8t4c-features-ip4routing-base-dpdk"
-      output-file-name: "3n-skx-xxv710-64b-8t4c-ip4-features-dpdk"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-8t4c-ethip4udp-ip4base-nat44-mrr"
-      layout: "plot-cpta"
-
     - title: "3n-tsh-x520-64b-1t1c-ip4routing-base-scale-ixgbe"
       output-file-name: "3n-tsh-x520-64b-1t1c-ip4-base-scale-ixgbe"
       data: "plot-performance-trending-vpp-3n-tsh"
@@ -3238,7 +3106,7 @@
         - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-mrr.64B-4t4c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-ndr"
+    - title: "3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk"
       output-file-name: "3n-hsw-xl710-64b-1t1c-ip4-tunnels-base-dpdk"
       data: "plot-performance-trending-vpp-3n-hsw"
       include:
@@ -3246,7 +3114,7 @@
         - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-xl710-64b-2t2c-ip4tunnel-base-dpdk-ndr"
+    - title: "3n-hsw-xl710-64b-2t2c-ip4tunnel-base-dpdk"
       output-file-name: "3n-hsw-xl710-64b-2t2c-ip4-tunnels-base-dpdk"
       data: "plot-performance-trending-vpp-3n-hsw"
       include:
@@ -3254,7 +3122,7 @@
         - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-2t2c-ethip4vxlan-l2bdbasemaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-xl710-64b-4t4c-ip4tunnel-base-dpdk-ndr"
+    - title: "3n-hsw-xl710-64b-4t4c-ip4tunnel-base-dpdk"
       output-file-name: "3n-hsw-xl710-64b-4t4c-ip4-tunnels-base-dpdk"
       data: "plot-performance-trending-vpp-3n-hsw"
       include:
@@ -3332,10 +3200,8 @@
       output-file-name: "2n-clx-x710-78b-2t1c-ip6-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Mrr.78B-2t1c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Mrr.78B-2t1c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-2t1c-avf-ethip6-ip6scale2m-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-mrr.78B-2t1c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-2t1c-ethip6-ip6base-mrr"
       layout: "plot-cpta"
 
@@ -3343,10 +3209,8 @@
       output-file-name: "2n-clx-x710-78b-4t2c-ip6-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Mrr.78B-4t2c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Mrr.78B-4t2c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-4t2c-avf-ethip6-ip6scale2m-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-mrr.78B-4t2c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-4t2c-ethip6-ip6base-mrr"
       layout: "plot-cpta"
 
@@ -3354,10 +3218,8 @@
       output-file-name: "2n-clx-x710-78b-8t4c-ip6-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Mrr.78B-8t4c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Mrr.78B-8t4c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-8t4c-avf-ethip6-ip6scale2m-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-mrr.78B-8t4c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-8t4c-ethip6-ip6base-mrr"
       layout: "plot-cpta"
 
@@ -3398,7 +3260,6 @@
       output-file-name: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-mrr.78B-2t1c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-2t1c-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-mrr.78B-2t1c-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-mrr.78B-2t1c-ethip6-ip6scale200k-mrr"
@@ -3409,7 +3270,6 @@
       output-file-name: "2n-clx-xxv710-78b-4t2c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-mrr.78B-4t2c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-4t2c-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-mrr.78B-4t2c-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-mrr.78B-4t2c-ethip6-ip6scale200k-mrr"
@@ -3420,7 +3280,6 @@
       output-file-name: "2n-clx-xxv710-78b-8t4c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-mrr.78B-8t4c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-8t4c-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-mrr.78B-8t4c-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-mrr.78B-8t4c-ethip6-ip6scale200k-mrr"
@@ -3497,10 +3356,8 @@
       output-file-name: "2n-skx-x710-78b-2t1c-ip6-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Mrr.78B-2t1c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Mrr.78B-2t1c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-2t1c-avf-ethip6-ip6scale2m-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-mrr.78B-2t1c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-2t1c-ethip6-ip6base-mrr"
       layout: "plot-cpta"
 
@@ -3508,10 +3365,8 @@
       output-file-name: "2n-skx-x710-78b-4t2c-ip6-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Mrr.78B-4t2c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Mrr.78B-4t2c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-4t2c-avf-ethip6-ip6scale2m-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-mrr.78B-4t2c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-4t2c-ethip6-ip6base-mrr"
       layout: "plot-cpta"
 
@@ -3519,10 +3374,8 @@
       output-file-name: "2n-skx-x710-78b-8t4c-ip6-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Mrr.78B-8t4c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Mrr.78B-8t4c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-8t4c-avf-ethip6-ip6scale2m-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-mrr.78B-8t4c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-8t4c-ethip6-ip6base-mrr"
       layout: "plot-cpta"
 
@@ -3530,7 +3383,6 @@
       output-file-name: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-mrr.78B-2t1c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-mrr.78B-2t1c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-mrr.78B-2t1c-avf-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-mrr.78B-2t1c-avf-ethip6-ip6scale200k-mrr"
@@ -3541,7 +3393,6 @@
       output-file-name: "2n-skx-xxv710-78b-4t2c-ip6-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-mrr.78B-4t2c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-mrr.78B-4t2c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-mrr.78B-4t2c-avf-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-mrr.78B-4t2c-avf-ethip6-ip6scale200k-mrr"
@@ -3552,7 +3403,6 @@
       output-file-name: "2n-skx-xxv710-78b-8t4c-ip6-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-mrr.78B-8t4c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-mrr.78B-8t4c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-mrr.78B-8t4c-avf-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-mrr.78B-8t4c-avf-ethip6-ip6scale200k-mrr"
@@ -3563,7 +3413,6 @@
       output-file-name: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-mrr.78B-2t1c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-2t1c-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-mrr.78B-2t1c-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-mrr.78B-2t1c-ethip6-ip6scale200k-mrr"
@@ -3574,7 +3423,6 @@
       output-file-name: "2n-skx-xxv710-78b-4t2c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-mrr.78B-4t2c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-4t2c-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-mrr.78B-4t2c-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-mrr.78B-4t2c-ethip6-ip6scale200k-mrr"
@@ -3585,7 +3433,6 @@
       output-file-name: "2n-skx-xxv710-78b-8t4c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-mrr.78B-8t4c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-8t4c-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-mrr.78B-8t4c-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-mrr.78B-8t4c-ethip6-ip6scale200k-mrr"
@@ -3656,7 +3503,6 @@
       output-file-name: "3n-skx-x710-78b-2t1c-ip6-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Dot1Q-Ip6Base-mrr.78B-2t1c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Base-mrr.78B-2t1c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-mrr.78B-2t1c-avf-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
@@ -3665,7 +3511,6 @@
       output-file-name: "3n-skx-x710-78b-4t2c-ip6-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Dot1Q-Ip6Base-mrr.78B-4t2c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Base-mrr.78B-4t2c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-mrr.78B-4t2c-avf-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
@@ -3674,7 +3519,6 @@
       output-file-name: "3n-skx-x710-78b-8t4c-ip6-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Dot1Q-Ip6Base-mrr.78B-8t4c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Base-mrr.78B-8t4c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-mrr.78B-8t4c-avf-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
@@ -3716,7 +3560,6 @@
       output-file-name: "3n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-mrr.78B-2t1c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-2t1c-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-mrr.78B-2t1c-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
@@ -3725,7 +3568,6 @@
       output-file-name: "3n-skx-xxv710-78b-4t2c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-mrr.78B-4t2c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-4t2c-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-mrr.78B-4t2c-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
@@ -3734,7 +3576,6 @@
       output-file-name: "3n-skx-xxv710-78b-8t4c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-mrr.78B-8t4c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-8t4c-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-mrr.78B-8t4c-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
@@ -3951,9 +3792,7 @@
       data: "plot-performance-trending-vpp-3n-skx"
       include:
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-imix-4t2c-ipsec-ip4routing-base-scale-dpdk"
@@ -3961,9 +3800,7 @@
       data: "plot-performance-trending-vpp-3n-skx"
       include:
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-imix-8t4c-ipsec-ip4routing-base-scale-dpdk"
@@ -3971,9 +3808,7 @@
       data: "plot-performance-trending-vpp-3n-skx"
       include:
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-8t4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-8t4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.8t4c-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-8t4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-avf"
@@ -4017,9 +3852,7 @@
       data: "plot-performance-trending-vpp-3n-skx"
       include:
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-1518b-4t2c-ipsec-ip4routing-base-scale-dpdk"
@@ -4027,9 +3860,7 @@
       data: "plot-performance-trending-vpp-3n-skx"
       include:
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-4t2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-4t2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-4t2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-4t2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-1518b-8t4c-ipsec-ip4routing-base-scale-dpdk"
@@ -4037,9 +3868,7 @@
       data: "plot-performance-trending-vpp-3n-skx"
       include:
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-8t4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-8t4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.8t4c-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-8t4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
     - title: "3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-ixgbe"
@@ -4078,70 +3907,67 @@
         - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-2t1c-l2switching-base-scale-avf"
-      output-file-name: "2n-clx-x710-64b-2t1c-l2-base-scale-avf"
-      data: "plot-performance-trending-vpp-2n-clx"
+    - title: "3n-tsh-x520-1518b-1t1c-ipsec-ip4routing-base-scale-sw-ixgbe"
+      output-file-name: "3n-tsh-x520-1518b-1t1c-ipsec-base-scale-sw-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Mrr.64B-2t1c-avf-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-mrr.64B-2t1c-avf-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Mrr.64B-2t1c-eth-l2bdscale1mmaclrn-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-4t2c-l2switching-base-scale-avf"
-      output-file-name: "2n-clx-x710-64b-4t2c-l2-base-scale-avf"
-      data: "plot-performance-trending-vpp-2n-clx"
+    - title: "3n-tsh-x520-1518b-2t2c-ipsec-ip4routing-base-scale-sw-ixgbe"
+      output-file-name: "3n-tsh-x520-1518b-2t2c-ipsec-base-scale-sw-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Mrr.64B-4t2c-avf-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-mrr.64B-4t2c-avf-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Mrr.64B-4t2c-eth-l2bdscale1mmaclrn-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-8t4c-l2switching-base-scale-avf"
-      output-file-name: "2n-clx-x710-64b-8t4c-l2-base-scale-avf"
-      data: "plot-performance-trending-vpp-2n-clx"
+    - title: "3n-tsh-x520-1518b-4t4c-ipsec-ip4routing-base-scale-sw-ixgbe"
+      output-file-name: "3n-tsh-x520-1518b-4t4c-ipsec-base-scale-sw-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Mrr.64B-8t4c-avf-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-mrr.64B-8t4c-avf-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Mrr.64B-8t4c-eth-l2bdscale1mmaclrn-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-2t1c-l2switching-base-scale-dpdk"
-      output-file-name: "2n-clx-x710-64b-2t1c-l2-base-scale-dpdk"
+    - title: "2n-clx-x710-64b-2t1c-l2switching-base-scale-avf-dpdk"
+      output-file-name: "2n-clx-x710-64b-2t1c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Mrr.64B-2t1c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Mrr.64B-2t1c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t1c-eth-l2bdscale1mmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-4t2c-l2switching-base-scale-dpdk"
-      output-file-name: "2n-clx-x710-64b-4t2c-l2-base-scale-dpdk"
+    - title: "2n-clx-x710-64b-4t2c-l2switching-base-scale-avf-dpdk"
+      output-file-name: "2n-clx-x710-64b-4t2c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Mrr.64B-4t2c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Mrr.64B-4t2c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t2c-eth-l2bdscale1mmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-4t2c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-8t4c-l2switching-base-scale-dpdk"
-      output-file-name: "2n-clx-x710-64b-8t4c-l2-base-scale-dpdk"
+    - title: "2n-clx-x710-64b-8t4c-l2switching-base-scale-avf-dpdk"
+      output-file-name: "2n-clx-x710-64b-8t4c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Mrr.64B-8t4c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Mrr.64B-8t4c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-mrr.64B-8t4c-eth-l2bdscale1mmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-8t4c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-2t1c-l2switching-base-avf"
@@ -4151,6 +3977,7 @@
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-mrr.64B-2t1c-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-mrr.64B-2t1c-avf-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-mrr.64B-2t1c-avf-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-gbp-mrr"
       layout: "plot-cpta"
@@ -4162,6 +3989,7 @@
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-mrr.64B-4t2c-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-mrr.64B-4t2c-avf-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-mrr.64B-4t2c-avf-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-gbp-mrr"
       layout: "plot-cpta"
@@ -4173,6 +4001,7 @@
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-mrr.64B-8t4c-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-mrr.64B-8t4c-avf-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-mrr.64B-8t4c-avf-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-gbp-mrr"
       layout: "plot-cpta"
@@ -4184,9 +4013,6 @@
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-2t1c-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-2t1c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-mrr.64B-2t1c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-2t1c-dot1q-l2bdbasemaclrn-gbp-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-4t2c-l2switching-base-dpdk"
@@ -4196,9 +4022,6 @@
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-4t2c-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-4t2c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-mrr.64B-4t2c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-4t2c-dot1q-l2bdbasemaclrn-gbp-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-8t4c-l2switching-base-dpdk"
@@ -4208,9 +4031,6 @@
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-8t4c-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-8t4c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-mrr.64B-8t4c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-8t4c-dot1q-l2bdbasemaclrn-gbp-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-2t1c-l2switching-base-scale-avf"
@@ -4375,38 +4195,62 @@
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t4c-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-dpdk"
-      output-file-name: "2n-skx-x710-64b-2t1c-l2-base-scale-avf-dpdk"
+    - title: "2n-skx-x710-64b-2t1c-l2switching-base-scale-avf"
+      output-file-name: "2n-skx-x710-64b-2t1c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Mrr.64B-2t1c-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-mrr.64B-2t1c-avf-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t1c-eth-l2bdscale1mmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-x710-64b-4t2c-l2switching-base-scale-avf-dpdk"
-      output-file-name: "2n-skx-x710-64b-4t2c-l2-base-scale-avf-dpdk"
+    - title: "2n-skx-x710-64b-4t2c-l2switching-base-scale-avf"
+      output-file-name: "2n-skx-x710-64b-4t2c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Mrr.64B-4t2c-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-mrr.64B-4t2c-avf-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t2c-eth-l2bdscale1mmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-4t2c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-x710-64b-8t4c-l2switching-base-scale-avf-dpdk"
-      output-file-name: "2n-skx-x710-64b-8t4c-l2-base-scale-avf-dpdk"
+    - title: "2n-skx-x710-64b-8t4c-l2switching-base-scale-avf"
+      output-file-name: "2n-skx-x710-64b-8t4c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Mrr.64B-8t4c-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-mrr.64B-8t4c-avf-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-8t4c-avf-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-64b-2t1c-l2switching-base-scale-dpdk"
+      output-file-name: "2n-skx-x710-64b-2t1c-l2-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Mrr.64B-2t1c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Mrr.64B-2t1c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t1c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-64b-4t2c-l2switching-base-scale-dpdk"
+      output-file-name: "2n-skx-x710-64b-4t2c-l2-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Mrr.64B-4t2c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Mrr.64B-4t2c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t2c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-64b-8t4c-l2switching-base-scale-dpdk"
+      output-file-name: "2n-skx-x710-64b-8t4c-l2-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Mrr.64B-8t4c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Mrr.64B-8t4c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-mrr.64B-8t4c-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
@@ -4451,9 +4295,6 @@
       output-file-name: "2n-skx-xxv710-64b-2t1c-l2-base-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-mrr.64B-2t1c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-2t1c-dot1q-l2bdbasemaclrn-gbp-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-2t1c-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-2t1c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
@@ -4463,9 +4304,6 @@
       output-file-name: "2n-skx-xxv710-64b-4t2c-l2-base-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-mrr.64B-4t2c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-4t2c-dot1q-l2bdbasemaclrn-gbp-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-4t2c-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-4t2c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
@@ -4475,9 +4313,6 @@
       output-file-name: "2n-skx-xxv710-64b-8t4c-l2-base-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-mrr.64B-8t4c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-8t4c-dot1q-l2bdbasemaclrn-gbp-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-8t4c-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-8t4c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-eth-l2bdbasemaclrn-mrr"
@@ -4619,7 +4454,6 @@
       output-file-name: "3n-skx-x710-64b-2t1c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Patch-Mrr.64B-2t1c-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Mrr.64B-2t1c-avf-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
@@ -4630,7 +4464,6 @@
       output-file-name: "3n-skx-x710-64b-4t2c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Patch-Mrr.64B-4t2c-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Mrr.64B-4t2c-avf-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
@@ -4641,7 +4474,6 @@
       output-file-name: "3n-skx-x710-64b-8t4c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Patch-Mrr.64B-8t4c-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Mrr.64B-8t4c-avf-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
@@ -4711,114 +4543,36 @@
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-8t4c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-2t1c-l2switching-base-scale-dpdk"
+    - title: "3n-skx-xxv710-64b-2t1c-l2switching-base-scale-avf-dpdk"
       output-file-name: "3n-skx-xxv710-64b-2t1c-l2-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Mrr.64B-2t1c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Mrr.64B-2t1c-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-2t1c-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-2t1c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t1c-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-4t2c-l2switching-base-scale-dpdk"
+    - title: "3n-skx-xxv710-64b-4t2c-l2switching-base-scale-avf-dpdk"
       output-file-name: "3n-skx-xxv710-64b-4t2c-l2-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Mrr.64B-4t2c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Mrr.64B-4t2c-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-4t2c-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-4t2c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t2c-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-8t4c-l2switching-base-scale-dpdk"
+    - title: "3n-skx-xxv710-64b-8t4c-l2switching-base-scale-avf-dpdk"
       output-file-name: "3n-skx-xxv710-64b-8t4c-l2-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Mrr.64B-8t4c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Mrr.64B-8t4c-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-8t4c-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-8t4c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-8t4c-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-2t1c-features-l2switching-base-avf"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-l2-features-avf"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-4t2c-features-l2switching-base-avf"
-      output-file-name: "3n-skx-xxv710-64b-4t2c-l2-features-avf"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-8t4c-features-l2switching-base-avf"
-      output-file-name: "3n-skx-xxv710-64b-8t4c-l2-features-avf"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-2t1c-features-l2switching-base-dpdk"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-l2-features-dpdk"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-mrr.64B-2t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-mrr.64B-2t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-mrr.64B-2t1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-mrr.64B-2t1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-mrr.64B-2t1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-4t2c-features-l2switching-base-dpdk"
-      output-file-name: "3n-skx-xxv710-64b-4t2c-l2-features-dpdk"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-mrr.64B-4t2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-mrr.64B-4t2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-mrr.64B-4t2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-mrr.64B-4t2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-mrr.64B-4t2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-8t4c-features-l2switching-base-dpdk"
-      output-file-name: "3n-skx-xxv710-64b-8t4c-l2-features-dpdk"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-mrr.64B-8t4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-mrr.64B-8t4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-mrr.64B-8t4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-mrr.64B-8t4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-mrr.64B-8t4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr"
-      layout: "plot-cpta"
-
     - title: "3n-tsh-x520-64b-1t1c-l2switching-base-ixgbe"
       output-file-name: "3n-tsh-x520-64b-1t1c-l2-base-ixgbe"
       data: "plot-performance-trending-vpp-3n-tsh"
@@ -4960,8 +4714,8 @@
         - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-avf-dpdk"
-      output-file-name: "3n-skx-xxv710-78b-2t1c-srv6-base-avf-dpdk"
+    - title: "3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-avf"
+      output-file-name: "3n-skx-xxv710-78b-2t1c-srv6-base-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
         - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-2t1c-avf-ethip6ip6-ip6base-srv6enc1sid-mrr"
@@ -4972,8 +4726,8 @@
         - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-78b-4t2c-srv6-ip6routing-base-avf-dpdk"
-      output-file-name: "3n-skx-xxv710-78b-4t2c-srv6-base-avf-dpdk"
+    - title: "3n-skx-xxv710-78b-4t2c-srv6-ip6routing-base-avf"
+      output-file-name: "3n-skx-xxv710-78b-4t2c-srv6-base-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
         - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-4t2c-avf-ethip6ip6-ip6base-srv6enc1sid-mrr"
@@ -4984,8 +4738,8 @@
         - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-4t2c-avf-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-78b-8t4c-srv6-ip6routing-base-avf-dpdk"
-      output-file-name: "3n-skx-xxv710-78b-8t4c-srv6-base-avf-dpdk"
+    - title: "3n-skx-xxv710-78b-8t4c-srv6-ip6routing-base-avf"
+      output-file-name: "3n-skx-xxv710-78b-8t4c-srv6-base-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
         - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-8t4c-avf-ethip6ip6-ip6base-srv6enc1sid-mrr"
@@ -5096,9 +4850,6 @@
       output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
@@ -5106,9 +4857,6 @@
       output-file-name: "2n-clx-xxv710-64b-4t2c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
@@ -5116,9 +4864,6 @@
       output-file-name: "2n-clx-xxv710-64b-8t4c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
@@ -5126,9 +4871,6 @@
       output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-vpp"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
@@ -5136,9 +4878,6 @@
       output-file-name: "2n-clx-xxv710-64b-4t2c-vhost-base-dpdk-vpp"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
@@ -5146,9 +4885,6 @@
       output-file-name: "2n-clx-xxv710-64b-8t4c-vhost-base-dpdk-vpp"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
@@ -5219,9 +4955,6 @@
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-114b-4t2c-vts-l2switching-base-avf-dpdk"
@@ -5231,9 +4964,6 @@
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-4t2c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-4t2c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-4t2c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-4t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-4t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-4t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-114b-8t4c-vts-l2switching-base-avf-dpdk"
@@ -5243,9 +4973,6 @@
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-8t4c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-8t4c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-8t4c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-8t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-8t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-8t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd"
@@ -5312,66 +5039,54 @@
       output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-4t2c-vhost-base-dpdk-testpmd"
       output-file-name: "2n-skx-xxv710-64b-4t2c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-8t4c-vhost-base-dpdk-testpmd"
       output-file-name: "2n-skx-xxv710-64b-8t4c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp"
       output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-mrr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-mrr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-4t2c-vhost-base-dpdk-vpp"
       output-file-name: "2n-skx-xxv710-64b-4t2c-vhost-base-dpdk-vpp"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-4t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-mrr.64B-4t2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-mrr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-8t4c-vhost-base-dpdk-vpp"
       output-file-name: "2n-skx-xxv710-64b-8t4c-vhost-base-dpdk-vpp"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-8t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-mrr.64B-8t4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-mrr"
       layout: "plot-cpta"
 
     - title: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-testpmd"
@@ -5492,7 +5207,6 @@
       output-file-name: "3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
@@ -5504,7 +5218,6 @@
       output-file-name: "3n-skx-xxv710-64b-4t2c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
@@ -5516,7 +5229,6 @@
       output-file-name: "3n-skx-xxv710-64b-8t4c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
@@ -5716,40 +5428,31 @@
         - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-xxv710-114b-2t1c-vts-l2switching-base-avf-dpdk"
-      output-file-name: "2n-skx-xxv710-114b-2t1c-vts-l2switching-base-avf-dpdk"
+    - title: "2n-skx-xxv710-114b-2t1c-vts-l2switching-base-avf"
+      output-file-name: "2n-skx-xxv710-114b-2t1c-vts-l2switching-base-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-xxv710-114b-4t2c-vts-l2switching-base-avf-dpdk"
-      output-file-name: "2n-skx-xxv710-114b-4t2c-vts-l2switching-base-avf-dpdk"
+    - title: "2n-skx-xxv710-114b-4t2c-vts-l2switching-base-avf"
+      output-file-name: "2n-skx-xxv710-114b-4t2c-vts-l2switching-base-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-4t2c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-4t2c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-4t2c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-4t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-4t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-4t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-xxv710-114b-8t4c-vts-l2switching-base-avf-dpdk"
-      output-file-name: "2n-skx-xxv710-114b-8t4c-vts-l2switching-base-avf-dpdk"
+    - title: "2n-skx-xxv710-114b-8t4c-vts-l2switching-base-avf"
+      output-file-name: "2n-skx-xxv710-114b-8t4c-vts-l2switching-base-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-8t4c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-8t4c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-8t4c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-8t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-8t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-8t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
     - title: "2n-skx-x710-64b-2t1c-dpdk"
@@ -5951,35 +5654,13 @@
 
 # 2n-clx memif
 
-    - title: "2n-clx-x710-64b-2t1c-memif-base-dpdk-ndr"
-      output-file-name: "2n-clx-x710-64b-2t1c-memif-base-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-2n-clx"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Container Memif.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-10Ge2P1X710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "2n-clx-x710-64b-2t1c-memif-base-dpdk-pdr"
-      output-file-name: "2n-clx-x710-64b-2t1c-memif-base-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-2n-clx"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Container Memif.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-10Ge2P1X710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
-      layout: "plot-cpta"
-
     - title: "2n-clx-xxv710-64b-2t1c-memif-base-dpdk-ndr"
       output-file-name: "2n-clx-xxv710-64b-2t1c-memif-base-dpdk-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
       layout: "plot-cpta"
@@ -5989,300 +5670,440 @@
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
       layout: "plot-cpta"
 
-# 2n-clx ip4
-
-    - title: "2n-clx-x710-64b-2t1c-ip4-base-avf-dpdk-ndr"
-      output-file-name: "2n-clx-x710-64b-2t1c-ip4-base-avf-dpdk-ndr"
+    - title: "2n-clx-xxv710-64b-2t1c-memif-base-avf-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-memif-base-avf-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Copwhtlistbase-Ndrpdr.64B-2t1c-ethip4-ip4base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Iacldstbase-Ndrpdr.64B-2t1c-ethip4-ip4base-iacldstbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ipolicemarkbase-Ndrpdr.64B-2t1c-ethip4-ip4base-ipolicemarkbase-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-2t1c-ip4-scale-dpdk-ndr"
-      output-file-name: "2n-clx-x710-64b-2t1c-ip4-scale-dpdk-ndr"
+    - title: "2n-clx-xxv710-64b-2t1c-memif-base-avf-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-memif-base-avf-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
-      include-tests: "NDR"
+      include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-rnd-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-rnd-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-2t1c-ip4-features-dpdk-ndr"
-      output-file-name: "2n-clx-x710-64b-2t1c-ip4-features-dpdk-ndr"
+    - title: "2n-clx-cx556a-64b-2t1c-rdma-l2-eth-2memif-1dcr-ndr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-rdma-l2-eth-2memif-1dcr-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl1Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl1Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-2t1c-ip4-base-avf-dpdk-pdr"
-      output-file-name: "2n-clx-x710-64b-2t1c-ip4-base-avf-dpdk-pdr"
+    - title: "2n-clx-cx556a-64b-2t1c-rdma-l2-eth-2memif-1dcr-pdr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-rdma-l2-eth-2memif-1dcr-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Copwhtlistbase-Ndrpdr.64B-2t1c-ethip4-ip4base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Iacldstbase-Ndrpdr.64B-2t1c-ethip4-ip4base-iacldstbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ipolicemarkbase-Ndrpdr.64B-2t1c-ethip4-ip4base-ipolicemarkbase-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-2t1c-ip4-scale-dpdk-pdr"
-      output-file-name: "2n-clx-x710-64b-2t1c-ip4-scale-dpdk-pdr"
+# 2n-clx ip4
+
+    - title: "2n-clx-x710-64b-2t1c-ip4-base-avf-dpdk-ndr"
+      output-file-name: "2n-clx-x710-64b-2t1c-ip4-base-avf-dpdk-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
-      include-tests: "PDR"
+      include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-rnd-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-rnd-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-2t1c-ip4-features-dpdk-pdr"
-      output-file-name: "2n-clx-x710-64b-2t1c-ip4-features-dpdk-pdr"
+    - title: "2n-clx-x710-64b-2t1c-ip4-base-avf-dpdk-pdr"
+      output-file-name: "2n-clx-x710-64b-2t1c-ip4-base-avf-dpdk-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl1Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl1Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-ip4-base-avf-dpdk-ndr"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-avf-dpdk-ndr"
+    - title: "2n-clx-cx556a-64b-2t1c-ip4-base-rdma-ndr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-ip4-base-rdma-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ipolicemarkbase-Ndrpdr.64B-2t1c-ethip4-ip4base-ipolicemarkbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-rdma-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-rdma-ethip4-ip4base-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-ip4-scale-dpdk-ndr"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-scale-dpdk-ndr"
+    - title: "2n-clx-cx556a-64b-2t1c-ip4-scale-rdma-ndr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-ip4-scale-rdma-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-rnd-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-rnd-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale2m-rnd-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-ip4-features-dpdk-ndr"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-features-dpdk-ndr"
+    - title: "2n-clx-cx556a-64b-2t1c-ip4-features-rdma-ndr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-ip4-features-rdma-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl1Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl1Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-nat44-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-ip4-base-avf-dpdk-pdr"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-avf-dpdk-pdr"
+    - title: "2n-clx-cx556a-64b-2t1c-ip4-base-rdma-pdr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-ip4-base-rdma-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ipolicemarkbase-Ndrpdr.64B-2t1c-ethip4-ip4base-ipolicemarkbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-rdma-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-rdma-ethip4-ip4base-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-ip4-scale-dpdk-pdr"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-scale-dpdk-pdr"
+    - title: "2n-clx-cx556a-64b-2t1c-ip4-scale-rdma-pdr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-ip4-scale-rdma-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-rnd-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-rnd-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale2m-rnd-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-ip4-features-dpdk-pdr"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-features-dpdk-pdr"
+    - title: "2n-clx-cx556a-64b-2t1c-ip4-features-rdma-pdr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-ip4-features-rdma-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl1Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl1Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-nat44-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
       layout: "plot-cpta"
 
-# 2n-clx ip6
-
-    - title: "2n-clx-x710-78b-2t1c-ip6-base-features-dpdk-ndr"
-      output-file-name: "2n-clx-x710-78b-2t1c-ip6-base-features-dpdk-ndr"
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-base-scale-avf-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-scale-avf-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Copwhtlistbase-Ndrpdr.78B-2t1c-ethip6-ip6base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-2t1c-ethip6-ip6base-iacldstbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-avf-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-78b-2t1c-ip6-base-scale-dpdk-ndr"
-      output-file-name: "2n-clx-x710-78b-2t1c-ip6-base-scale-dpdk-ndr"
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-scale-avf-rnd-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-scale-avf-rnd-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-78b-2t1c-ip6-base-features-dpdk-pdr"
-      output-file-name: "2n-clx-x710-78b-2t1c-ip6-base-features-dpdk-pdr"
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-features-avf-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-features-avf-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
-      include-tests: "PDR"
+      include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Copwhtlistbase-Ndrpdr.78B-2t1c-ethip6-ip6base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-2t1c-ethip6-ip6base-iacldstbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-nat44-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-78b-2t1c-ip6-base-scale-dpdk-pdr"
-      output-file-name: "2n-clx-x710-78b-2t1c-ip6-base-scale-dpdk-pdr"
+    - 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"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-avf-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-dpdk-ndr"
-      output-file-name: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-dpdk-ndr"
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-scale-avf-rnd-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-scale-avf-rnd-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
-      include-tests: "NDR"
+      include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-dpdk-pdr"
-      output-file-name: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-dpdk-pdr"
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-features-avf-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-features-avf-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-nat44-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
       layout: "plot-cpta"
 
-# 2n-clx L2
-
-    - title: "2n-clx-x710-64b-2t1c-l2-base-avf-ndr"
-      output-file-name: "2n-clx-x710-64b-2t1c-l2-base-avf-ndr"
+    - 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"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-2t1c-l2-base-dpdk-ndr"
-      output-file-name: "2n-clx-x710-64b-2t1c-l2-base-dpdk-ndr"
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-scale-dpdk-rnd-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-scale-dpdk-rnd-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-rnd-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-2t1c-l2-base-scale-dpdk-ndr"
-      output-file-name: "2n-clx-x710-64b-2t1c-l2-base-scale-dpdk-ndr"
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-base-features-dpdk-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-features-dpdk-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ip4base-nat44-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-2t1c-l2-base-avf-pdr"
-      output-file-name: "2n-clx-x710-64b-2t1c-l2-base-avf-pdr"
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-base-scale-dpdk-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-scale-dpdk-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-2t1c-l2-base-dpdk-pdr"
-      output-file-name: "2n-clx-x710-64b-2t1c-l2-base-dpdk-pdr"
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-scale-dpdk-rnd-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-scale-dpdk-rnd-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-rnd-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-base-features-dpdk-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-features-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ip4base-nat44-ndrpdr"
+      layout: "plot-cpta"
+
+# 2n-clx ip6
+
+    - title: "2n-clx-cx556a-78b-2t1c-ip6-base-scale-rdma-ndr"
+      output-file-name: "2n-clx-cx556a-78b-2t1c-ip6-base-scale-rdma-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-rdma-dot1q-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-rdma-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-rdma-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-rdma-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-rdma-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-78b-2t1c-ip6-base-scale-rdma-pdr"
+      output-file-name: "2n-clx-cx556a-78b-2t1c-ip6-base-scale-rdma-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-rdma-dot1q-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-rdma-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-rdma-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-rdma-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-rdma-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-ndr"
+      output-file-name: "2n-clx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-pdr"
+      output-file-name: "2n-clx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-avf-ndr"
+      output-file-name: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-avf-dot1q-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-avf-pdr"
+      output-file-name: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-avf-dot1q-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-dpdk-ndr"
+      output-file-name: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-dpdk-pdr"
+      output-file-name: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+# 2n-clx L2
+
+    - title: "2n-clx-cx556a-64b-2t1c-l2-base-rdma-ndr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-l2-base-rdma-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-rdma-dot1q-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Ndrpdr.64B-2t1c-rdma-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-l2-base-scale-rdma-ndr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-l2-base-scale-rdma-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-l2-base-rdma-pdr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-l2-base-rdma-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-rdma-dot1q-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Ndrpdr.64B-2t1c-rdma-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-l2-base-scale-rdma-pdr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-l2-base-scale-rdma-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-x710-64b-2t1c-l2-base-scale-avf-dpdk-ndr"
+      output-file-name: "2n-clx-x710-64b-2t1c-l2-base-scale-avf-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-2t1c-l2-base-scale-dpdk-pdr"
-      output-file-name: "2n-clx-x710-64b-2t1c-l2-base-scale-dpdk-pdr"
+    - title: "2n-clx-x710-64b-2t1c-l2-base-scale-avf-dpdk-pdr"
+      output-file-name: "2n-clx-x710-64b-2t1c-l2-base-scale-avf-dpdk-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-2t1c-l2-base-avf-ndr"
@@ -6290,21 +6111,25 @@
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "NDR"
       include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-l2-base-dpdk-ndr"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-dpdk-ndr"
+    - title: "2n-clx-xxv710-64b-2t1c-l2-base-avf-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-avf-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
-      include-tests: "NDR"
+      include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-2t1c-l2-base-scale-dpdk-ndr"
@@ -6318,26 +6143,28 @@
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-l2-base-avf-pdr"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-avf-pdr"
+    - title: "2n-clx-xxv710-64b-2t1c-l2-base-scale-dpdk-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-scale-dpdk-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-l2-base-dpdk-pdr"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-dpdk-pdr"
+    - title: "2n-clx-xxv710-64b-2t1c-l2-base-scale-dpdk-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-scale-dpdk-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
-      include-tests: "PDR"
+      include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-2t1c-l2-base-scale-dpdk-pdr"
@@ -6345,6 +6172,8 @@
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
@@ -6353,116 +6182,140 @@
 
 # 2n-clx VHost
 
-    - title: "2n-clx-x710-64b-2t1c-vhost-base-dpdk-testpmd-ndr"
-      output-file-name: "2n-clx-x710-64b-2t1c-vhost-base-dpdk-testpmd-ndr"
+    - title: "2n-clx-cx556a-64b-2t1c-vhost-base-rdma-testpmd-ndr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-vhost-base-rdma-testpmd-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-2t1c-vhost-base-dpdk-vpp-ndr"
-      output-file-name: "2n-clx-x710-64b-2t1c-vhost-base-dpdk-vpp-ndr"
+    - title: "2n-clx-cx556a-64b-2t1c-vhost-base-rdma-vpp-ndr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-vhost-base-rdma-vpp-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-2t1c-vhost-base-dpdk-testpmd-pdr"
-      output-file-name: "2n-clx-x710-64b-2t1c-vhost-base-dpdk-testpmd-pdr"
+    - title: "2n-clx-cx556a-64b-2t1c-vhost-base-rdma-testpmd-pdr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-vhost-base-rdma-testpmd-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-2t1c-vhost-base-dpdk-vpp-pdr"
-      output-file-name: "2n-clx-x710-64b-2t1c-vhost-base-dpdk-vpp-pdr"
+    - title: "2n-clx-cx556a-64b-2t1c-vhost-base-rdma-vpp-pdr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-vhost-base-rdma-vpp-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-ndr"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-ndr"
+    - title: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-testpmd-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-testpmd-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-ndr"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-ndr"
+    - title: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-vpp-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-vpp-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-pdr"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-pdr"
+    - title: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-testpmd-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-testpmd-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-pdr"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-pdr"
+    - title: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-vpp-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-vpp-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-114b-2t1c-vts-l2switching-base-avf-ndr"
+      output-file-name: "2n-clx-xxv710-114b-2t1c-vts-l2switching-base-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-114b-2t1c-vts-l2switching-base-avf-pdr"
+      output-file-name: "2n-clx-xxv710-114b-2t1c-vts-l2switching-base-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
 # 2n-skx memif
 
-    - title: "2n-skx-x710-64b-2t1c-memif-base-dpdk-ndr"
-      output-file-name: "2n-skx-x710-64b-2t1c-memif-base-dpdk-ndr"
+    - title: "2n-skx-xxv710-64b-2t1c-memif-base-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-memif-base-avf-ndr"
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Container Memif.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-10Ge2P1X710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-x710-64b-2t1c-memif-base-dpdk-pdr"
-      output-file-name: "2n-skx-x710-64b-2t1c-memif-base-dpdk-pdr"
+    - title: "2n-skx-xxv710-64b-2t1c-memif-base-avf-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-memif-base-avf-pdr"
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Container Memif.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-10Ge2P1X710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-2t1c-memif-base-dpdk-ndr"
@@ -6489,93 +6342,105 @@
 
 # 2n-skx ip4
 
-    - title: "2n-skx-x710-64b-2t1c-ip4-base-avf-dpdk-ndr"
-      output-file-name: "2n-skx-x710-64b-2t1c-ip4-base-avf-dpdk-ndr"
+    - title: "2n-skx-x710-64b-2t1c-ip4-base-scale-avf-dpdk-ndr"
+      output-file-name: "2n-skx-x710-64b-2t1c-ip4-base-scale-avf-dpdk-ndr"
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "NDR"
       include:
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-64b-2t1c-ip4-base-scale-avf-dpdk-pdr"
+      output-file-name: "2n-skx-x710-64b-2t1c-ip4-base-scale-avf-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Copwhtlistbase-Ndrpdr.64B-2t1c-ethip4-ip4base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Iacldstbase-Ndrpdr.64B-2t1c-ethip4-ip4base-iacldstbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ipolicemarkbase-Ndrpdr.64B-2t1c-ethip4-ip4base-ipolicemarkbase-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-x710-64b-2t1c-ip4-scale-dpdk-ndr"
-      output-file-name: "2n-skx-x710-64b-2t1c-ip4-scale-dpdk-ndr"
+    - title: "2n-skx-xxv710-64b-2t1c-ip4-base-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-base-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-avf-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-ip4-scale-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-scale-avf-ndr"
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-rnd-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-rnd-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-x710-64b-2t1c-ip4-features-dpdk-ndr"
-      output-file-name: "2n-skx-x710-64b-2t1c-ip4-features-dpdk-ndr"
+    - title: "2n-skx-xxv710-64b-2t1c-ip4-features-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-features-avf-ndr"
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl1Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl1Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-nat44-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-x710-64b-2t1c-ip4-base-avf-dpdk-pdr"
-      output-file-name: "2n-skx-x710-64b-2t1c-ip4-base-avf-dpdk-pdr"
+    - title: "2n-skx-xxv710-64b-2t1c-ip4-base-avf-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-base-avf-pdr"
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Copwhtlistbase-Ndrpdr.64B-2t1c-ethip4-ip4base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Iacldstbase-Ndrpdr.64B-2t1c-ethip4-ip4base-iacldstbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ipolicemarkbase-Ndrpdr.64B-2t1c-ethip4-ip4base-ipolicemarkbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-avf-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-x710-64b-2t1c-ip4-scale-dpdk-pdr"
-      output-file-name: "2n-skx-x710-64b-2t1c-ip4-scale-dpdk-pdr"
+    - title: "2n-skx-xxv710-64b-2t1c-ip4-scale-avf-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-scale-avf-pdr"
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-rnd-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-rnd-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-x710-64b-2t1c-ip4-features-dpdk-pdr"
-      output-file-name: "2n-skx-x710-64b-2t1c-ip4-features-dpdk-pdr"
+    - title: "2n-skx-xxv710-64b-2t1c-ip4-features-avf-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-features-avf-pdr"
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl1Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl1Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-nat44-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-xxv710-64b-2t1c-ip4-base-avf-dpdk-ndr"
-      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-base-avf-dpdk-ndr"
+    - title: "2n-skx-xxv710-64b-2t1c-ip4-base-features-dpdk-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-base-features-dpdk-ndr"
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ipolicemarkbase-Ndrpdr.64B-2t1c-ethip4-ip4base-ipolicemarkbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-ndr"
@@ -6591,27 +6456,13 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-rnd-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-xxv710-64b-2t1c-ip4-features-dpdk-ndr"
-      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-features-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-2n-skx"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl1Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl1Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "2n-skx-xxv710-64b-2t1c-ip4-base-avf-dpdk-pdr"
-      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-base-avf-dpdk-pdr"
+    - title: "2n-skx-xxv710-64b-2t1c-ip4-base-features-dpdk-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-base-features-dpdk-pdr"
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ipolicemarkbase-Ndrpdr.64B-2t1c-ethip4-ip4base-ipolicemarkbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-pdr"
@@ -6627,62 +6478,26 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-rnd-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-xxv710-64b-2t1c-ip4-features-dpdk-pdr"
-      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-features-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-2n-skx"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl1Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl1Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
-      layout: "plot-cpta"
-
 # 2n-skx ip6
 
-    - title: "2n-skx-x710-78b-2t1c-ip6-base-features-dpdk-ndr"
-      output-file-name: "2n-skx-x710-78b-2t1c-ip6-base-features-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-2n-skx"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Copwhtlistbase-Ndrpdr.78B-2t1c-ethip6-ip6base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-2t1c-ethip6-ip6base-iacldstbase-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "2n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-ndr"
-      output-file-name: "2n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-ndr"
+    - title: "2n-skx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-ndr"
+      output-file-name: "2n-skx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-ndr"
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "NDR"
       include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "2n-skx-x710-78b-2t1c-ip6-base-features-dpdk-pdr"
-      output-file-name: "2n-skx-x710-78b-2t1c-ip6-base-features-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-2n-skx"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Copwhtlistbase-Ndrpdr.78B-2t1c-ethip6-ip6base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-2t1c-ethip6-ip6base-iacldstbase-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-pdr"
-      output-file-name: "2n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-pdr"
+    - title: "2n-skx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-pdr"
+      output-file-name: "2n-skx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-pdr"
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "PDR"
       include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk-ndr"
@@ -6690,7 +6505,6 @@
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
@@ -6702,7 +6516,6 @@
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
@@ -6711,26 +6524,15 @@
 
 # 2n-skx L2
 
-    - title: "2n-skx-x710-64b-2t1c-l2-base-avf-ndr"
-      output-file-name: "2n-skx-x710-64b-2t1c-l2-base-avf-ndr"
+    - title: "2n-skx-x710-64b-2t1c-l2-base-scale-avf-ndr"
+      output-file-name: "2n-skx-x710-64b-2t1c-l2-base-scale-avf-ndr"
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "NDR"
       include:
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "2n-skx-x710-64b-2t1c-l2-base-dpdk-ndr"
-      output-file-name: "2n-skx-x710-64b-2t1c-l2-base-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-2n-skx"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-skx-x710-64b-2t1c-l2-base-scale-dpdk-ndr"
@@ -6738,32 +6540,21 @@
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "NDR"
       include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-x710-64b-2t1c-l2-base-avf-pdr"
-      output-file-name: "2n-skx-x710-64b-2t1c-l2-base-avf-pdr"
+    - title: "2n-skx-x710-64b-2t1c-l2-base-scale-avf-pdr"
+      output-file-name: "2n-skx-x710-64b-2t1c-l2-base-scale-avf-pdr"
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "PDR"
       include:
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "2n-skx-x710-64b-2t1c-l2-base-dpdk-pdr"
-      output-file-name: "2n-skx-x710-64b-2t1c-l2-base-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-2n-skx"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-skx-x710-64b-2t1c-l2-base-scale-dpdk-pdr"
@@ -6771,9 +6562,9 @@
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "PDR"
       include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
@@ -6784,6 +6575,21 @@
       include:
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-l2-base-scale-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-l2-base-scale-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-2t1c-l2-base-dpdk-ndr"
@@ -6791,9 +6597,6 @@
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
@@ -6817,6 +6620,21 @@
       include:
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-l2-base-scale-avf-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-l2-base-scale-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-2t1c-l2-base-dpdk-pdr"
@@ -6824,9 +6642,6 @@
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
@@ -6845,50 +6660,48 @@
 
 # 2n-skx VHost
 
-    - title: "2n-skx-x710-64b-2t1c-vhost-base-dpdk-testpmd-ndr"
-      output-file-name: "2n-skx-x710-64b-2t1c-vhost-base-dpdk-testpmd-ndr"
+    - title: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-ndr"
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-x710-64b-2t1c-vhost-base-dpdk-vpp-ndr"
-      output-file-name: "2n-skx-x710-64b-2t1c-vhost-base-dpdk-vpp-ndr"
+    - title: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-ndr"
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-x710-64b-2t1c-vhost-base-dpdk-testpmd-pdr"
-      output-file-name: "2n-skx-x710-64b-2t1c-vhost-base-dpdk-testpmd-pdr"
+    - title: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-pdr"
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-x710-64b-2t1c-vhost-base-dpdk-vpp-pdr"
-      output-file-name: "2n-skx-x710-64b-2t1c-vhost-base-dpdk-vpp-pdr"
+    - title: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-pdr"
       data: "plot-ndrpdr-comparison-2n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-10Ge2P1X710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-ndr"
@@ -6899,7 +6712,6 @@
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-ndr"
@@ -6920,7 +6732,6 @@
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-pdr"
@@ -6935,26 +6746,28 @@
 
 # 3n-skx memif
 
-    - title: "3n-skx-x710-64b-2t1c-memif-base-dpdk-ndr"
-      output-file-name: "3n-skx-x710-64b-2t1c-memif-base-dpdk-ndr"
+    - title: "3n-skx-xxv710-64b-2t1c-memif-base-avf-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-memif-base-avf-ndr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-x710-64b-2t1c-memif-base-dpdk-pdr"
-      output-file-name: "3n-skx-x710-64b-2t1c-memif-base-dpdk-pdr"
+    - title: "3n-skx-xxv710-64b-2t1c-memif-base-avf-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-memif-base-avf-pdr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-64b-2t1c-memif-base-dpdk-ndr"
@@ -6962,9 +6775,9 @@
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
       layout: "plot-cpta"
 
@@ -6973,244 +6786,236 @@
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
       layout: "plot-cpta"
 
-# 3n-skx ip4
+# 3n-skx ipsec
 
-    - title: "3n-skx-x710-64b-2t1c-ip4-base-avf-dpdk-ndr"
-      output-file-name: "3n-skx-x710-64b-2t1c-ip4-base-avf-dpdk-ndr"
+    - title: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-avf-ndr"
+      output-file-name: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-avf-ndr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Copwhtlistbase-Ndrpdr.64B-2t1c-ethip4-ip4base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Iacldstbase-Ndrpdr.64B-2t1c-ethip4-ip4base-iacldstbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ipolicemarkbase-Ndrpdr.64B-2t1c-ethip4-ip4base-ipolicemarkbase-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-x710-64b-2t1c-ip4-scale-dpdk-ndr"
-      output-file-name: "3n-skx-x710-64b-2t1c-ip4-scale-dpdk-ndr"
+    - title: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-avf-ndr"
+      output-file-name: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-avf-ndr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-x710-64b-2t1c-ip4-features-dpdk-ndr"
-      output-file-name: "3n-skx-x710-64b-2t1c-ip4-features-dpdk-ndr"
+    - title: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-avf-pdr"
+      output-file-name: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-avf-pdr"
       data: "plot-ndrpdr-comparison-3n-skx"
-      include-tests: "NDR"
+      include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl1Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl1Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-x710-64b-2t1c-ip4-base-avf-dpdk-pdr"
-      output-file-name: "3n-skx-x710-64b-2t1c-ip4-base-avf-dpdk-pdr"
+    - title: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-avf-pdr"
+      output-file-name: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-avf-pdr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Copwhtlistbase-Ndrpdr.64B-2t1c-ethip4-ip4base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Iacldstbase-Ndrpdr.64B-2t1c-ethip4-ip4base-iacldstbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ipolicemarkbase-Ndrpdr.64B-2t1c-ethip4-ip4base-ipolicemarkbase-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-ndr"
+      output-file-name: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-ndr"
+      output-file-name: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-x710-64b-2t1c-ip4-scale-dpdk-pdr"
-      output-file-name: "3n-skx-x710-64b-2t1c-ip4-scale-dpdk-pdr"
+    - title: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-pdr"
+      output-file-name: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-pdr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-x710-64b-2t1c-ip4-features-dpdk-pdr"
-      output-file-name: "3n-skx-x710-64b-2t1c-ip4-features-dpdk-pdr"
+    - title: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-pdr"
+      output-file-name: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-pdr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl1Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl1Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-2t1c-ip4-base-avf-dpdk-ndr"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-base-avf-dpdk-ndr"
+# 3n-skx ip4
+
+    - title: "3n-skx-x710-64b-2t1c-ip4-base-scale-avf-ndr"
+      output-file-name: "3n-skx-x710-64b-2t1c-ip4-base-scale-avf-ndr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ipolicemarkbase-Ndrpdr.64B-2t1c-ethip4-ip4base-ipolicemarkbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-ndr"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-ndr"
+    - title: "3n-skx-x710-64b-2t1c-ip4-base-scale-avf-pdr"
+      output-file-name: "3n-skx-x710-64b-2t1c-ip4-base-scale-avf-pdr"
       data: "plot-ndrpdr-comparison-3n-skx"
-      include-tests: "NDR"
+      include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-2t1c-ip4-features-dpdk-ndr"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-features-dpdk-ndr"
+    - title: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-avf-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-avf-ndr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl1Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl1Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-avf-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-2t1c-ip4-base-avf-dpdk-pdr"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-base-avf-dpdk-pdr"
+    - title: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-dpdk-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-dpdk-ndr"
       data: "plot-ndrpdr-comparison-3n-skx"
-      include-tests: "PDR"
+      include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ipolicemarkbase-Ndrpdr.64B-2t1c-ethip4-ip4base-ipolicemarkbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-pdr"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-pdr"
+    - title: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-avf-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-avf-pdr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-avf-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-2t1c-ip4-features-dpdk-pdr"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-features-dpdk-pdr"
+    - title: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-dpdk-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-dpdk-pdr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl1Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl1Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
       layout: "plot-cpta"
 
 # 3n-skx ip4 tunnels
 
-    - title: "3n-skx-x710-64b-2t1c-ip4-tunnels-dot1q-base-dpdk-ndr"
-      output-file-name: "3n-skx-x710-64b-2t1c-ip4-tunnels-dot1q-base-dpdk-ndr"
+    - title: "3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-avf-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-avf-ndr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-2t1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Dot1Q--Ethip4Vxlan-L2Bdscale10L2Bd10Vlan10Vxlan-Ndrpdr.64B-2t1c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-2t1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Dot1Q--Ethip4Vxlan-L2Bdscale1Kl2Bd1Kvlan1Kvxlan-Ndrpdr.64B-2t1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-2t1c-avf-ethip4vxlan-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-2t1c-avf-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-2t1c-avf-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-x710-64b-2t1c-ip4-tunnels-eth-base-dpdk-ndr"
-      output-file-name: "3n-skx-x710-64b-2t1c-ip4-tunnels-eth-base-dpdk-ndr"
+    - title: "3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-dpdk-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-dpdk-ndr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Ethip4Lispip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4lispip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-2t1c-ethip4vxlan-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-2t1c-ethip4vxlan-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-x710-64b-2t1c-ip4-tunnels-dot1q-base-dpdk-pdr"
-      output-file-name: "3n-skx-x710-64b-2t1c-ip4-tunnels-dot1q-base-dpdk-pdr"
+    - title: "3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-avf-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-avf-pdr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-2t1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Dot1Q--Ethip4Vxlan-L2Bdscale10L2Bd10Vlan10Vxlan-Ndrpdr.64B-2t1c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-2t1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Dot1Q--Ethip4Vxlan-L2Bdscale1Kl2Bd1Kvlan1Kvxlan-Ndrpdr.64B-2t1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-2t1c-avf-ethip4vxlan-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-2t1c-avf-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-2t1c-avf-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-x710-64b-2t1c-ip4-tunnels-eth-base-dpdk-pdr"
-      output-file-name: "3n-skx-x710-64b-2t1c-ip4-tunnels-eth-base-dpdk-pdr"
+    - title: "3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-dpdk-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-dpdk-pdr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Ethip4Lispip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4lispip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-2t1c-ethip4vxlan-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-2t1c-ethip4vxlan-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
       layout: "plot-cpta"
 
 # 3n-skx ip6
 
-    - title: "3n-skx-x710-78b-2t1c-ip6-base-features-dpdk-ndr"
-      output-file-name: "3n-skx-x710-78b-2t1c-ip6-base-features-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-skx"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Copwhtlistbase-Ndrpdr.78B-2t1c-ethip6-ip6base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-2t1c-ethip6-ip6base-iacldstbase-ndrpdr"
-      layout: "plot-cpta"
-
     - title: "3n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-ndr"
       output-file-name: "3n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-ndr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-x710-78b-2t1c-ip6-base-features-dpdk-pdr"
-      output-file-name: "3n-skx-x710-78b-2t1c-ip6-base-features-dpdk-pdr"
+    - title: "3n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-pdr"
+      output-file-name: "3n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-pdr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Copwhtlistbase-Ndrpdr.78B-2t1c-ethip6-ip6base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-2t1c-ethip6-ip6base-iacldstbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-pdr"
-      output-file-name: "3n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-pdr"
+    - title: "3n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-ndr"
+      output-file-name: "3n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-ndr"
       data: "plot-ndrpdr-comparison-3n-skx"
-      include-tests: "PDR"
+      include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-avf-dot1q-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "    Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale200k-ndrpdr"
+        - "    Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk-ndr"
@@ -7218,11 +7023,20 @@
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+        - "    Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-pdr"
+      output-file-name: "3n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-avf-dot1q-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "    Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale200k-ndrpdr"
+        - "    Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk-pdr"
@@ -7230,77 +7044,32 @@
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+        - "    Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
       layout: "plot-cpta"
 
 # 3n-skx L2
 
-    - title: "3n-skx-x710-64b-2t1c-l2-base-avf-ndr"
-      output-file-name: "3n-skx-x710-64b-2t1c-l2-base-avf-ndr"
+    - title: "3n-skx-x710-64b-2t1c-l2-base-scale-avf-ndr"
+      output-file-name: "3n-skx-x710-64b-2t1c-l2-base-scale-avf-ndr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-x710-64b-2t1c-l2-base-dpdk-ndr"
-      output-file-name: "3n-skx-x710-64b-2t1c-l2-base-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-skx"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-x710-64b-2t1c-l2-base-scale-dpdk-ndr"
-      output-file-name: "3n-skx-x710-64b-2t1c-l2-base-scale-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-skx"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-x710-64b-2t1c-l2-base-avf-pdr"
-      output-file-name: "3n-skx-x710-64b-2t1c-l2-base-avf-pdr"
+    - title: "3n-skx-x710-64b-2t1c-l2-base-scale-avf-pdr"
+      output-file-name: "3n-skx-x710-64b-2t1c-l2-base-scale-avf-pdr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-x710-64b-2t1c-l2-base-dpdk-pdr"
-      output-file-name: "3n-skx-x710-64b-2t1c-l2-base-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-skx"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-x710-64b-2t1c-l2-base-scale-dpdk-pdr"
-      output-file-name: "3n-skx-x710-64b-2t1c-l2-base-scale-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-skx"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-64b-2t1c-l2-base-avf-ndr"
@@ -7308,31 +7077,22 @@
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-2t1c-l2-base-dpdk-ndr"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-l2-base-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-skx"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-2t1c-l2-base-scale-dpdk-ndr"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-l2-base-scale-dpdk-ndr"
+    - title: "3n-skx-xxv710-64b-2t1c-l2-scale-avf-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-l2-scale-avf-ndr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-64b-2t1c-l2-base-avf-pdr"
@@ -7340,20 +7100,33 @@
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-2t1c-l2-base-dpdk-pdr"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-l2-base-dpdk-pdr"
+    - title: "3n-skx-xxv710-64b-2t1c-l2-scale-avf-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-l2-scale-avf-pdr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-l2-base-scale-dpdk-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-l2-base-scale-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-64b-2t1c-l2-base-scale-dpdk-pdr"
@@ -7361,104 +7134,76 @@
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
-# 2n-skx VHost
+# 3n-skx srv6
 
-    - title: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-testpmd-ndr"
-      output-file-name: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-testpmd-ndr"
+    - title: "3n-skx-xxv710-78b-2t1c-srv6-base-avf-ndr"
+      output-file-name: "3n-skx-xxv710-78b-2t1c-srv6-base-avf-ndr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-2t1c-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-ndr"
-      output-file-name: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-ndr"
+    - title: "3n-skx-xxv710-78b-2t1c-srv6-base-avf-pdr"
+      output-file-name: "3n-skx-xxv710-78b-2t1c-srv6-base-avf-pdr"
       data: "plot-ndrpdr-comparison-3n-skx"
-      include-tests: "NDR"
+      include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-2t1c-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-x710-64b-2t1c-vhost-base-dpdk-testpmd-ndr"
-      output-file-name: "3n-skx-x710-64b-2t1c-vhost-base-dpdk-testpmd-ndr"
-      data: "plot-ndrpdr-comparison-3n-skx"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-      layout: "plot-cpta"
+# 3n-skx VHost
 
-    - title: "3n-skx-x710-64b-2t1c-vhost-base-dpdk-vpp-ndr"
-      output-file-name: "3n-skx-x710-64b-2t1c-vhost-base-dpdk-vpp-ndr"
+    - title: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-ndr"
+      output-file-name: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-ndr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-testpmd-pdr"
-      output-file-name: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-testpmd-pdr"
-      data: "plot-ndrpdr-comparison-3n-skx"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-pdr"
-      output-file-name: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-pdr"
+    - title: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-vpp-ndr"
+      output-file-name: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-vpp-ndr"
       data: "plot-ndrpdr-comparison-3n-skx"
-      include-tests: "PDR"
+      include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-x710-64b-2t1c-vhost-base-dpdk-testpmd-pdr"
-      output-file-name: "3n-skx-x710-64b-2t1c-vhost-base-dpdk-testpmd-pdr"
+    - title: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-pdr"
+      output-file-name: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-pdr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-x710-64b-2t1c-vhost-base-dpdk-vpp-pdr"
-      output-file-name: "3n-skx-x710-64b-2t1c-vhost-base-dpdk-vpp-pdr"
+    - title: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-vpp-pdr"
+      output-file-name: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-vpp-pdr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-ndr"
@@ -7470,16 +7215,7 @@
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-ndr"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-ndr"
-      data: "plot-ndrpdr-comparison-3n-skx"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-pdr"
@@ -7491,1208 +7227,279 @@
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-pdr"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-pdr"
+    - title: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-ndr"
       data: "plot-ndrpdr-comparison-3n-skx"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-      layout: "plot-cpta"
-
-# 3n-hsw memif
-
-    - title: "3n-hsw-x520-64b-1t1c-memif-base-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-memif-base-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-memif-base-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-memif-base-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-x710-64b-1t1c-memif-base-dpdk-ndr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-memif-base-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
+    - title: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-vpp-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-vpp-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X710-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-x710-64b-1t1c-memif-base-dpdk-pdr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-memif-base-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
+    - title: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X710-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.10Ge2P1X710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-64b-1t1c-memif-base-dpdk-ndr"
-      output-file-name: "3n-hsw-xl710-64b-1t1c-memif-base-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Container Memif.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-xl710-64b-1t1c-memif-base-dpdk-pdr"
-      output-file-name: "3n-hsw-xl710-64b-1t1c-memif-base-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
+    - title: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-vpp-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-vpp-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Container Memif.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
-      layout: "plot-cpta"
-
-# 3n-hsw ip4
-
-    - title: "3n-hsw-x520-64b-1t1c-ip4-base-features-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-base-features-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Dot1Q-Ip4Base-Ndrpdr.64B-1t1c-dot1q-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-Copwhtlistbase-Ndrpdr.64B-1t1c-ethip4-ip4base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-Iacldstbase-Ndrpdr.64B-1t1c-ethip4-ip4base-iacldstbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-Ipolicemarkbase-Ndrpdr.64B-1t1c-ethip4-ip4base-ipolicemarkbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4base-nat44-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-ip4-base-scale-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-base-scale-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale20K-Ndrpdr.64B-1t1c-ethip4-ip4scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale200K-Ndrpdr.64B-1t1c-ethip4-ip4scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-ip4-features-iacl1-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-features-iacl1-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl1Sf-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl1Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl1Sf-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl1Sl-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl1Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl1Sl-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-ip4-features-iacl10-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-features-iacl10-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl10Sf-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl10Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl10Sf-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl10Sl-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl10Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl10Sl-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-ip4-features-iacl50-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-features-iacl50-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sf-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sf-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-x520-64b-1t1c-ip4-features-oacl1-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-features-oacl1-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl1Sf-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl1Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl1Sf-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl1Sl-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl1Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl1Sl-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-ip4-features-oacl10-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-features-oacl10-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl10Sf-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl10Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl10Sf-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl10Sl-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl10Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl10Sl-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-ip4-features-oacl50-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-features-oacl50-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
+    - title: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-x520-64b-1t1c-ip4-features-udp-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-features-udp-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
+    - title: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Udpsrcscale15-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale10-Udpsrcscale15-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale100-Udpsrcscale15-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale2000-Udpsrcscale15-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale4000-Udpsrcscale15-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-ip4-base-features-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-base-features-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Dot1Q-Ip4Base-Ndrpdr.64B-1t1c-dot1q-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-Copwhtlistbase-Ndrpdr.64B-1t1c-ethip4-ip4base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-Iacldstbase-Ndrpdr.64B-1t1c-ethip4-ip4base-iacldstbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-Ipolicemarkbase-Ndrpdr.64B-1t1c-ethip4-ip4base-ipolicemarkbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4base-nat44-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-ip4-base-scale-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-base-scale-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale20K-Ndrpdr.64B-1t1c-ethip4-ip4scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale200K-Ndrpdr.64B-1t1c-ethip4-ip4scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-ip4-features-iacl1-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-features-iacl1-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl1Sf-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl1Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl1Sf-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl1Sl-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl1Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl1Sl-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-ip4-features-iacl10-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-features-iacl10-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl10Sf-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl10Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl10Sf-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl10Sl-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl10Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl10Sl-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-x520-64b-1t1c-ip4-features-iacl50-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-features-iacl50-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sf-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sf-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-ip4-features-oacl1-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-features-oacl1-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl1Sf-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl1Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl1Sf-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl1Sl-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl1Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl1Sl-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-ip4-features-oacl10-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-features-oacl10-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl10Sf-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl10Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl10Sf-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl10Sl-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl10Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl10Sl-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-ip4-features-oacl50-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-features-oacl50-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
+    - title: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-100Flows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-100Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-x520-64b-1t1c-ip4-features-udp-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-features-udp-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
+    - title: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Udpsrcscale15-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale10-Udpsrcscale15-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale100-Udpsrcscale15-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale2000-Udpsrcscale15-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale4000-Udpsrcscale15-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-x710-64b-1t1c-ip4-base-features-dpdk-ndr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-ip4-base-features-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-1t1c-dot1q-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Copwhtlistbase-Ndrpdr.64B-1t1c-ethip4-ip4base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Iacldstbase-Ndrpdr.64B-1t1c-ethip4-ip4base-iacldstbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ipolicemarkbase-Ndrpdr.64B-1t1c-ethip4-ip4base-ipolicemarkbase-ndrpdr"
-      layout: "plot-cpta"
+# 3n-hsw ipsec
 
-    - title: "3n-hsw-x710-64b-1t1c-ip4-base-scale-dpdk-ndr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-ip4-base-scale-dpdk-ndr"
+    - title: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk-ndr"
+      output-file-name: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk-ndr"
       data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale20K-Ndrpdr.64B-1t1c-ethip4-ip4scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale200K-Ndrpdr.64B-1t1c-ethip4-ip4scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-x710-64b-1t1c-ip4-features-udp-dpdk-ndr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-ip4-features-udp-dpdk-ndr"
+    - title: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk-ndr"
+      output-file-name: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk-ndr"
       data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl1Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl1Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4base-nat44-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-x710-64b-1t1c-ip4-base-features-dpdk-pdr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-ip4-base-features-dpdk-pdr"
+    - title: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk-pdr"
+      output-file-name: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk-pdr"
       data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-1t1c-dot1q-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Copwhtlistbase-Ndrpdr.64B-1t1c-ethip4-ip4base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Iacldstbase-Ndrpdr.64B-1t1c-ethip4-ip4base-iacldstbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ipolicemarkbase-Ndrpdr.64B-1t1c-ethip4-ip4base-ipolicemarkbase-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-x710-64b-1t1c-ip4-base-scale-dpdk-pdr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-ip4-base-scale-dpdk-pdr"
+    - title: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk-pdr"
+      output-file-name: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk-pdr"
       data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale20K-Ndrpdr.64B-1t1c-ethip4-ip4scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale200K-Ndrpdr.64B-1t1c-ethip4-ip4scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-x710-64b-1t1c-ip4-features-udp-dpdk-pdr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-ip4-features-udp-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl1Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl1Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4base-nat44-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
-      layout: "plot-cpta"
+# 3n-hsw ip4
 
-    - title: "3n-hsw-xl710-64b-1t1c-ip4-base-dpdk-ndr"
-      output-file-name: "3n-hsw-xl710-64b-1t1c-ip4-base-dpdk-ndr"
+    - title: "3n-hsw-xl710-64b-1t1c-ip4-base-scale-dpdk-ndr"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-ip4-base-scale-dpdk-ndr"
       data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "NDR"
       include:
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-1t1c-dot1q-ip4base-ndrpdr"
         - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-xl710-64b-1t1c-ip4-base-dpdk-pdr"
-      output-file-name: "3n-hsw-xl710-64b-1t1c-ip4-base-dpdk-pdr"
+    - title: "3n-hsw-xl710-64b-1t1c-ip4-base-scale-dpdk-pdr"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-ip4-base-scale-dpdk-pdr"
       data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "PDR"
       include:
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-1t1c-dot1q-ip4base-ndrpdr"
         - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
       layout: "plot-cpta"
 
 # 3n-hsw ip4 tunnels
 
-    - title: "3n-hsw-x520-64b-1t1c-ip4-tunnels-dot1q-base-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-tunnels-dot1q-base-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale10L2Bd10Vlan10Vxlan-Ndrpdr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale1Kl2Bd1Kvlan1Kvxlan-Ndrpdr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-ip4-tunnels-eth-base-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-tunnels-eth-base-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Lispip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4lispip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Lispip6-Ip4Base-Ndrpdr.64B-1t1c-ethip4lispip6-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-1t1c-ethip4vxlan-l2xcbase-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-ip4-tunnels-dot1q-base-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-tunnels-dot1q-base-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale10L2Bd10Vlan10Vxlan-Ndrpdr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale1Kl2Bd1Kvlan1Kvxlan-Ndrpdr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-ip4-tunnels-eth-base-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-ip4-tunnels-eth-base-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Lispip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4lispip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Lispip6-Ip4Base-Ndrpdr.64B-1t1c-ethip4lispip6-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-1t1c-ethip4vxlan-l2xcbase-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-1t1c-ip4-tunnels-dot1q-base-dpdk-ndr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-ip4-tunnels-dot1q-base-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Dot1Q--Ethip4Vxlan-L2Bdscale10L2Bd10Vlan10Vxlan-Ndrpdr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Dot1Q--Ethip4Vxlan-L2Bdscale1Kl2Bd1Kvlan1Kvxlan-Ndrpdr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-1t1c-ip4-tunnels-eth-base-dpdk-ndr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-ip4-tunnels-eth-base-dpdk-ndr"
+    - title: "3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-ndr"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-ndr"
       data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Ethip4Lispip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4lispip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-1t1c-ethip4vxlan-l2xcbase-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-1t1c-ip4-tunnels-dot1q-base-dpdk-pdr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-ip4-tunnels-dot1q-base-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Dot1Q--Ethip4Vxlan-L2Bdscale10L2Bd10Vlan10Vxlan-Ndrpdr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Dot1Q--Ethip4Vxlan-L2Bdscale1Kl2Bd1Kvlan1Kvxlan-Ndrpdr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr"
+      - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-1t1c-ethip4vxlan-l2xcbase-ndrpdr"
+      - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-x710-64b-1t1c-ip4-tunnels-eth-base-dpdk-pdr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-ip4-tunnels-eth-base-dpdk-pdr"
+    - title: "3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-pdr"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-pdr"
       data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Ethip4Lispip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4lispip4-ip4base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-1t1c-ethip4vxlan-l2xcbase-ndrpdr"
+      - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-1t1c-ethip4vxlan-l2xcbase-ndrpdr"
+      - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
       layout: "plot-cpta"
 
 # 3n-hsw ip6
 
-    - title: "3n-hsw-x520-78b-1t1c-ip6-base-features-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-78b-1t1c-ip6-base-features-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Base-Copwhtlistbase-Ndrpdr.78B-1t1c-ethip6-ip6base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-1t1c-ethip6-ip6base-iacldstbase-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-78b-1t1c-ip6-base-scale-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-78b-1t1c-ip6-base-scale-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale20K-Ndrpdr.78B-1t1c-ethip6-ip6scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale200K-Ndrpdr.78B-1t1c-ethip6-ip6scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-78b-1t1c-ip6-base-features-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-78b-1t1c-ip6-base-features-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Base-Copwhtlistbase-Ndrpdr.78B-1t1c-ethip6-ip6base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-1t1c-ethip6-ip6base-iacldstbase-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-78b-1t1c-ip6-base-scale-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-78b-1t1c-ip6-base-scale-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale20K-Ndrpdr.78B-1t1c-ethip6-ip6scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale200K-Ndrpdr.78B-1t1c-ethip6-ip6scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-78b-1t1c-ip6-base-features-dpdk-ndr"
-      output-file-name: "3n-hsw-x710-78b-1t1c-ip6-base-features-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Copwhtlistbase-Ndrpdr.78B-1t1c-ethip6-ip6base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-1t1c-ethip6-ip6base-iacldstbase-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-78b-1t1c-ip6-base-scale-dpdk-ndr"
-      output-file-name: "3n-hsw-x710-78b-1t1c-ip6-base-scale-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale20K-Ndrpdr.78B-1t1c-ethip6-ip6scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale200K-Ndrpdr.78B-1t1c-ethip6-ip6scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-78b-1t1c-ip6-base-features-dpdk-pdr"
-      output-file-name: "3n-hsw-x710-78b-1t1c-ip6-base-features-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Copwhtlistbase-Ndrpdr.78B-1t1c-ethip6-ip6base-copwhtlistbase-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-1t1c-ethip6-ip6base-iacldstbase-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-78b-1t1c-ip6-base-scale-dpdk-pdr"
-      output-file-name: "3n-hsw-x710-78b-1t1c-ip6-base-scale-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale20K-Ndrpdr.78B-1t1c-ethip6-ip6scale20k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale200K-Ndrpdr.78B-1t1c-ethip6-ip6scale200k-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-78b-1t1c-ip6-base-dpdk-ndr"
-      output-file-name: "3n-hsw-xl710-78b-1t1c-ip6-base-dpdk-ndr"
+    - title: "3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-ndr"
+      output-file-name: "3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-ndr"
       data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "NDR"
       include:
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-xl710-78b-1t1c-ip6-base-dpdk-pdr"
-      output-file-name: "3n-hsw-xl710-78b-1t1c-ip6-base-dpdk-pdr"
+    - title: "3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-pdr"
+      output-file-name: "3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-pdr"
       data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "PDR"
       include:
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
-      layout: "plot-cpta"
-
-# 3n-hsw ip6 tunnels
-
-    - title: "3n-hsw-x520-78b-1t1c-ip6-tunnels-eth-base-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-78b-1t1c-ip6-tunnels-eth-base-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Ip6 Tunnels.10Ge2P1X520-Ethip6Lispip4-Ip6Base-Ndrpdr.78B-1t1c-ethip6lispip4-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6 Tunnels.10Ge2P1X520-Ethip6Lispip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6lispip6-ip6base-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-78b-1t1c-ip6-tunnels-eth-base-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-78b-1t1c-ip6-tunnels-eth-base-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Ip6 Tunnels.10Ge2P1X520-Ethip6Lispip4-Ip6Base-Ndrpdr.78B-1t1c-ethip6lispip4-ip6base-ndrpdr"
-        - "Tests.Vpp.Perf.Ip6 Tunnels.10Ge2P1X520-Ethip6Lispip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6lispip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr"
       layout: "plot-cpta"
 
 # 3n-hsw l2
 
-    - title: "3n-hsw-vic1227-64b-1t1c-l2-base-dpdk-ndr"
-      output-file-name: "3n-hsw-vic1227-64b-1t1c-l2-base-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1Vic1227-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-vic1227-64b-1t1c-l2-base-dpdk-pdr"
-      output-file-name: "3n-hsw-vic1227-64b-1t1c-l2-base-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1Vic1227-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-vic1385-64b-1t1c-l2-base-dpdk-ndr"
-      output-file-name: "3n-hsw-vic1385-64b-1t1c-l2-base-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.40Ge2P1Vic1385-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-vic1385-64b-1t1c-l2-base-dpdk-pdr"
-      output-file-name: "3n-hsw-vic1385-64b-1t1c-l2-base-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.40Ge2P1Vic1385-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-base-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-base-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Ad-L2Xcbase-Ndrpdr.64B-1t1c-dot1ad-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-base-scale-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-base-scale-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale10kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale100kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale1mmaclrn-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-features-iacl1-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-features-iacl1-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl1Sf-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl1Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl1Sf-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl1Sl-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl1Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl1Sl-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-features-iacl10-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-features-iacl10-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl10Sf-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl10Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl10Sf-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl10Sl-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl10Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl10Sl-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-features-iacl50-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-features-iacl50-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sf-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sf-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sl-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sl-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-features-oacl1-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-features-oacl1-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl1Sf-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl1Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl1Sf-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl1Sl-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl1Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl1Sl-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-features-oacl10-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-features-oacl10-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl10Sf-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl10Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl10Sf-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl10Sl-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl10Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl10Sl-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-features-oacl50-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-features-oacl50-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sf-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sf-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sl-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sl-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-features-macip-iacl1-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-features-macip-iacl1-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl1Sl-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl1Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl1Sl-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-features-macip-iacl10-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-features-macip-iacl10-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl10Sl-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl10Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl10Sl-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-features-macip-iacl50-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-features-macip-iacl50-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-base-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-base-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Ad-L2Xcbase-Ndrpdr.64B-1t1c-dot1ad-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-base-scale-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-base-scale-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale10kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale100kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale1mmaclrn-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-features-iacl1-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-features-iacl1-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl1Sf-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl1Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl1Sf-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl1Sl-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl1Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl1Sl-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-features-iacl10-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-features-iacl10-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl10Sf-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl10Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl10Sf-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl10Sl-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl10Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl10Sl-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-features-iacl50-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-features-iacl50-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sf-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sf-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sl-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sl-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-features-oacl1-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-features-oacl1-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl1Sf-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl1Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl1Sf-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl1Sl-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl1Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl1Sl-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-features-oacl10-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-features-oacl10-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl10Sf-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl10Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl10Sf-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl10Sl-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl10Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl10Sl-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-features-oacl50-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-features-oacl50-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sf-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sf-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sl-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sl-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-features-macip-iacl1-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-features-macip-iacl1-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl1Sl-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl1Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl1Sl-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-features-macip-iacl10-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-features-macip-iacl10-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl10Sl-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl10Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl10Sl-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-l2-features-macip-iacl50-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-l2-features-macip-iacl50-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-100Flows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-100Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-1t1c-l2-base-dpdk-ndr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-l2-base-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-1t1c-eth-l2patch-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-1t1c-l2-base-scale-dpdk-ndr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-l2-base-scale-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale10kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale100kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale1mmaclrn-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-1t1c-l2-features-iacl1-dpdk-ndr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-l2-features-iacl1-dpdk-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Iacl1Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Iacl1Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-1t1c-l2-base-dpdk-pdr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-l2-base-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-1t1c-eth-l2patch-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-1t1c-l2-base-scale-dpdk-pdr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-l2-base-scale-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale10kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale100kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale1mmaclrn-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-1t1c-l2-features-iacl1-dpdk-pdr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-l2-features-iacl1-dpdk-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Iacl1Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Iacl1Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-64b-1t1c-l2-base-dpdk-ndr"
-      output-file-name: "3n-hsw-xl710-64b-1t1c-l2-base-dpdk-ndr"
+    - title: "3n-hsw-xl710-64b-1t1c-l2-base-scale-dpdk-ndr"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-l2-base-scale-dpdk-ndr"
       data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "NDR"
       include:
         - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-1t1c-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
         - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
         - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-xl710-64b-1t1c-l2-base-dpdk-pdr"
-      output-file-name: "3n-hsw-xl710-64b-1t1c-l2-base-dpdk-pdr"
+    - title: "3n-hsw-xl710-64b-1t1c-l2-base-scale-dpdk-pdr"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-l2-base-scale-dpdk-pdr"
       data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "PDR"
       include:
         - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-1t1c-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
         - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
         - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
 # 3n-hsw srv6
 
-    - title: "3n-hsw-x520-64b-1t1c-srv6-base-dpdk-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-srv6-base-dpdk-ndr"
+    - title: "3n-hsw-xl710-78b-1t1c-srv6-base-dpdk-ndr"
+      output-file-name: "3n-hsw-xl710-78b-1t1c-srv6-base-dpdk-ndr"
       data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-x520-64b-1t1c-srv6-base-dpdk-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-srv6-base-dpdk-pdr"
+    - title: "3n-hsw-xl710-78b-1t1c-srv6-base-dpdk-pdr"
+      output-file-name: "3n-hsw-xl710-78b-1t1c-srv6-base-dpdk-pdr"
       data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
       layout: "plot-cpta"
 
 # 3n-hsw vhost
 
-    - title: "3n-hsw-x520-64b-1t1c-link-bonding-vhost-base-dpdk-testpmd-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-link-bonding-vhost-base-dpdk-testpmd-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-link-bonding-vhost-base-dpdk-vpp-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-link-bonding-vhost-base-dpdk-vpp-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-vhost-base-dpdk-testpmd-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-vhost-base-dpdk-testpmd-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-vhost-base-dpdk-vpp-ndr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-vhost-base-dpdk-vpp-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-link-bonding-vhost-base-dpdk-testpmd-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-link-bonding-vhost-base-dpdk-testpmd-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-link-bonding-vhost-base-dpdk-vpp-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-link-bonding-vhost-base-dpdk-vpp-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-vhost-base-dpdk-testpmd-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-vhost-base-dpdk-testpmd-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x520-64b-1t1c-vhost-base-dpdk-vpp-pdr"
-      output-file-name: "3n-hsw-x520-64b-1t1c-vhost-base-dpdk-vpp-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-1t1c-link-bonding-vhost-base-dpdk-testpmd-ndr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-link-bonding-vhost-base-dpdk-testpmd-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-1t1c-link-bonding-vhost-base-dpdk-vpp-ndr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-link-bonding-vhost-base-dpdk-vpp-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-1t1c-vhost-base-dpdk-testpmd-ndr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-vhost-base-dpdk-testpmd-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-1t1c-vhost-base-dpdk-vpp-ndr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-vhost-base-dpdk-vpp-ndr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "NDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-1t1c-link-bonding-vhost-base-dpdk-testpmd-pdr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-link-bonding-vhost-base-dpdk-testpmd-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-1t1c-link-bonding-vhost-base-dpdk-vpp-pdr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-link-bonding-vhost-base-dpdk-vpp-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-1t1c-vhost-base-dpdk-testpmd-pdr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-vhost-base-dpdk-testpmd-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-1t1c-vhost-base-dpdk-vpp-pdr"
-      output-file-name: "3n-hsw-x710-64b-1t1c-vhost-base-dpdk-vpp-pdr"
-      data: "plot-ndrpdr-comparison-3n-hsw"
-      include-tests: "PDR"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-      layout: "plot-cpta"
-
     - title: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-testpmd-ndr"
       output-file-name: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-testpmd-ndr"
       data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "NDR"
       include:
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
     - title: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-vpp-ndr"
@@ -8700,7 +7507,11 @@
       data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr10241Vm-Vppl2Xc-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1V-m-Vppl2Xc-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
       layout: "plot-cpta"
 
     - title: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-testpmd-pdr"
@@ -8708,7 +7519,11 @@
       data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "PDR"
       include:
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
     - title: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-vpp-pdr"
@@ -8716,5 +7531,9 @@
       data: "plot-ndrpdr-comparison-3n-hsw"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr10241Vm-Vppl2Xc-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1V-m-Vppl2Xc-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
       layout: "plot-cpta"