From f3c2a4d8551c1ac0d05ebff4f5e7f492fb2e80d6 Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Thu, 2 Apr 2020 16:08:32 +0200
Subject: [PATCH] Trending: Update graphs - 2n-clx

Change-Id: I05a61b075c467681f2e05b17f0245a5e77a911b5
Signed-off-by: Tibor Frank <tifrank@cisco.com>
---
 .../trending/container_memif-2n-clx-xxv710.rst     |  51 ++-
 docs/cpta/trending/ip4-2n-clx-x710.rst             |   7 -
 docs/cpta/trending/ip4-2n-clx-xxv710.rst           | 136 ++++--
 docs/cpta/trending/ip6-2n-clx-x710.rst             |  20 +-
 docs/cpta/trending/ip6-2n-clx-xxv710.rst           |  55 ++-
 docs/cpta/trending/l2-2n-clx-x710.rst              |  75 +++-
 docs/cpta/trending/l2-2n-clx-xxv710.rst            |  65 ++-
 docs/cpta/trending/vhost-2n-clx-xxv710.rst         | 102 ++++-
 docs/cpta/trending/vts-2n-clx-xxv710.rst           |  50 +++
 resources/tools/presentation/generator_cpta.py     |   2 +-
 resources/tools/presentation/generator_tables.py   |  15 +-
 .../tools/presentation/specification_CPTA.yaml     | 485 +++++++++++++++++----
 12 files changed, 846 insertions(+), 217 deletions(-)
 create mode 100644 docs/cpta/trending/vts-2n-clx-xxv710.rst

diff --git a/docs/cpta/trending/container_memif-2n-clx-xxv710.rst b/docs/cpta/trending/container_memif-2n-clx-xxv710.rst
index f6110c2672..8db3ab05e5 100644
--- a/docs/cpta/trending/container_memif-2n-clx-xxv710.rst
+++ b/docs/cpta/trending/container_memif-2n-clx-xxv710.rst
@@ -1,14 +1,53 @@
 2n-clx-xxv710
 -------------
 
-64b-memif-base-dpdk
+64b-memif-base-avf
 ```````````````````
 
-..
-    2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-mrr
-    2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr
-    2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr
-    2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-mrr
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-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-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.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-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-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-4t2c-memif-base-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. 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-memif-base-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-memif-base-dpdk
+```````````````````
 
 2t1c
 ::::
diff --git a/docs/cpta/trending/ip4-2n-clx-x710.rst b/docs/cpta/trending/ip4-2n-clx-x710.rst
index 24b0da5a0b..db347f4c29 100644
--- a/docs/cpta/trending/ip4-2n-clx-x710.rst
+++ b/docs/cpta/trending/ip4-2n-clx-x710.rst
@@ -4,13 +4,6 @@
 64b-ip4routing-base-scale-avf-dpdk
 ``````````````````````````````````
 
-..
-    2n1l-10ge2p1x710-avf-ethip4-ip4base-mrr
-    2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-mrr
-    2n1l-10ge2p1x710-dot1q-ip4base-mrr
-    2n1l-10ge2p1x710-ethip4-ip4base-mrr
-    2n1l-10ge2p1x710-ethip4-ip4scale2m-mrr
-
 2t1c
 ::::
 
diff --git a/docs/cpta/trending/ip4-2n-clx-xxv710.rst b/docs/cpta/trending/ip4-2n-clx-xxv710.rst
index 8cf99a3a1e..c7b4af245b 100644
--- a/docs/cpta/trending/ip4-2n-clx-xxv710.rst
+++ b/docs/cpta/trending/ip4-2n-clx-xxv710.rst
@@ -1,15 +1,8 @@
 2n-clx-xxv710
 -------------
 
-64b-ip4routing-base-scale-avf
-`````````````````````````````
-
-..
-    2n1l-25ge2p1xxv710-avf-dot1q-ip4base-mrr
-    2n1l-25ge2p1xxv710-avf-ethip4-ip4base-mrr
-    2n1l-25ge2p1xxv710-avf-ethip4-ip4scale20k-mrr
-    2n1l-25ge2p1xxv710-avf-ethip4-ip4scale200k-mrr
-    2n1l-25ge2p1xxv710-avf-ethip4-ip4scale2m-mrr
+64b-ip4routing-base-avf
+```````````````````````
 
 2t1c
 ::::
@@ -17,12 +10,11 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf"></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-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-scale-avf.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4-base-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -32,12 +24,11 @@
 .. raw:: html
 
     <a name="64b-4t2c-base-avf"></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-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-scale-avf.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-4t2c-ip4-base-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -47,24 +38,16 @@
 .. raw:: html
 
     <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-xxv710-64b-8t4c-ip4-base-scale-avf.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>
 
-64b-ip4routing-base-scale-dpdk
-``````````````````````````````
-
-..
-    2n1l-25ge2p1xxv710-dot1q-ip4base-mrr
-    2n1l-25ge2p1xxv710-ethip4-ip4base-mrr
-    2n1l-25ge2p1xxv710-ethip4-ip4scale20k-mrr
-    2n1l-25ge2p1xxv710-ethip4-ip4scale200k-mrr
-    2n1l-25ge2p1xxv710-ethip4-ip4scale2m-mrr
+64b-ip4routing-base-dpdk
+````````````````````````
 
 2t1c
 ::::
@@ -72,12 +55,11 @@
 .. 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-xxv710-64b-2t1c-ip4-base-scale-dpdk.html"></iframe>
+    <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>
 
@@ -87,12 +69,11 @@
 .. 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-xxv710-64b-4t2c-ip4-base-scale-dpdk.html"></iframe>
+    <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>
 
@@ -102,26 +83,107 @@
 .. 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>
+    <p><br></p>
+    </center>
+
+64b-ip4routing-scale-avf
+````````````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <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-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.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <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-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-4t2c-ip4-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <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-xxv710-64b-8t4c-ip4-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-ip4routing-scale-dpdk
+`````````````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <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-xxv710-64b-2t1c-ip4-scale-dpdk.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <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-xxv710-64b-4t2c-ip4-scale-dpdk.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
     <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-xxv710-64b-8t4c-ip4-base-scale-dpdk.html"></iframe>
+    <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
 `````````````````````````````````
 
-..
-    2n1l-25ge2p1xxv710-ethip4-ip4base-mrr
-    2n1l-25ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-mrr
-    2n1l-25ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-mrr
-    2n1l-25ge2p1xxv710-ethip4udp-ip4base-oacl50sf-10kflows-mrr
-    2n1l-25ge2p1xxv710-ethip4udp-ip4base-oacl50sl-10kflows-mrr
-    2n1l-25ge2p1xxv710-ethip4udp-ip4base-nat44-mrr
-
 2t1c
 ::::
 
diff --git a/docs/cpta/trending/ip6-2n-clx-x710.rst b/docs/cpta/trending/ip6-2n-clx-x710.rst
index 3a927cfd2f..02c717c253 100644
--- a/docs/cpta/trending/ip6-2n-clx-x710.rst
+++ b/docs/cpta/trending/ip6-2n-clx-x710.rst
@@ -1,12 +1,8 @@
 2n-clx-x710
 -----------
 
-78b-ip6routing-base-scale-dpdk
-``````````````````````````````
-
-..
-    2n1l-10ge2p1x710-ethip6-ip6base-mrr
-    2n1l-10ge2p1x710-ethip6-ip6scale2m-mrr
+78b-ip6routing-base-scale-avf-dpdk
+``````````````````````````````````
 
 2t1c
 ::::
@@ -15,11 +11,13 @@
 
     <a name="78b-2t1c-base-dpdk"></a>
     <a name="78b-2t1c-scale-dpdk"></a>
+    <a name="78b-2t1c-base-avf"></a>
+    <a name="78b-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-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.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-78b-2t1c-ip6-base-scale-avf-dpdk.html"></iframe>
     <p><br></p>
     </center>
 
@@ -30,11 +28,13 @@
 
     <a name="78b-4t2c-base-dpdk"></a>
     <a name="78b-4t2c-scale-dpdk"></a>
+    <a name="78b-4t2c-base-avf"></a>
+    <a name="78b-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-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-78b-4t2c-ip6-base-scale-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-78b-4t2c-ip6-base-scale-avf-dpdk.html"></iframe>
     <p><br></p>
     </center>
 
@@ -45,10 +45,12 @@
 
     <a name="78b-8t4c-base-dpdk"></a>
     <a name="78b-8t4c-scale-dpdk"></a>
+    <a name="78b-8t4c-base-avf"></a>
+    <a name="78b-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-78b-8t4c-ip6-base-scale-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-78b-8t4c-ip6-base-scale-avf-dpdk.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6-2n-clx-xxv710.rst b/docs/cpta/trending/ip6-2n-clx-xxv710.rst
index befa0e245b..41619cc08c 100644
--- a/docs/cpta/trending/ip6-2n-clx-xxv710.rst
+++ b/docs/cpta/trending/ip6-2n-clx-xxv710.rst
@@ -1,15 +1,56 @@
 2n-clx-xxv710
 -------------
 
-78b-ip6routing-base-scale-dpdk
+78b-ip6routing-base-scale-avf
 ``````````````````````````````
 
-..
-    2n1l-25ge2p1xxv710-dot1q-ip6base-mrr
-    2n1l-25ge2p1xxv710-ethip6-ip6base-mrr
-    2n1l-25ge2p1xxv710-ethip6-ip6scale20k-mrr
-    2n1l-25ge2p1xxv710-ethip6-ip6scale200k-mrr
-    2n1l-25ge2p1xxv710-ethip6-ip6scale2m-mrr
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="78b-2t1c-base-avf"></a>
+    <a name="78b-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-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.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="78b-4t2c-base-avf"></a>
+    <a name="78b-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-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-78b-4t2c-ip6-base-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="78b-8t4c-base-avf"></a>
+    <a name="78b-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-xxv710-78b-8t4c-ip6-base-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+78b-ip6routing-base-scale-dpdk
+``````````````````````````````
 
 2t1c
 ::::
diff --git a/docs/cpta/trending/l2-2n-clx-x710.rst b/docs/cpta/trending/l2-2n-clx-x710.rst
index 0f49501865..dfc178107f 100644
--- a/docs/cpta/trending/l2-2n-clx-x710.rst
+++ b/docs/cpta/trending/l2-2n-clx-x710.rst
@@ -1,31 +1,70 @@
 2n-clx-x710
 -----------
 
+64b-l2switching-base-scale-avf
+``````````````````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf"></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-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-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-avf"></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-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-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <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
 ```````````````````````````````````
 
-..
-    2n1l-10ge2p1x710-avf-eth-l2xcbase-mrr
-    2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-mrr
-    2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-mrr
-    2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-mrr
-    2n1l-10ge2p1x710-eth-l2bdbasemaclrn-mrr
-    2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-mrr
-
 2t1c
 ::::
 
 .. 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-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-avf-dpdk.html"></iframe>
+    <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>
 
@@ -34,15 +73,13 @@
 
 .. 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-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-avf-dpdk.html"></iframe>
+    <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>
 
@@ -51,14 +88,12 @@
 
 .. 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-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-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-64b-8t4c-l2-base-scale-dpdk.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-2n-clx-xxv710.rst b/docs/cpta/trending/l2-2n-clx-xxv710.rst
index 75c6f84268..0b6875c52b 100644
--- a/docs/cpta/trending/l2-2n-clx-xxv710.rst
+++ b/docs/cpta/trending/l2-2n-clx-xxv710.rst
@@ -4,13 +4,6 @@
 64b-l2switching-base-avf
 ````````````````````````
 
-..
-    2n1l-25ge2p1xxv710-avf-eth-l2patch-mrr
-    2n1l-25ge2p1xxv710-avf-eth-l2xcbase-mrr
-    2n1l-25ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-mrr
-    2n1l-25ge2p1xxv710-avf-eth-l2bdbasemaclrn-mrr
-    2n1l-25ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-gbp-mrr
-
 2t1c
 ::::
 
@@ -56,13 +49,6 @@
 64b-l2switching-base-dpdk
 `````````````````````````
 
-..
-    2n1l-25ge2p1xxv710-eth-l2patch-mrr
-    2n1l-25ge2p1xxv710-dot1q-l2xcbase-mrr
-    2n1l-25ge2p1xxv710-eth-l2xcbase-mrr
-    2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-mrr
-    2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-mrr
-
 2t1c
 ::::
 
@@ -105,15 +91,54 @@
     <p><br></p>
     </center>
 
+64b-l2switching-base-scale-avf
+``````````````````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <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-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-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <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-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-64b-4t2c-l2-base-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <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-xxv710-64b-8t4c-l2-base-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
 64b-l2switching-base-scale-dpdk
 ```````````````````````````````
 
-..
-    2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-mrr
-    2n1l-25ge2p1xxv710-eth-l2bdscale10kmaclrn-mrr
-    2n1l-25ge2p1xxv710-eth-l2bdscale100kmaclrn-mrr
-    2n1l-25ge2p1xxv710-eth-l2bdscale1mmaclrn-mrr
-
 2t1c
 ::::
 
diff --git a/docs/cpta/trending/vhost-2n-clx-xxv710.rst b/docs/cpta/trending/vhost-2n-clx-xxv710.rst
index e122838016..06f1709469 100644
--- a/docs/cpta/trending/vhost-2n-clx-xxv710.rst
+++ b/docs/cpta/trending/vhost-2n-clx-xxv710.rst
@@ -1,15 +1,99 @@
 2n-clx-xxv710
 -------------
 
+64b-vhost-base-avf-testpmd
+``````````````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-vhost-base-avf-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-avf-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-vhost-base-avf-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-avf-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-vhost-base-avf-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-vhost-base-avf-vpp
+``````````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-vhost-base-avf-vpp.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-avf-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-vhost-base-avf-vpp.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-avf-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/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-vhost-base-avf-vpp.html"></iframe>
+    <p><br></p>
+    </center>
+
 64b-vhost-base-dpdk-testpmd
 ```````````````````````````
 
-..
-    2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr
-    2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
-    2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
-    2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr
-
 2t1c
 ::::
 
@@ -55,12 +139,6 @@
 64b-vhost-base-dpdk-vpp
 ```````````````````````
 
-..
-    2n1l-25ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
-    2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
-    2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
-    2n1l-25ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-mrr
-
 2t1c
 ::::
 
diff --git a/docs/cpta/trending/vts-2n-clx-xxv710.rst b/docs/cpta/trending/vts-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..5ea1f1e76d
--- /dev/null
+++ b/docs/cpta/trending/vts-2n-clx-xxv710.rst
@@ -0,0 +1,50 @@
+2n-clx-xxv710
+-------------
+
+114b-vts-l2switching-base-avf-dpdk
+``````````````````````````````````
+
+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-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-dpdk.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. 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-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-114b-4t2c-vts-l2switching-base-avf-dpdk.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. 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-clx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-114b-8t4c-vts-l2switching-base-avf-dpdk.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/resources/tools/presentation/generator_cpta.py b/resources/tools/presentation/generator_cpta.py
index 430452149e..8d10e15a49 100644
--- a/resources/tools/presentation/generator_cpta.py
+++ b/resources/tools/presentation/generator_cpta.py
@@ -247,7 +247,7 @@ def _generate_trending_traces(in_data, job_name, build_info,
             u"symbol": u"circle",
         },
         text=hover_text,
-        hoverinfo=u"text"
+        hoverinfo=u"text+name"
     )
     traces = [trace_samples, ]
 
diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 0edf4da190..e5309429bf 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -567,25 +567,14 @@ def _tpc_generate_html_table(header, data, out_file_name, legend=u"",
             go.layout.Updatemenu(
                 type=u"dropdown",
                 direction=u"down",
-                x=0.0,  # 0.03,
+                x=0.0,
                 xanchor=u"left",
                 y=1.045,
                 yanchor=u"top",
                 active=len(menu_items) - 1,
                 buttons=list(buttons)
             )
-        ],
-        # annotations=[
-        #     go.layout.Annotation(
-        #         text=u"<b>Sort by:</b>",
-        #         x=0,
-        #         xref=u"paper",
-        #         y=1.035,
-        #         yref=u"paper",
-        #         align=u"left",
-        #         showarrow=False
-        #     )
-        # ]
+        ]
     )
 
     ploff.plot(
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 44df9e9e04..25f1dda030 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -1778,6 +1778,36 @@
 
 ################################################################################
 
+    - title: "2n-clx-xxv710-64b-2t1c-memif-base-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-memif-base-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-memif-base-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-memif-base-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-4t2c-avf-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-4t2c-avf-ethip4-ip4base-eth-2memif-1dcr-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-memif-base-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-memif-base-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-8t4c-avf-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-8t4c-avf-ethip4-ip4base-eth-2memif-1dcr-mrr"
+      layout: "plot-cpta"
+
     - title: "2n-clx-xxv710-64b-2t1c-memif-base-dpdk"
       output-file-name: "2n-clx-xxv710-64b-2t1c-memif-base-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
@@ -2001,96 +2031,192 @@
       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"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-mrr.64B-2t1c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-x710-64b-4t2c-ip4routing-base-scale-avf-dpdk"
       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"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-mrr.64B-4t2c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-x710-64b-8t4c-ip4routing-base-scale-avf-dpdk"
       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"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-mrr.64B-8t4c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-avf"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-scale-avf"
+    - title: "2n-clx-xxv710-64b-2t1c-ip4routing-base-avf"
+      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"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-ip4routing-base-avf"
+      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"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-ip4routing-base-avf"
+      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"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-ip4routing-scale-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-mrr.64B-2t1c-avf-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-2t1c-avf-ethip4-ip4scale20k-rnd-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-mrr.64B-2t1c-avf-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-2t1c-avf-ethip4-ip4scale200k-rnd-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-mrr.64B-2t1c-avf-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-4t2c-ip4routing-base-scale-avf"
-      output-file-name: "2n-clx-xxv710-64b-4t2c-ip4-base-scale-avf"
+    - title: "2n-clx-xxv710-64b-4t2c-ip4routing-scale-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-ip4-scale-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-4t2c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-mrr.64B-4t2c-avf-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-4t2c-avf-ethip4-ip4scale20k-rnd-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-mrr.64B-4t2c-avf-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-4t2c-avf-ethip4-ip4scale200k-rnd-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-mrr.64B-4t2c-avf-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-4t2c-avf-ethip4-ip4scale2m-rnd-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-8t4c-ip4routing-base-scale-avf"
-      output-file-name: "2n-clx-xxv710-64b-8t4c-ip4-base-scale-avf"
+    - title: "2n-clx-xxv710-64b-8t4c-ip4routing-scale-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-ip4-scale-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-8t4c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-mrr.64B-8t4c-avf-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-8t4c-avf-ethip4-ip4scale20k-rnd-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-mrr.64B-8t4c-avf-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-8t4c-avf-ethip4-ip4scale200k-rnd-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-mrr.64B-8t4c-avf-ethip4-ip4scale2m-mrr"
+        - "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-scale-dpdk"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-scale-dpdk"
+    - 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"
+      include:
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-mrr.64B-2t1c-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-2t1c-ethip4-ip4scale20k-rnd-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-mrr.64B-2t1c-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-2t1c-ethip4-ip4scale200k-rnd-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-mrr.64B-2t1c-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-2t1c-ethip4-ip4scale2m-rnd-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-4t2c-ip4routing-base-scale-dpdk"
-      output-file-name: "2n-clx-xxv710-64b-4t2c-ip4-base-scale-dpdk"
+    - title: "2n-clx-xxv710-64b-4t2c-ip4routing-scale-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-ip4-scale-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"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-mrr.64B-4t2c-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-4t2c-ethip4-ip4scale20k-rnd-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-mrr.64B-4t2c-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-4t2c-ethip4-ip4scale200k-rnd-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-mrr.64B-4t2c-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-4t2c-ethip4-ip4scale2m-rnd-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-8t4c-ip4routing-base-scale-dpdk"
-      output-file-name: "2n-clx-xxv710-64b-8t4c-ip4-base-scale-dpdk"
+    - title: "2n-clx-xxv710-64b-8t4c-ip4routing-scale-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-ip4-scale-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"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-mrr.64B-8t4c-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-8t4c-ethip4-ip4scale20k-rnd-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-mrr.64B-8t4c-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-8t4c-ethip4-ip4scale200k-rnd-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-mrr.64B-8t4c-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-8t4c-ethip4-ip4scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-features-ip4routing-base-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-features-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-mrr.64B-2t1c-avf-ethip4udp-ip4base-nat44-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Mrr.64B-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-features-ip4routing-base-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-ip4-features-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-mrr.64B-4t2c-avf-ethip4udp-ip4base-nat44-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Mrr.64B-4t2c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-features-ip4routing-base-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-ip4-features-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-mrr.64B-8t4c-avf-ethip4udp-ip4base-nat44-mrr"
+        - "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"
@@ -2098,10 +2224,6 @@
       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-Iacl50Sf-10Kflows-mrr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-2t1c-ethip4udp-ip4base-nat44-mrr"
       layout: "plot-cpta"
 
@@ -2110,10 +2232,6 @@
       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-Iacl50Sf-10Kflows-mrr.64B-4t2c-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-4t2c-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-4t2c-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-4t2c-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-4t2c-ethip4udp-ip4base-nat44-mrr"
       layout: "plot-cpta"
 
@@ -2122,10 +2240,6 @@
       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-Iacl50Sf-10Kflows-mrr.64B-8t4c-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-8t4c-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-8t4c-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-8t4c-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-8t4c-ethip4udp-ip4base-nat44-mrr"
       layout: "plot-cpta"
 
@@ -2197,7 +2311,7 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Mrr.64B-2t1c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Mrr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Mrr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Nat44-Mrr.-64B-2t1c-rdma-ethip4udp-ip4base-nat44-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Nat44-Mrr.64B-2t1c-rdma-ethip4udp-ip4base-nat44-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Mrr.64B-2t1c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr"
       layout: "plot-cpta"
 
@@ -2209,7 +2323,7 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Mrr.64B-4t2c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Mrr.64B-4t2c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Mrr.64B-4t2c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Nat44-Mrr.-64B-4t2c-rdma-ethip4udp-ip4base-nat44-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Nat44-Mrr.64B-4t2c-rdma-ethip4udp-ip4base-nat44-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Mrr.64B-4t2c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr"
       layout: "plot-cpta"
 
@@ -2221,7 +2335,7 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Mrr.64B-8t4c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Mrr.64B-8t4c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Mrr.64B-8t4c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Nat44-Mrr.-64B-8t4c-rdma-ethip4udp-ip4base-nat44-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Nat44-Mrr.64B-8t4c-rdma-ethip4udp-ip4base-nat44-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Mrr.64B-8t4c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr"
       layout: "plot-cpta"
 
@@ -2916,27 +3030,66 @@
       output-file-name: "2n-clx-x710-78b-2t1c-ip6-base-scale-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"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-mrr.78B-2t1c-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-x710-78b-4t2c-ip6routing-base-scale-dpdk"
       output-file-name: "2n-clx-x710-78b-4t2c-ip6-base-scale-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"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-mrr.78B-4t2c-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-x710-78b-8t4c-ip6routing-base-scale-dpdk"
       output-file-name: "2n-clx-x710-78b-8t4c-ip6-base-scale-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"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-mrr.78B-8t4c-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-avf"
+      output-file-name: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      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"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-mrr.78B-2t1c-avf-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-78b-4t2c-ip6routing-base-scale-avf"
+      output-file-name: "2n-clx-xxv710-78b-4t2c-ip6-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      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"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-mrr.78B-4t2c-avf-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-78b-8t4c-ip6routing-base-scale-avf"
+      output-file-name: "2n-clx-xxv710-78b-8t4c-ip6-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      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"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-mrr.78B-8t4c-avf-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk"
@@ -3587,38 +3740,68 @@
         - "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-dpdk"
-      output-file-name: "2n-clx-x710-64b-2t1c-l2-base-scale-avf-dpdk"
+    - 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"
       include:
-        - "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-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"
+      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"
+      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"
+      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"
+      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"
+      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"
+      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-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-clx-x710-64b-4t2c-l2switching-base-scale-avf-dpdk"
-      output-file-name: "2n-clx-x710-64b-4t2c-l2-base-scale-avf-dpdk"
+    - title: "2n-clx-x710-64b-4t2c-l2switching-base-scale-dpdk"
+      output-file-name: "2n-clx-x710-64b-4t2c-l2-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "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-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-clx-x710-64b-8t4c-l2switching-base-scale-avf-dpdk"
-      output-file-name: "2n-clx-x710-64b-8t4c-l2-base-scale-avf-dpdk"
+    - title: "2n-clx-x710-64b-8t4c-l2switching-base-scale-dpdk"
+      output-file-name: "2n-clx-x710-64b-8t4c-l2-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "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-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"
@@ -3629,8 +3812,9 @@
       include:
         - "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-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-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-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"
 
     - title: "2n-clx-xxv710-64b-4t2c-l2switching-base-avf"
@@ -3639,8 +3823,9 @@
       include:
         - "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-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-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-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"
 
     - title: "2n-clx-xxv710-64b-8t4c-l2switching-base-avf"
@@ -3649,8 +3834,9 @@
       include:
         - "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-Dot1Q-L2Bdbasemaclrn-mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-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-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"
 
     - title: "2n-clx-xxv710-64b-2t1c-l2switching-base-dpdk"
@@ -3658,10 +3844,11 @@
       data: "plot-performance-trending-vpp-2n-clx"
       include:
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-2t1c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-mrr.64B-2t1c-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-2t1c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-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"
@@ -3669,10 +3856,11 @@
       data: "plot-performance-trending-vpp-2n-clx"
       include:
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-4t2c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-mrr.64B-4t2c-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-4t2c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-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"
@@ -3680,10 +3868,41 @@
       data: "plot-performance-trending-vpp-2n-clx"
       include:
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-8t4c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-mrr.64B-8t4c-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-8t4c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-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"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-mrr.64B-2t1c-avf-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-mrr.64B-2t1c-avf-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-l2switching-base-scale-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-mrr.64B-4t2c-avf-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-mrr.64B-4t2c-avf-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t2c-avf-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-l2switching-base-scale-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-mrr.64B-8t4c-avf-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-mrr.64B-8t4c-avf-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-mrr.64B-8t4c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-2t1c-l2switching-base-scale-dpdk"
@@ -4559,64 +4778,124 @@
         - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
       layout: "plot-cpta"
 
+    - title: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-testpmd"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-testpmd"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-vhost-base-avf-testpmd"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-vhost-base-avf-testpmd"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-vhost-base-avf-testpmd"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-vhost-base-avf-testpmd"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-vpp"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-vpp"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-vhost-base-avf-vpp"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-vhost-base-avf-vpp"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-vhost-base-avf-vpp"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-vhost-base-avf-vpp"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
+
     - title: "2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd"
       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-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-eth-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-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"
+        - "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"
 
     - title: "2n-clx-xxv710-64b-4t2c-vhost-base-dpdk-testpmd"
       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-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-eth-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-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"
+        - "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"
 
     - title: "2n-clx-xxv710-64b-8t4c-vhost-base-dpdk-testpmd"
       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-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-eth-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-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"
+        - "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"
 
     - title: "2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-vpp"
       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-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-2t1c-eth-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-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"
+        - "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"
 
     - title: "2n-clx-xxv710-64b-4t2c-vhost-base-dpdk-vpp"
       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-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-4t2c-eth-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-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"
+        - "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"
 
     - title: "2n-clx-xxv710-64b-8t4c-vhost-base-dpdk-vpp"
       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-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-8t4c-eth-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-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"
+        - "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"
 
     - title: "2n-clx-cx556a-64b-2t1c-rdma-l2-vhost-base"
@@ -4679,6 +4958,42 @@
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
+    - title: "2n-clx-xxv710-114b-2t1c-vts-l2switching-base-avf-dpdk"
+      output-file-name: "2n-clx-xxv710-114b-2t1c-vts-l2switching-base-avf-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      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-clx-xxv710-114b-4t2c-vts-l2switching-base-avf-dpdk"
+      output-file-name: "2n-clx-xxv710-114b-4t2c-vts-l2switching-base-avf-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      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-clx-xxv710-114b-8t4c-vts-l2switching-base-avf-dpdk"
+      output-file-name: "2n-clx-xxv710-114b-8t4c-vts-l2switching-base-avf-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      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-xxv710-64b-2t1c-vhost-base-avf-testpmd"
       output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd"
       data: "plot-performance-trending-vpp-2n-skx"
-- 
2.16.6