Trending: Fixes after review

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

4 files changed, 66 insertions, 44 deletions

diff --git a/docs/cpta/ndrpdr_trending/ip6-2n-clx-cx556a.rst b/docs/cpta/ndrpdr_trending/ip6-2n-clx-cx556a.rst
index 941281a402..849c9f2d9d 100644
--- a/docs/cpta/ndrpdr_trending/ip6-2n-clx-cx556a.rst
+++ b/docs/cpta/ndrpdr_trending/ip6-2n-clx-cx556a.rst
@@ -15,7 +15,7 @@
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-78b-2t1c-ip6-base-scale-rdma-ndr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-78b-2t1c-ip6-base-scale-rdma-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -30,6 +30,6 @@
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-x710-78b-2t1c-ip6-base-scale-rdma-pdr.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-cx556a-78b-2t1c-ip6-base-scale-rdma-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/ipsec-3n-hsw-xl710.rst b/docs/cpta/ndrpdr_trending/ipsec-3n-hsw-xl710.rst
index 555cf66881..9114e16c8d 100644
--- a/docs/cpta/ndrpdr_trending/ipsec-3n-hsw-xl710.rst
+++ b/docs/cpta/ndrpdr_trending/ipsec-3n-hsw-xl710.rst
@@ -14,8 +14,8 @@ imix-ipsec-ip4routing-base-scale-sw-dpdk
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-base-scale-sw-dpdk-ndr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -29,8 +29,8 @@ imix-ipsec-ip4routing-base-scale-sw-dpdk
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-base-scale-sw-dpdk-pdr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -47,8 +47,8 @@ imix-ipsec-ip4routing-base-scale-hw-dpdk
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-base-scale-hw-dpdk-ndr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -62,7 +62,7 @@ imix-ipsec-ip4routing-base-scale-hw-dpdk
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-hsw" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-base-scale-hw-dpdk-pdr.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/ndrpdr_trending/ipsec-3n-skx-xxv710.rst b/docs/cpta/ndrpdr_trending/ipsec-3n-skx-xxv710.rst
index 8c13b3a657..1505cca627 100644
--- a/docs/cpta/ndrpdr_trending/ipsec-3n-skx-xxv710.rst
+++ b/docs/cpta/ndrpdr_trending/ipsec-3n-skx-xxv710.rst
@@ -14,7 +14,7 @@ imix-ipsec-ip4routing-base-scale-sw-avf
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
@@ -29,7 +29,7 @@ imix-ipsec-ip4routing-base-scale-sw-avf
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
@@ -47,7 +47,7 @@ imix-ipsec-ip4routing-base-scale-sw-dpdk
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
@@ -62,7 +62,7 @@ imix-ipsec-ip4routing-base-scale-sw-dpdk
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
@@ -80,7 +80,7 @@ imix-ipsec-ip4routing-base-scale-sw-dpdk
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
@@ -95,7 +95,7 @@ imix-ipsec-ip4routing-base-scale-sw-dpdk
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
@@ -113,7 +113,7 @@ imix-ipsec-ip4routing-base-scale-sw-dpdk
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
@@ -128,7 +128,7 @@ imix-ipsec-ip4routing-base-scale-sw-dpdk
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 579d9c5b01..80425f69bc 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -6421,26 +6421,26 @@
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-l2-base-scale-dpdk-ndr"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-scale-dpdk-ndr"
+    - title: "2n-clx-xxv710-64b-2t1c-l2-base-scale-avf-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-scale-avf-ndr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-l2-base-scale-dpdk-pdr"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-scale-dpdk-pdr"
+    - title: "2n-clx-xxv710-64b-2t1c-l2-base-scale-avf-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-scale-avf-pdr"
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-2t1c-l2-base-scale-dpdk-ndr"
@@ -6568,9 +6568,9 @@
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "NDR"
       include:
-        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-114b-2t1c-vts-l2switching-base-avf-pdr"
@@ -6578,9 +6578,9 @@
       data: "plot-ndrpdr-comparison-2n-clx"
       include-tests: "PDR"
       include:
-        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
 
 # 2n-skx memif
@@ -6789,6 +6789,28 @@
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
       layout: "plot-cpta"
 
+    - title: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-ndr"
+      output-file-name: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-pdr"
+      output-file-name: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
     - title: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk-ndr"
       output-file-name: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk-ndr"
       data: "plot-ndrpdr-comparison-2n-skx"
@@ -7135,8 +7157,8 @@
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-ndr"
-      output-file-name: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-ndr"
+    - title: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-dpdk-ndr"
+      output-file-name: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-dpdk-ndr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
@@ -7144,8 +7166,8 @@
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-ndr"
-      output-file-name: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-ndr"
+    - title: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-dpdk-ndr"
+      output-file-name: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-dpdk-ndr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "NDR"
       include:
@@ -7153,8 +7175,8 @@
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-pdr"
-      output-file-name: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-pdr"
+    - title: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-dpdk-pdr"
+      output-file-name: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-dpdk-pdr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include:
@@ -7162,8 +7184,8 @@
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-pdr"
-      output-file-name: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-pdr"
+    - title: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-dpdk-pdr"
+      output-file-name: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-dpdk-pdr"
       data: "plot-ndrpdr-comparison-3n-skx"
       include-tests: "PDR"
       include: