Trending: Move VTS tests from 3n to 2n

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

5 files changed, 80 insertions, 443 deletions

diff --git a/docs/cpta/trending/vts-3n-skx-xxv710.rst b/docs/cpta/trending/vts-2n-skx-xxv710.rst
index 77a4f60f85..64375b5fb2 100644
--- a/docs/cpta/trending/vts-3n-skx-xxv710.rst
+++ b/docs/cpta/trending/vts-2n-skx-xxv710.rst
@@ -1,4 +1,4 @@
-3n-skx-xxv710
+2n-skx-xxv710
 -------------
 
 114b-vts-l2switching-base-i40e
@@ -18,8 +18,8 @@
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e.html"></iframe>
     <p><br></p>
     </center>
 
@@ -32,8 +32,8 @@
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-114b-4t2c-vts-l2switching-base-i40e.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-4t2c-vts-l2switching-base-i40e.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,7 +46,7 @@
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-114b-8t4c-vts-l2switching-base-i40e.html"></iframe>
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-8t4c-vts-l2switching-base-i40e.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vts-3n-hsw-xl710.rst b/docs/cpta/trending/vts-3n-hsw-xl710.rst
deleted file mode 100644
index c71a7bea7c..0000000000
--- a/docs/cpta/trending/vts-3n-hsw-xl710.rst
+++ /dev/null
@@ -1,53 +0,0 @@
-3n-hsw-xl710
-------------
-
-114b-vts-l2switching-base-i40e
-``````````````````````````````
-
-..
-    40ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr
-    40ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr
-    40ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr
-
-1t1c
-::::
-
-.. raw:: html
-
-    <a name="114b-1t1c-base-i40e"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-::::
-
-.. raw:: html
-
-    <a name="114b-2t2c-base-i40e"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-114b-2t2c-vts-l2switching-base-i40e.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-::::
-
-.. raw:: html
-
-    <a name="114b-4t4c-base-i40e"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-hsw-xl710-114b-4t4c-vts-l2switching-base-i40e.html"></iframe>
-    <p><br></p>
-    </center>
-
diff --git a/docs/cpta/trending/vts-3n-tsh-x520.rst b/docs/cpta/trending/vts-3n-tsh-x520.rst
deleted file mode 100644
index 3f24ea9722..0000000000
--- a/docs/cpta/trending/vts-3n-tsh-x520.rst
+++ /dev/null
@@ -1,53 +0,0 @@
-3n-tsh-x520
------------
-
-114b-vts-l2switching-base-ixgbe
-```````````````````````````````
-
-..
-    10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr
-    10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr
-    10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr
-
-1t1c
-::::
-
-.. raw:: html
-
-    <a name="114b-1t1c-base-ixgbe"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-tsh" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-114b-1t1c-vts-l2switching-base-ixgbe.html"></iframe>
-    <p><br></p>
-    </center>
-
-2t2c
-::::
-
-.. raw:: html
-
-    <a name="114b-2t2c-base-ixgbe"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-tsh" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-114b-2t2c-vts-l2switching-base-ixgbe.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t4c
-::::
-
-.. raw:: html
-
-    <a name="114b-4t4c-base-ixgbe"></a>
-    <center>
-    Links to builds:
-    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
-    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-tsh" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-tsh-x520-114b-4t4c-vts-l2switching-base-ixgbe.html"></iframe>
-    <p><br></p>
-    </center>
-
diff --git a/docs/cpta/trending/vts.rst b/docs/cpta/trending/vts.rst
index 2da42d30f5..e5836f462a 100644
--- a/docs/cpta/trending/vts.rst
+++ b/docs/cpta/trending/vts.rst
@@ -3,6 +3,4 @@ Virtual Topology System
 
 .. toctree::
 
-    vts-3n-skx-xxv710
-    vts-3n-hsw-xl710
-    vts-3n-tsh-x520
+    vts-2n-skx-xxv710
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 62c222ecdb..f08bd45331 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -196,16 +196,9 @@
     # 3n-hsw
     plot-performance-trending-all-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 853
+        start: 894
         end: "lastCompletedBuild"
         skip:
-          - 855
-          - 856
-          - 860
-          - 867
-          - 891
-          - 892
-          - 893
           - 899
           - 900
           - 901
@@ -223,24 +216,18 @@
           - 941
           - 953
           - 987
+          - 1052
       csit-dpdk-perf-mrr-weekly-master:
-        start: 91
+        start: 96
         end: "lastCompletedBuild"
         skip:
           - 101
 
     plot-performance-trending-vpp-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 853
+        start: 894
         end: "lastCompletedBuild"
         skip:
-          - 855
-          - 856
-          - 860
-          - 867
-          - 891
-          - 892
-          - 893
           - 899
           - 900
           - 901
@@ -258,10 +245,11 @@
           - 941
           - 953
           - 987
+          - 1052
 
     plot-performance-trending-dpdk-3n-hsw:
       csit-dpdk-perf-mrr-weekly-master:
-        start: 91
+        start: 96
         end: "lastCompletedBuild"
         skip:
           - 101
@@ -269,14 +257,9 @@
     # 3n-skx
     plot-performance-trending-all-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 602
+        start: 635
         end: "lastCompletedBuild"
         skip:
-          - 603
-          - 604
-          - 612
-          - 633
-          - 634
           - 641
           - 642
           - 643
@@ -296,22 +279,20 @@
           - 697
           - 705
           - 743
+          - 749
+          - 761
+          - 796
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
-        start: 57
+        start: 61
         end: "lastCompletedBuild"
         skip:
           - 66
 
     plot-performance-trending-vpp-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 602
+        start: 635
         end: "lastCompletedBuild"
         skip:
-          - 603
-          - 604
-          - 612
-          - 633
-          - 634
           - 641
           - 642
           - 643
@@ -331,10 +312,13 @@
           - 697
           - 705
           - 743
+          - 749
+          - 761
+          - 796
 
     plot-performance-trending-dpdk-3n-skx:
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
-        start: 57
+        start: 61
         end: "lastCompletedBuild"
         skip:
           - 66
@@ -342,16 +326,9 @@
     # 2n-skx
     plot-performance-trending-all-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
-        start: 607
+        start: 647
         end: "lastCompletedBuild"
         skip:
-          - 608
-          - 609
-          - 612
-          - 620
-          - 627
-          - 645
-          - 646
           - 653
           - 654
           - 655
@@ -372,7 +349,7 @@
           - 702
           - 768
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 57
+        start: 61
         end: "lastCompletedBuild"
         skip:
           - 64
@@ -380,16 +357,9 @@
 
     plot-performance-trending-vpp-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
-        start: 607
+        start: 647
         end: "lastCompletedBuild"
         skip:
-          - 608
-          - 609
-          - 612
-          - 620
-          - 627
-          - 645
-          - 646
           - 653
           - 654
           - 655
@@ -419,7 +389,7 @@
 
     plot-performance-trending-dpdk-2n-skx:
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 57
+        start: 61
         end: "lastCompletedBuild"
         skip:
           - 64
@@ -427,125 +397,53 @@
 
     plot-performance-trending-vpp-nfv-2n-skx:
       csit-vpp-perf-mrr-weekly-master-2n-skx:
-        start: 30
+        start: 35
         end: "lastCompletedBuild"
         skip:
-          - 34
           - 37
 
     # 3n-tsh
     plot-performance-trending-all-3n-tsh:
       csit-vpp-perf-mrr-daily-master-3n-tsh:
-        start: 95
+        start: 101
         end: "lastCompletedBuild"
         skip:
-          - 95
+          - 105
 
     plot-performance-trending-vpp-3n-tsh:
       csit-vpp-perf-mrr-daily-master-3n-tsh:
-        start: 95
+        start: 101
         end: "lastCompletedBuild"
         skip:
-          - 95
+          - 105
 
     plot-performance-trending-vpp-3n-dnv:
       csit-vpp-perf-mrr-daily-master-3n-dnv:
-        start: 82
+        start: 134
         end: "lastCompletedBuild"
         skip:
-          - 83
-          - 84
-          - 91
-          - 92
-          - 93
-          - 94
-          - 95
-          - 96
-          - 97
-          - 98
-          - 99
-          - 100
-          - 101
-          - 102
-          - 103
-          - 104
-          - 105
-          - 106
-          - 107
-          - 108
-          - 109
-          - 110
-          - 111
-          - 112
-          - 113
-          - 114
-          - 115
-          - 116
-          - 117
-          - 118
-          - 119
-          - 120
-          - 121
-          - 128
-          - 129
-          - 130
-          - 131
-          - 132
-          - 133
           - 150
           - 151
           - 175
           - 176
           - 227
           - 228
+          - 246
+          - 247
+          - 248
 
     plot-performance-trending-vpp-2n-dnv:
       csit-vpp-perf-mrr-daily-master-2n-dnv:
-        start: 81
+        start: 133
         end: "lastCompletedBuild"
         skip:
-          - 83
-          - 90
-          - 91
-          - 92
-          - 93
-          - 94
-          - 95
-          - 96
-          - 97
-          - 98
-          - 99
-          - 100
-          - 101
-          - 102
-          - 103
-          - 104
-          - 105
-          - 106
-          - 107
-          - 108
-          - 109
-          - 110
-          - 111
-          - 112
-          - 113
-          - 114
-          - 115
-          - 116
-          - 117
-          - 118
-          - 119
-          - 120
-          - 127
-          - 128
-          - 129
-          - 130
-          - 131
-          - 132
           - 145
           - 149
           - 150
           - 228
+          - 249
+          - 250
+          - 251
 
   plot-layouts:
 
@@ -643,16 +541,9 @@
 
     # 3n-hsw
     csit-vpp-perf-mrr-daily-master:
-      start: 853
+      start: 894
       end: "lastCompletedBuild"
       skip:
-        - 855
-        - 856
-        - 860
-        - 867
-        - 891
-        - 892
-        - 893
         - 899
         - 900
         - 901
@@ -670,22 +561,18 @@
         - 941
         - 953
         - 987
+        - 1052
     csit-dpdk-perf-mrr-weekly-master:
-      start: 91
+      start: 96
       end: "lastCompletedBuild"
       skip:
         - 101
 
     # 3n-skx
     csit-vpp-perf-mrr-daily-master-3n-skx:
-      start: 602
+      start: 635
       end: "lastCompletedBuild"
       skip:
-        - 603
-        - 604
-        - 612
-        - 633
-        - 634
         - 641
         - 642
         - 643
@@ -705,24 +592,20 @@
         - 697
         - 705
         - 743
+        - 749
+        - 761
+        - 796
     csit-dpdk-perf-mrr-weekly-master-3n-skx:
-      start: 57
+      start: 61
       end: "lastCompletedBuild"
       skip:
         - 66
 
     # 2n-skx
     csit-vpp-perf-mrr-daily-master-2n-skx:
-      start: 607
+      start: 647
       end: "lastCompletedBuild"
       skip:
-        - 608
-        - 609
-        - 612
-        - 620
-        - 627
-        - 645
-        - 646
         - 653
         - 654
         - 655
@@ -743,13 +626,12 @@
         - 702
         - 768
     csit-vpp-perf-mrr-weekly-master-2n-skx:
-      start: 30
+      start: 35
       end: "lastCompletedBuild"
       skip:
-        - 34
         - 37
     csit-dpdk-perf-mrr-weekly-master-2n-skx:
-      start: 57
+      start: 61
       end: "lastCompletedBuild"
       skip:
         - 64
@@ -763,109 +645,38 @@
 
     # 3n-tsh
     csit-vpp-perf-mrr-daily-master-3n-tsh:
-      start: 95
+      start: 101
       end: "lastCompletedBuild"
       skip:
-        - 95
+        - 105
 
     # 3n-dnv
     csit-vpp-perf-mrr-daily-master-3n-dnv:
-      start: 82
+      start: 134
       end: "lastCompletedBuild"
       skip:
-        - 83
-        - 84
-        - 91
-        - 92
-        - 93
-        - 94
-        - 95
-        - 96
-        - 97
-        - 98
-        - 99
-        - 100
-        - 101
-        - 102
-        - 103
-        - 104
-        - 105
-        - 106
-        - 107
-        - 108
-        - 109
-        - 110
-        - 111
-        - 112
-        - 113
-        - 114
-        - 115
-        - 116
-        - 117
-        - 118
-        - 119
-        - 120
-        - 121
-        - 128
-        - 129
-        - 130
-        - 131
-        - 132
-        - 133
         - 150
         - 151
         - 175
         - 176
         - 227
         - 228
+        - 246
+        - 247
+        - 248
 
     # 2n-dnv
     csit-vpp-perf-mrr-daily-master-2n-dnv:
-      start: 81
+      start: 133
       end: "lastCompletedBuild"
       skip:
-        - 83
-        - 90
-        - 91
-        - 92
-        - 93
-        - 94
-        - 95
-        - 96
-        - 97
-        - 98
-        - 99
-        - 100
-        - 101
-        - 102
-        - 103
-        - 104
-        - 105
-        - 106
-        - 107
-        - 108
-        - 109
-        - 110
-        - 111
-        - 112
-        - 113
-        - 114
-        - 115
-        - 116
-        - 117
-        - 118
-        - 119
-        - 120
-        - 127
-        - 128
-        - 129
-        - 130
-        - 131
-        - 132
         - 145
         - 149
         - 150
         - 228
+        - 249
+        - 250
+        - 251
 
 -
   type: "output"
@@ -5081,101 +4892,35 @@
         - "result"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e"
-      output-file-name: "3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
-      parameters:
-        - "result"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-114b-2t2c-vts-l2switching-base-i40e"
-      output-file-name: "3n-hsw-xl710-114b-2t2c-vts-l2switching-base-i40e"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
-      parameters:
-        - "result"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-114b-4t4c-vts-l2switching-base-i40e"
-      output-file-name: "3n-hsw-xl710-114b-4t4c-vts-l2switching-base-i40e"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
-      parameters:
-        - "result"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e"
-      output-file-name: "3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
-      parameters:
-        - "result"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-114b-4t2c-vts-l2switching-base-i40e"
-      output-file-name: "3n-skx-xxv710-114b-4t2c-vts-l2switching-base-i40e"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-4t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-4t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-4t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
-      parameters:
-        - "result"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-114b-8t4c-vts-l2switching-base-i40e"
-      output-file-name: "3n-skx-xxv710-114b-8t4c-vts-l2switching-base-i40e"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-8t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-8t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-8t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
-      parameters:
-        - "result"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-114b-1t1c-vts-l2switching-base-ixgbe"
-      output-file-name: "3n-tsh-x520-114b-1t1c-vts-l2switching-base-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
+    - title: "2n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e"
+      output-file-name: "2n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e"
+      data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Vts.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-1t1c-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"
       parameters:
         - "result"
       layout: "plot-cpta"
 
-    - title: "3n-tsh-x520-114b-2t2c-vts-l2switching-base-ixgbe"
-      output-file-name: "3n-tsh-x520-114b-2t2c-vts-l2switching-base-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
+    - title: "2n-skx-xxv710-114b-4t2c-vts-l2switching-base-i40e"
+      output-file-name: "2n-skx-xxv710-114b-4t2c-vts-l2switching-base-i40e"
+      data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Vts.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-2t2c-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"
       parameters:
         - "result"
       layout: "plot-cpta"
 
-    - title: "3n-tsh-x520-114b-4t4c-vts-l2switching-base-ixgbe"
-      output-file-name: "3n-tsh-x520-114b-4t4c-vts-l2switching-base-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
+    - title: "2n-skx-xxv710-114b-8t4c-vts-l2switching-base-i40e"
+      output-file-name: "2n-skx-xxv710-114b-8t4c-vts-l2switching-base-i40e"
+      data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Vts.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-4t4c-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"
       parameters:
         - "result"
       layout: "plot-cpta"