PAL: Add a new download path
[csit.git] / resources / tools / presentation / specification_CPTA.yaml
index 99cf588..82b6ed6 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -44,6 +44,7 @@
 
   urls:
     URL[JENKINS,CSIT]: "https://jenkins.fd.io/view/csit/job"
+    URL[S3_STORAGE,LOG]: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1"
     URL[NEXUS,LOG]: "https://logs.fd.io/production/vex-yul-rot-jenkins-1"
     URL[NEXUS,DOC]: "https://docs.fd.io/csit"
     DIR[NEXUS,DOC]: "trending/_static/archive"
@@ -75,6 +76,7 @@
     "10.30.51.48": "LF-3n-SKX-31"
     "10.30.51.60": "LF-3n-SKX-32"
     "10.30.51.49": "LF-3n-TSH-33"
+    "10.32.8.25": "LF-2n-ZN2-210"
     "10.32.8.10": "LF-DNV"
 
 -
         type: "failed-tests"
         way: "jenkins"
         include:
-          - "last-failed-tests-2n-skx"
-          - "last-failed-tests-3n-skx"
-          - "last-failed-tests-2n-clx"
-          - "last-failed-tests-3n-hsw"
-          - "last-failed-tests-3n-tsh"
-          - "last-failed-tests-2n-dnv"
-          - "last-failed-tests-3n-dnv"
+          - "last-failed-tests-vpp-2n-skx-mrr"
+          - "last-failed-tests-vpp-3n-skx-mrr"
+          - "last-failed-tests-vpp-2n-clx-mrr"
         urls:
-          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx"
-          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx"
-          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx"
-          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master"
-          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-tsh"
-          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-dnv"
-          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-dnv"
-        url-details: "https://docs.fd.io/csit/master/trending/introduction/failures.html"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-weekly-2009_lts-2n-skx"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-weekly-2009_lts-3n-skx"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-weekly-2009_lts-2n-clx"
+        url-details: "https://docs.fd.io/csit/rls2009_lts/trending/introduction/failures.html"
 
     configurations:
       # Configuration of the email notifications.
   data-sets:
 
     # Compressed failed tests (last builds)
-    table-last-failed-tests-3n-hsw:
-      csit-vpp-perf-mrr-daily-master:
-        - "lastCompletedBuild"
     table-last-failed-tests-3n-skx:
-      csit-vpp-perf-mrr-daily-master-3n-skx:
+      csit-vpp-perf-mrr-weekly-2009_lts-3n-skx:
         - "lastCompletedBuild"
     table-last-failed-tests-2n-skx:
-      csit-vpp-perf-mrr-daily-master-2n-skx:
-        - "lastCompletedBuild"
-    table-last-failed-tests-nf-2n-skx:
-      csit-vpp-perf-mrr-weekly-master-2n-skx:
+      csit-vpp-perf-mrr-weekly-2009_lts-2n-skx:
         - "lastCompletedBuild"
     table-last-failed-tests-2n-clx:
-      csit-vpp-perf-mrr-daily-master-2n-clx:
-        - "lastCompletedBuild"
-    table-last-failed-tests-3n-tsh:
-      csit-vpp-perf-mrr-daily-master-3n-tsh:
-        - "lastCompletedBuild"
-    table-last-failed-tests-3n-dnv:
-      csit-vpp-perf-mrr-daily-master-3n-dnv:
-        - "lastCompletedBuild"
-    table-last-failed-tests-2n-dnv:
-      csit-vpp-perf-mrr-daily-master-2n-dnv:
+      csit-vpp-perf-mrr-weekly-2009_lts-2n-clx:
         - "lastCompletedBuild"
 
-    # 3n-hsw
-    plot-performance-trending-all-3n-hsw:
-      csit-vpp-perf-mrr-daily-master:
-        start: 1035
-        end: "lastCompletedBuild"
-        skip:
-          - 1052
-          - 1054
-          - 1056
-          - 1063
-          - 1102
-      csit-dpdk-perf-mrr-weekly-master:
-        start: 107
-        end: "lastCompletedBuild"
-        skip:
-          - 110
-          - 111
-          - 112
-          - 114
-
-    plot-performance-trending-vpp-3n-hsw:
-      csit-vpp-perf-mrr-daily-master:
-        start: 1035
-        end: "lastCompletedBuild"
-        skip:
-          - 1052
-          - 1054
-          - 1056
-          - 1063
-          - 1102
-
-    plot-performance-trending-dpdk-3n-hsw:
-      csit-dpdk-perf-mrr-weekly-master:
-        start: 107
-        end: "lastCompletedBuild"
-        skip:
-          - 110
-          - 111
-          - 112
-          - 114
-
     # 3n-skx
-    plot-performance-trending-all-3n-skx:
-      csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 782
-        end: "lastCompletedBuild"
-        skip:
-          - 796
-          - 803
-          - 804
-          - 805
-          - 818
-          - 849
-          - 851
-      csit-dpdk-perf-mrr-weekly-master-3n-skx:
-        start: 72
-        end: "lastCompletedBuild"
-        skip:
-          - 76
-          - 77
-          - 79
-
     plot-performance-trending-vpp-3n-skx:
-      csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 782
+      csit-vpp-perf-mrr-weekly-2009_lts-3n-skx:
+        start: 1
         end: "lastCompletedBuild"
-        skip:
-          - 796
-          - 803
-          - 804
-          - 805
-          - 818
-          - 849
-          - 851
-
-    plot-performance-trending-dpdk-3n-skx:
-      csit-dpdk-perf-mrr-weekly-master-3n-skx:
-        start: 72
-        end: "lastCompletedBuild"
-        skip:
-          - 76
-          - 77
-          - 79
+        max-builds: 26
 
     # 2n-skx
-    plot-performance-trending-all-2n-skx:
-      csit-vpp-perf-mrr-daily-master-2n-skx:
-        start: 804
-        end: "lastCompletedBuild"
-        skip:
-          - 828
-          - 830
-          - 868
-          - 870
-          - 874
-      csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 72
-        end: "lastCompletedBuild"
-        skip:
-          - 76
-          - 77
-          - 79
-
     plot-performance-trending-vpp-2n-skx:
-      csit-vpp-perf-mrr-daily-master-2n-skx:
-        start: 804
+      csit-vpp-perf-mrr-weekly-2009_lts-2n-skx:
+        start: 1
         end: "lastCompletedBuild"
-        skip:
-          - 828
-          - 830
-          - 868
-          - 870
-          - 874
-
-    plot-performance-trending-dpdk-2n-skx:
-      csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 72
-        end: "lastCompletedBuild"
-        skip:
-          - 76
-          - 77
-          - 79
-
-    plot-performance-trending-vpp-nfv-2n-skx:
-      csit-vpp-perf-mrr-weekly-master-2n-skx:
-        start: 45
-        end: "lastCompletedBuild"
-        skip:
-          - 52
-          - 54
-          - 55
 
+    # 2n-clx
     plot-performance-trending-vpp-2n-clx:
-      csit-vpp-perf-mrr-daily-master-2n-clx:
-        start: 183
-        end: "lastCompletedBuild"
-        skip:
-          - 204
-          - 206
-          - 208
-          - 213
-          - 214
-          - 215
-          - 216
-          - 217
-          - 224
-          - 230
-          - 231
-          - 239
-          - 248
-          - 251
-          - 252
-          - 253
-
-    plot-performance-trending-dpdk-2n-clx:
-      csit-dpdk-perf-mrr-weekly-master-2n-clx:
-        start: 16
+      csit-vpp-perf-mrr-weekly-2009_lts-2n-clx:
+        start: 1
         end: "lastCompletedBuild"
-        skip:
-          - 18
-          - 21
-          - 22
-          - 24
-
-    # 3n-tsh
-    plot-performance-trending-all-3n-tsh:
-      csit-vpp-perf-mrr-daily-master-3n-tsh:
-        start: 115
-        end: "lastCompletedBuild"
-        skip:
-          - 126
-          - 127
-          - 135
-          - 149
-          - 150
-          - 152
-          - 153
-          - 154
-          - 155
-          - 156
-          - 157
-
-    plot-performance-trending-vpp-3n-tsh:
-      csit-vpp-perf-mrr-daily-master-3n-tsh:
-        start: 115
-        end: "lastCompletedBuild"
-        skip:
-          - 126
-          - 127
-          - 135
-          - 149
-          - 150
-          - 152
-          - 153
-          - 154
-          - 155
-          - 156
-          - 157
-
-    plot-performance-trending-vpp-3n-dnv:
-      csit-vpp-perf-mrr-daily-master-3n-dnv:
-        start: 276
-        end: "lastCompletedBuild"
-        skip:
-          - 297
-          - 318
-          - 319
-          - 320
-          - 321
-          - 322
-          - 323
-          - 324
-          - 325
-          - 326
-          - 327
-          - 343
-          - 344
-          - 345
-          - 348
-          - 350
-          - 356
-          - 357
-          - 358
-          - 360
-          - 363
-          - 364
-
-    plot-performance-trending-vpp-2n-dnv:
-      csit-vpp-perf-mrr-daily-master-2n-dnv:
-        start: 279
-        end: "lastCompletedBuild"
-        skip:
-          - 228
-          - 249
-          - 250
-          - 251
-          - 302
-          - 304
-          - 314
-          - 317
-          - 326
-          - 327
-          - 328
-          - 329
-          - 330
-          - 331
-          - 332
-          - 344
-          - 349
-          - 350
-          - 351
-          - 354
-          - 360
-          - 364
-          - 365
-          - 366
-          - 370
+        max-builds: 26
 
   plot-layouts:
 
       hoverlabel:
         namelength: -1
 
+    plot-cpta-cps:
+      title: ""
+      titlefont:
+        size: 16
+      autosize: True
+      showlegend: True
+      width: 1100
+      height: 800
+      yaxis:
+        showticklabels: True
+        tickformat: ".5s"
+        title: "Connection Rate [Mcps]"
+        hoverformat: ".5s"
+        gridcolor: "rgb(238, 238, 238)"
+        linecolor: "rgb(238, 238, 238)"
+        showline: True
+        zeroline: False
+        tickcolor: "rgb(238, 238, 238)"
+        linewidth: 1
+        showgrid: True
+      xaxis:
+        title: 'Date [MMDD]'
+        type: "date"
+        autorange: True
+        fixedrange: False
+        showgrid: True
+        gridcolor: "rgb(238, 238, 238)"
+        showline: True
+        linecolor: "rgb(238, 238, 238)"
+        zeroline: False
+        linewidth: 1
+        showticklabels: True
+        tickcolor: "rgb(238, 238, 238)"
+        tickmode: "auto"
+        tickformat: "%m%d"
+        rangeselector:
+          buttons:
+          - count: 14
+            label: "2w"
+            step: "day"
+            stepmode: "backward"
+          - count: 1
+            label: "1m"
+            step: "month"
+            stepmode: "backward"
+          - count: 2
+            label: "2m"
+            step: "month"
+            stepmode: "backward"
+          - count: 3
+            label: "3m"
+            step: "month"
+            stepmode: "backward"
+          - step: "all"
+      margin:
+        r: 20
+        b: 5
+        t: 5
+        l: 70
+      legend:
+        orientation: "h"
+        xanchor: "auto"
+        traceorder: "normal"  # "grouped" does not work: bug https://github.com/plotly/plotly.js/issues/1913
+        bordercolor: "rgb(238, 238, 238)"
+      paper_bgcolor: "#fff"
+      plot_bgcolor: "#fff"
+      hoverlabel:
+        namelength: -1
+
 -
   type: "static"
   src-path: "{DIR[RST]}"
   general:
     file-name: "output_info.xml.gz"
     file-format: ".gz"
-    download-path: "{job}/{build}/archives/{filename}"
+    download-path:
+      - "{job}/{build}/archives/{filename}"
+      - "{job}/{build}/{filename}"
     extract: "output.xml"
     # Number of days from now to the past. Only files generated in this
     # time period are used.
-    time-period: 90
+    time-period: 180
 
     zip-file-name: "robot-plugin.zip"
     zip-file-format: ".zip"
 
   builds:
 
-    # 3n-hsw
-    csit-vpp-perf-mrr-daily-master:
-      start: 1035
-      end: "lastCompletedBuild"
-      skip:
-        - 1052
-        - 1054
-        - 1056
-        - 1063
-        - 1102
-    csit-dpdk-perf-mrr-weekly-master:
-      start: 107
-      end: "lastCompletedBuild"
-      skip:
-        - 110
-        - 111
-        - 112
-        - 114
-
     # 3n-skx
-    csit-vpp-perf-mrr-daily-master-3n-skx:
-      start: 782
-      end: "lastCompletedBuild"
-      skip:
-        - 796
-        - 803
-        - 804
-        - 805
-        - 818
-        - 849
-        - 851
-    csit-dpdk-perf-mrr-weekly-master-3n-skx:
-      start: 72
+    csit-vpp-perf-mrr-weekly-2009_lts-3n-skx:
+      start: 4
       end: "lastCompletedBuild"
-      skip:
-        - 76
-        - 77
-        - 79
+      max-builds: 26  # Max nr of builds to download
 
     # 2n-skx
-    csit-vpp-perf-mrr-daily-master-2n-skx:
-      start: 804
+    csit-vpp-perf-mrr-weekly-2009_lts-2n-skx:
+      start: 1
       end: "lastCompletedBuild"
-      skip:
-        - 828
-        - 830
-        - 868
-        - 870
-        - 874
-    csit-vpp-perf-mrr-weekly-master-2n-skx:
-      start: 45
-      end: "lastCompletedBuild"
-      skip:
-        - 52
-        - 54
-        - 55
-    csit-dpdk-perf-mrr-weekly-master-2n-skx:
-      start: 72
-      end: "lastCompletedBuild"
-      skip:
-        - 76
-        - 77
-        - 79
+      max-builds: 26  # Max nr of builds to download
 
-    csit-vpp-perf-mrr-daily-master-2n-clx:
-      start: 183
-      end: "lastCompletedBuild"
-      skip:
-        - 204
-        - 206
-        - 208
-        - 213
-        - 214
-        - 215
-        - 216
-        - 217
-        - 224
-        - 230
-        - 231
-        - 239
-        - 248
-        - 251
-        - 252
-        - 253
-
-    csit-dpdk-perf-mrr-weekly-master-2n-clx:
-      start: 16
-      end: "lastCompletedBuild"
-      skip:
-        - 18
-        - 21
-        - 22
-        - 24
-
-    # 3n-tsh
-    csit-vpp-perf-mrr-daily-master-3n-tsh:
-      start: 115
-      end: "lastCompletedBuild"
-      skip:
-        - 126
-        - 127
-        - 135
-        - 149
-        - 150
-        - 152
-        - 153
-        - 154
-        - 155
-        - 156
-        - 157
-
-    # 3n-dnv
-    csit-vpp-perf-mrr-daily-master-3n-dnv:
-      start: 276
-      end: "lastCompletedBuild"
-      skip:
-        - 297
-        - 318
-        - 319
-        - 320
-        - 321
-        - 322
-        - 323
-        - 324
-        - 325
-        - 326
-        - 327
-        - 343
-        - 344
-        - 345
-        - 348
-        - 350
-        - 356
-        - 357
-        - 358
-        - 360
-        - 363
-        - 364
-
-    # 2n-dnv
-    csit-vpp-perf-mrr-daily-master-2n-dnv:
-      start: 279
+    csit-vpp-perf-mrr-weekly-2009_lts-2n-clx:
+      start: 1
       end: "lastCompletedBuild"
-      skip:
-        - 228
-        - 249
-        - 250
-        - 251
-        - 302
-        - 304
-        - 314
-        - 317
-        - 326
-        - 327
-        - 328
-        - 329
-        - 330
-        - 331
-        - 332
-        - 344
-        - 349
-        - 350
-        - 351
-        - 354
-        - 360
-        - 364
-        - 365
-        - 366
-        - 370
+      max-builds: 26  # Max nr of builds to download
 
 -
   type: "output"
 
 ################################################################################
 
-# Compressed failed tests (last build)
 -
   type: "table"
-  title: "Last failed tests (last builds) 3n-hsw"
+  title: "Last failed tests (last builds) VPP 3n-skx"
   algorithm: "table_last_failed_tests"
   output-file-ext: ".txt"
-  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-3n-hsw"
-  data: "table-last-failed-tests-3n-hsw"
-  filter: "'MRR'"
-  parameters:
-    - "name"
-    - "parent"
-    - "status"
-
--
-  type: "table"
-  title: "Last failed tests (last builds) 3n-skx"
-  algorithm: "table_last_failed_tests"
-  output-file-ext: ".txt"
-  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-vpp-3n-skx-mrr"
   data: "table-last-failed-tests-3n-skx"
   filter: "'MRR'"
   parameters:
 
 -
   type: "table"
-  title: "Last failed tests (last builds) 2n-skx"
+  title: "Last failed tests (last builds) VPP 2n-skx"
   algorithm: "table_last_failed_tests"
   output-file-ext: ".txt"
-  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-vpp-2n-skx-mrr"
   data: "table-last-failed-tests-2n-skx"
   filter: "'MRR'"
   parameters:
 
 -
   type: "table"
-  title: "Last failed tests (last builds) 2n-clx"
+  title: "Last failed tests (last builds) VPP 2n-clx"
   algorithm: "table_last_failed_tests"
   output-file-ext: ".txt"
-  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-2n-clx"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-vpp-2n-clx-mrr"
   data: "table-last-failed-tests-2n-clx"
   filter: "'MRR'"
   parameters:
     - "parent"
     - "status"
 
--
-  type: "table"
-  title: "Last failed tests (last builds) 3n-tsh"
-  algorithm: "table_last_failed_tests"
-  output-file-ext: ".txt"
-  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-3n-tsh"
-  data: "table-last-failed-tests-3n-tsh"
-  filter: "'MRR'"
-  parameters:
-    - "name"
-    - "parent"
-    - "status"
-
--
-  type: "table"
-  title: "Last failed tests (last builds) 3n-dnv"
-  algorithm: "table_last_failed_tests"
-  output-file-ext: ".txt"
-  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-3n-dnv"
-  data: "table-last-failed-tests-3n-dnv"
-  filter: "'MRR'"
-  parameters:
-    - "name"
-    - "parent"
-    - "status"
-
--
-  type: "table"
-  title: "Last failed tests (last builds) 2n-dnv"
-  algorithm: "table_last_failed_tests"
-  output-file-ext: ".txt"
-  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-2n-dnv"
-  data: "table-last-failed-tests-2n-dnv"
-  filter: "'MRR'"
-  parameters:
-    - "name"
-    - "parent"
-    - "status"
-
-# 3n-hsw
--
-  type: "table"
-  title: "Performance trending dashboard 1t1c-3n-hsw"
-  algorithm: "table_perf_trending_dash"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw"
-  data: "plot-performance-trending-all-3n-hsw"
-  filter: "'MRR' and '1T1C' and not 'NIC_Intel-XXV710'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-1t1c-eth-l2bdscale1mmaclrn-ndrdisc"
-  window: 14
-  long-trend-window: 180
-
--
-  type: "table"
-  title: "Performance trending dashboard 2t2c-3n-hsw"
-  algorithm: "table_perf_trending_dash"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-hsw"
-  data: "plot-performance-trending-all-3n-hsw"
-  filter: "'MRR' and '2T2C' and not 'NIC_Intel-XXV710'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc05-64b-2t2c-eth-l2bdscale1mmaclrn-ndrdisc"
-  window: 14
-  long-trend-window: 180
-
--
-  type: "table"
-  title: "Performance trending dashboard 4t4c-3n-hsw"
-  algorithm: "table_perf_trending_dash"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-hsw"
-  data: "plot-performance-trending-all-3n-hsw"
-  filter: "'MRR' and '4T4C' and not 'NIC_Intel-XXV710'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc09-64b-4t4c-eth-l2bdscale1mmaclrn-ndrdisc"
-  window: 14
-  long-trend-window: 180
-
--
-  type: "table"
-  title: "HTML performance trending dashboard 1t1c-3n-hsw"
-  algorithm: "table_perf_trending_dash_html"
-  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw.csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw.rst"
-  testbed: "3n-hsw"
-
--
-  type: "table"
-  title: "HTML performance trending dashboard 2t2c-3n-hsw"
-  algorithm: "table_perf_trending_dash_html"
-  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-hsw.csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-hsw.rst"
-  testbed: "3n-hsw"
-
--
-  type: "table"
-  title: "HTML performance trending dashboard 4t4c-3n-hsw"
-  algorithm: "table_perf_trending_dash_html"
-  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-hsw.csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-hsw.rst"
-  testbed: "3n-hsw"
-
--
-  type: "table"
-  title: "Failed MRR tests 3n-hsw"
-  algorithm: "table_failed_tests"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw"
-  data: "plot-performance-trending-all-3n-hsw"
-  filter: "'MRR' and not 'NIC_Intel-XXV710'"
-  parameters:
-  - "name"
-  - "parent"
-  - "status"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-1t1c-eth-l2bdscale1mmaclrn-ndrdisc"
-  window: 7  # days
-
--
-  type: "table"
-  title: "HTML Failed MRR tests 3n-hsw"
-  algorithm: "table_failed_tests_html"
-  input-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw.csv"
-  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw.rst"
-  testbed: "3n-hsw"
-
-################################################################################
+###############################################################################
 # 3n-skx
 -
   type: "table"
   algorithm: "table_perf_trending_dash"
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx"
-  data: "plot-performance-trending-all-3n-skx"
+  data: "plot-performance-trending-vpp-3n-skx"
   filter: "'MRR' and '2T1C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-2t1c-eth-l2bdscale1mmaclrn-ndrdisc"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
   algorithm: "table_perf_trending_dash"
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-3n-skx"
-  data: "plot-performance-trending-all-3n-skx"
+  data: "plot-performance-trending-vpp-3n-skx"
   filter: "'MRR' and '4T2C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc05-64b-4t2c-eth-l2bdscale1mmaclrn-ndrdisc"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
   algorithm: "table_perf_trending_dash"
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-3n-skx"
-  data: "plot-performance-trending-all-3n-skx"
+  data: "plot-performance-trending-vpp-3n-skx"
   filter: "'MRR' and '8T4C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc09-64b-8t4c-eth-l2bdscale1mmaclrn-ndrdisc"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
   algorithm: "table_failed_tests"
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-skx"
-  data: "plot-performance-trending-all-3n-skx"
+  data: "plot-performance-trending-vpp-3n-skx"
   filter: "'MRR'"
   parameters:
-  - "name"
-  - "parent"
-  - "status"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-2t1c-eth-l2bdscale1mmaclrn-ndrdisc"
+    - "name"
+    - "parent"
+    - "status"
   window: 7  # days
 
 -
   algorithm: "table_perf_trending_dash"
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx"
-  data: "plot-performance-trending-all-2n-skx"
+  data: "plot-performance-trending-vpp-2n-skx"
   filter: "'MRR' and '2T1C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-2t1c-eth-l2bdscale1mmaclrn-ndrdisc"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
   algorithm: "table_perf_trending_dash"
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-2n-skx"
-  data: "plot-performance-trending-all-2n-skx"
+  data: "plot-performance-trending-vpp-2n-skx"
   filter: "'MRR' and '4T2C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc05-64b-4t2c-eth-l2bdscale1mmaclrn-ndrdisc"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
   algorithm: "table_perf_trending_dash"
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-2n-skx"
-  data: "plot-performance-trending-all-2n-skx"
+  data: "plot-performance-trending-vpp-2n-skx"
   filter: "'MRR' and '8T4C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc09-64b-8t4c-eth-l2bdscale1mmaclrn-ndrdisc"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
   algorithm: "table_failed_tests"
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-skx"
-  data: "plot-performance-trending-all-2n-skx"
+  data: "plot-performance-trending-vpp-2n-skx"
   filter: "'MRR'"
   parameters:
-  - "name"
-  - "parent"
-  - "status"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-2t1c-eth-l2bdscale1mmaclrn-ndrdisc"
+    - "name"
+    - "parent"
+    - "status"
   window: 7  # days
 
 -
   data: "plot-performance-trending-vpp-2n-clx"
   filter: "'MRR' and '2T1C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
   data: "plot-performance-trending-vpp-2n-clx"
   filter: "'MRR' and '4T2C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
   data: "plot-performance-trending-vpp-2n-clx"
   filter: "'MRR' and '8T4C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
   data: "plot-performance-trending-vpp-2n-clx"
   filter: "'MRR'"
   parameters:
-  - "name"
-  - "parent"
-  - "status"
+    - "name"
+    - "parent"
+    - "status"
   window: 7  # days
 
 -
   output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-clx.rst"
   testbed: "2n-clx"
 
-
-################################################################################
-# 3n-tsh
--
-  type: "table"
-  title: "Performance trending dashboard 1t1c-3n-tsh"
-  algorithm: "table_perf_trending_dash"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-tsh"
-  data: "plot-performance-trending-all-3n-tsh"
-  filter: "'MRR' and '1T1C'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  window: 14
-  long-trend-window: 180
-
--
-  type: "table"
-  title: "Performance trending dashboard 2t2c-3n-tsh"
-  algorithm: "table_perf_trending_dash"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-tsh"
-  data: "plot-performance-trending-all-3n-tsh"
-  filter: "'MRR' and '2T2C'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  window: 14
-  long-trend-window: 180
-
--
-  type: "table"
-  title: "Performance trending dashboard 4t4c-3n-tsh"
-  algorithm: "table_perf_trending_dash"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-tsh"
-  data: "plot-performance-trending-all-3n-tsh"
-  filter: "'MRR' and '4T4C'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  window: 14
-  long-trend-window: 180
-
--
-  type: "table"
-  title: "HTML performance trending dashboard 1t1c-3n-tsh"
-  algorithm: "table_perf_trending_dash_html"
-  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-tsh.csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-tsh.rst"
-  testbed: "3n-tsh"
-
--
-  type: "table"
-  title: "HTML performance trending dashboard 2t2c-3n-tsh"
-  algorithm: "table_perf_trending_dash_html"
-  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-tsh.csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-tsh.rst"
-  testbed: "3n-tsh"
-
--
-  type: "table"
-  title: "HTML performance trending dashboard 4t4c-3n-tsh"
-  algorithm: "table_perf_trending_dash_html"
-  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-tsh.csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-tsh.rst"
-  testbed: "3n-tsh"
-
--
-  type: "table"
-  title: "Failed MRR tests 3n-tsh"
-  algorithm: "table_failed_tests"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-tsh"
-  data: "plot-performance-trending-all-3n-tsh"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "status"
-  window: 7  # days
-
--
-  type: "table"
-  title: "HTML Failed MRR tests 3n-tsh"
-  algorithm: "table_failed_tests_html"
-  input-file: "{DIR[STATIC,VPP]}/failed-tests-3n-tsh.csv"
-  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-tsh.rst"
-  testbed: "3n-tsh"
-
-################################################################################
-# 3n-dnv
--
-  type: "table"
-  title: "Performance trending dashboard 1t1c-3n-dnv"
-  algorithm: "table_perf_trending_dash"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-dnv"
-  data: "plot-performance-trending-vpp-3n-dnv"
-  filter: "'MRR' and '1T1C'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  window: 14
-  long-trend-window: 180
-
--
-  type: "table"
-  title: "Performance trending dashboard 2t2c-3n-dnv"
-  algorithm: "table_perf_trending_dash"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-dnv"
-  data: "plot-performance-trending-vpp-3n-dnv"
-  filter: "'MRR' and '2T2C'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  window: 14
-  long-trend-window: 180
-
--
-  type: "table"
-  title: "Performance trending dashboard 4t4c-3n-dnv"
-  algorithm: "table_perf_trending_dash"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-dnv"
-  data: "plot-performance-trending-vpp-3n-dnv"
-  filter: "'MRR' and '4T4C'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  window: 14
-  long-trend-window: 180
-
--
-  type: "table"
-  title: "HTML performance trending dashboard 1t1c-3n-dnv"
-  algorithm: "table_perf_trending_dash_html"
-  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-dnv.csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-dnv.rst"
-  testbed: "3n-dnv"
-
--
-  type: "table"
-  title: "HTML performance trending dashboard 2t2c-3n-dnv"
-  algorithm: "table_perf_trending_dash_html"
-  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-dnv.csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-dnv.rst"
-  testbed: "3n-dnv"
-
--
-  type: "table"
-  title: "HTML performance trending dashboard 4t4c-3n-dnv"
-  algorithm: "table_perf_trending_dash_html"
-  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-dnv.csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-dnv.rst"
-  testbed: "3n-dnv"
-
--
-  type: "table"
-  title: "Failed MRR tests 3n-dnv"
-  algorithm: "table_failed_tests"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-dnv"
-  data: "plot-performance-trending-vpp-3n-dnv"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "status"
-  window: 7  # days
-
--
-  type: "table"
-  title: "HTML Failed MRR tests 3n-dnv"
-  algorithm: "table_failed_tests_html"
-  input-file: "{DIR[STATIC,VPP]}/failed-tests-3n-dnv.csv"
-  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-dnv.rst"
-  testbed: "3n-dnv"
-
-################################################################################
-# 2n-dnv
--
-  type: "table"
-  title: "Performance trending dashboard 1t1c-2n-dnv"
-  algorithm: "table_perf_trending_dash"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-2n-dnv"
-  data: "plot-performance-trending-vpp-2n-dnv"
-  filter: "'MRR' and '1T1C'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  window: 14
-  long-trend-window: 180
-
--
-  type: "table"
-  title: "Performance trending dashboard 2t2c-2n-dnv"
-  algorithm: "table_perf_trending_dash"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-2n-dnv"
-  data: "plot-performance-trending-vpp-2n-dnv"
-  filter: "'MRR' and '2T2C'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  window: 14
-  long-trend-window: 180
-
--
-  type: "table"
-  title: "Performance trending dashboard 4t4c-2n-dnv"
-  algorithm: "table_perf_trending_dash"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-2n-dnv"
-  data: "plot-performance-trending-vpp-2n-dnv"
-  filter: "'MRR' and '4T4C'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  window: 14
-  long-trend-window: 180
-
--
-  type: "table"
-  title: "HTML performance trending dashboard 1t1c-2n-dnv"
-  algorithm: "table_perf_trending_dash_html"
-  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-2n-dnv.csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-2n-dnv.rst"
-  testbed: "2n-dnv"
-
--
-  type: "table"
-  title: "HTML performance trending dashboard 2t2c-2n-dnv"
-  algorithm: "table_perf_trending_dash_html"
-  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-2n-dnv.csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-2n-dnv.rst"
-  testbed: "2n-dnv"
-
--
-  type: "table"
-  title: "HTML performance trending dashboard 4t4c-2n-dnv"
-  algorithm: "table_perf_trending_dash_html"
-  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-2n-dnv.csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-2n-dnv.rst"
-  testbed: "2n-dnv"
-
--
-  type: "table"
-  title: "Failed MRR tests 2n-dnv"
-  algorithm: "table_failed_tests"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-dnv"
-  data: "plot-performance-trending-vpp-2n-dnv"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "status"
-  window: 7  # days
-
--
-  type: "table"
-  title: "HTML Failed MRR tests 2n-dnv"
-  algorithm: "table_failed_tests_html"
-  input-file: "{DIR[STATIC,VPP]}/failed-tests-2n-dnv.csv"
-  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-dnv.rst"
-  testbed: "2n-dnv"
-
 ################################################################################
 ###                                 C P T A                                  ###
 ################################################################################
 
   plots:
 
-################################################################################
-# NFV
-
-    - title: "VPP 2T1C NF Service Density VNFc IMIX MRR Trending 2n-skx"
-      output-file-name: "2n-skx-xxv710-imix-2t1c-vhost-chains-dpdk"
-      data: "plot-performance-trending-vpp-nfv-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN' and not 'VXLAN'"
-      groups:
-        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
-        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
-        - ["4R1C", "4R2C", "4R4C", "4R6C"]
-        - ["6R1C", "6R2C", "6R4C"]
-        - ["8R1C", "8R2C"]
-        - ["10R1C", "10R2C"]
-      group-names:
-        - "1 Chain"
-        - "2 Chains"
-        - "4 Chains"
-        - "6 Chains"
-        - "8 Chains"
-        - "10 Chains"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T2C NF Service Density VNFc IMIX MRR Trending 2n-skx"
-      output-file-name: "2n-skx-xxv710-imix-4t2c-vhost-chains-dpdk"
-      data: "plot-performance-trending-vpp-nfv-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN' and not 'VXLAN'"
-      groups:
-        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
-        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
-        - ["4R1C", "4R2C", "4R4C", "4R6C"]
-        - ["6R1C", "6R2C", "6R4C"]
-        - ["8R1C", "8R2C"]
-        - ["10R1C", "10R2C"]
-      group-names:
-        - "1 Chain"
-        - "2 Chains"
-        - "4 Chains"
-        - "6 Chains"
-        - "8 Chains"
-        - "10 Chains"
-      layout: "plot-cpta"
-
-    - title: "VPP 8T4C NF Service Density VNFc IMIX MRR Trending 2n-skx"
-      output-file-name: "2n-skx-xxv710-imix-8t4c-vhost-chains-dpdk"
-      data: "plot-performance-trending-vpp-nfv-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN' and not 'VXLAN'"
-      groups:
-        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
-        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
-        - ["4R1C", "4R2C", "4R4C", "4R6C"]
-        - ["6R1C", "6R2C", "6R4C"]
-        - ["8R1C", "8R2C"]
-        - ["10R1C", "10R2C"]
-      group-names:
-        - "1 Chain"
-        - "2 Chains"
-        - "4 Chains"
-        - "6 Chains"
-        - "8 Chains"
-        - "10 Chains"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T1C NF Service Density VNFc VXLAN IMIX MRR Trending 2n-skx"
-      output-file-name: "2n-skx-xxv710-imix-2t1c-vhost-chains-vxlan-dpdk"
-      data: "plot-performance-trending-vpp-nfv-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN' and 'VXLAN'"
-      groups:
-        - ["1R1C", ]
-        - ["2R1C", ]
-        - ["4R1C", ]
-        - ["6R1C", ]
-        - ["8R1C", ]
-        - ["10R1C", ]
-      group-names:
-        - "1 Chain"
-        - "2 Chains"
-        - "4 Chains"
-        - "6 Chains"
-        - "8 Chains"
-        - "10 Chains"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T2C NF Service Density VNFc VXLAN IMIX MRR Trending 2n-skx"
-      output-file-name: "2n-skx-xxv710-imix-4t2c-vhost-chains-vxlan-dpdk"
-      data: "plot-performance-trending-vpp-nfv-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN' and 'VXLAN'"
-      groups:
-        - ["1R1C", ]
-        - ["2R1C", ]
-        - ["4R1C", ]
-        - ["6R1C", ]
-        - ["8R1C", ]
-        - ["10R1C", ]
-      group-names:
-        - "1 Chain"
-        - "2 Chains"
-        - "4 Chains"
-        - "6 Chains"
-        - "8 Chains"
-        - "10 Chains"
-      layout: "plot-cpta"
-
-    - title: "VPP 8T4C NF Service Density VNFc VXLAN IMIX MRR Trending 2n-skx"
-      output-file-name: "2n-skx-xxv710-imix-8t4c-vhost-chains-vxlan-dpdk"
-      data: "plot-performance-trending-vpp-nfv-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN' and 'VXLAN'"
-      groups:
-        - ["1R1C", ]
-        - ["2R1C", ]
-        - ["4R1C", ]
-        - ["6R1C", ]
-        - ["8R1C", ]
-        - ["10R1C", ]
-      group-names:
-        - "1 Chain"
-        - "2 Chains"
-        - "4 Chains"
-        - "6 Chains"
-        - "8 Chains"
-        - "10 Chains"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T1C NF Service Density CNFc IMIX MRR Trending 2n-skx"
-      output-file-name: "2n-skx-xxv710-imix-2t1c-memif-chains-dpdk"
-      data: "plot-performance-trending-vpp-nfv-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'CHAIN' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN'"
-      groups:
-        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
-        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
-        - ["4R1C", "4R2C", "4R4C", "4R6C"]
-        - ["6R1C", "6R2C", "6R4C"]
-        - ["8R1C", "8R2C"]
-        - ["10R1C", "10R2C"]
-      group-names:
-        - "1 Chain"
-        - "2 Chains"
-        - "4 Chains"
-        - "6 Chains"
-        - "8 Chains"
-        - "10 Chains"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T2C NF Service Density CNFc IMIX MRR Trending 2n-skx"
-      output-file-name: "2n-skx-xxv710-imix-4t2c-memif-chains-dpdk"
-      data: "plot-performance-trending-vpp-nfv-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'CHAIN' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN'"
-      groups:
-        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
-        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
-        - ["4R1C", "4R2C", "4R4C", "4R6C"]
-        - ["6R1C", "6R2C", "6R4C"]
-        - ["8R1C", "8R2C"]
-        - ["10R1C", "10R2C"]
-      group-names:
-        - "1 Chain"
-        - "2 Chains"
-        - "4 Chains"
-        - "6 Chains"
-        - "8 Chains"
-        - "10 Chains"
-      layout: "plot-cpta"
-
-    - title: "VPP 8T4C NF Service Density CNFc IMIX MRR Trending 2n-skx"
-      output-file-name: "2n-skx-xxv710-imix-8t4c-memif-chains-dpdk"
-      data: "plot-performance-trending-vpp-nfv-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'CHAIN' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN'"
-      groups:
-        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
-        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
-        - ["4R1C", "4R2C", "4R4C", "4R6C"]
-        - ["6R1C", "6R2C", "6R4C"]
-        - ["8R1C", "8R2C"]
-        - ["10R1C", "10R2C"]
-      group-names:
-        - "1 Chain"
-        - "2 Chains"
-        - "4 Chains"
-        - "6 Chains"
-        - "8 Chains"
-        - "10 Chains"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T1C NF Service Density CNFp IMIX MRR Trending 2n-skx"
-      output-file-name: "2n-skx-xxv710-imix-2t1c-memif-pipelines-dpdk"
-      data: "plot-performance-trending-vpp-nfv-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'PIPELINE' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN'"
-      groups:
-        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
-        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
-        - ["4R1C", "4R2C", "4R4C", "4R6C"]
-        - ["6R1C", "6R2C", "6R4C"]
-        - ["8R1C", "8R2C"]
-        - ["10R1C", "10R2C"]
-      group-names:
-        - "1 Pipe"
-        - "2 Pipes"
-        - "4 Pipes"
-        - "6 Pipes"
-        - "8 Pipes"
-        - "10 Pipes"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T2C NF Service Density CNFp IMIX MRR Trending 2n-skx"
-      output-file-name: "2n-skx-xxv710-imix-4t2c-memif-pipelines-dpdk"
-      data: "plot-performance-trending-vpp-nfv-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'PIPELINE' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN'"
-      groups:
-        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
-        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
-        - ["4R1C", "4R2C", "4R4C", "4R6C"]
-        - ["6R1C", "6R2C", "6R4C"]
-        - ["8R1C", "8R2C"]
-        - ["10R1C", "10R2C"]
-      group-names:
-        - "1 Pipe"
-        - "2 Pipes"
-        - "4 Pipes"
-        - "6 Pipes"
-        - "8 Pipes"
-        - "10 Pipes"
-      layout: "plot-cpta"
-
-    - title: "VPP 8T4C NF Service Density CNFp IMIX MRR Trending 2n-skx"
-      output-file-name: "2n-skx-xxv710-imix-8t4c-memif-pipelines-dpdk"
-      data: "plot-performance-trending-vpp-nfv-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'PIPELINE' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN'"
-      groups:
-        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
-        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
-        - ["4R1C", "4R2C", "4R4C", "4R6C"]
-        - ["6R1C", "6R2C", "6R4C"]
-        - ["8R1C", "8R2C"]
-        - ["10R1C", "10R2C"]
-      group-names:
-        - "1 Pipe"
-        - "2 Pipes"
-        - "4 Pipes"
-        - "6 Pipes"
-        - "8 Pipes"
-        - "10 Pipes"
-      layout: "plot-cpta"
-
-################################################################################
-
     - 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.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-2t1c-eth-l2xcbase-eth-2memif-1lxc-mrr"
-        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
       include:
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-4t2c-eth-l2xcbase-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-4t2c-eth-l2xcbase-eth-2memif-1lxc-mrr"
-        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-4t2c-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
       include:
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-8t4c-eth-l2xcbase-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-8t4c-eth-l2xcbase-eth-2memif-1lxc-mrr"
-        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-8t4c-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-tsh-xxv710-64b-1t1c-memif-base-dpdk"
-      output-file-name: "3n-tsh-xxv710-64b-1t1c-memif-base-dpdk"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-1t1c-eth-l2xcbase-eth-2memif-1dcr-mrr"
-        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-1t1c-eth-l2xcbase-eth-2memif-1lxc-mrr"
-        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
-        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
-        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-1t1c-ethip4-ip4base-eth-2memif-1dcr-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-xxv710-64b-2t2c-memif-base-dpdk"
-      output-file-name: "3n-tsh-xxv710-64b-2t2c-memif-base-dpdk"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-2t2c-eth-l2xcbase-eth-2memif-1dcr-mrr"
-        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-2t2c-eth-l2xcbase-eth-2memif-1lxc-mrr"
-        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-2t2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
-        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
-        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-2t2c-ethip4-ip4base-eth-2memif-1dcr-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-xxv710-64b-4t4c-memif-base-dpdk"
-      output-file-name: "3n-tsh-xxv710-64b-4t4c-memif-base-dpdk"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-4t4c-eth-l2xcbase-eth-2memif-1dcr-mrr"
-        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-4t4c-eth-l2xcbase-eth-2memif-1lxc-mrr"
-        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-4t4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
-        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-4t4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
-        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-4t4c-ethip4-ip4base-eth-2memif-1dcr-mrr"
-      layout: "plot-cpta"
-
     - title: "2n-clx-x710-64b-2t1c-ip4routing-base-scale-avf-dpdk"
       output-file-name: "2n-clx-x710-64b-2t1c-ip4-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Mrr.64B-2t1c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-mrr.64B-2t1c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-2t1c-avf-ethip4-ip4scale2m-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-mrr.64B-2t1c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
       output-file-name: "2n-clx-x710-64b-4t2c-ip4-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Mrr.64B-4t2c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-mrr.64B-4t2c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-4t2c-avf-ethip4-ip4scale2m-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-4t2c-avf-ethip4-ip4scale2m-rnd-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-mrr.64B-4t2c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
       output-file-name: "2n-clx-x710-64b-8t4c-ip4-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Mrr.64B-8t4c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-mrr.64B-8t4c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-8t4c-avf-ethip4-ip4scale2m-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-8t4c-avf-ethip4-ip4scale2m-rnd-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-mrr.64B-8t4c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-ip4routing-base-avf"
+    - title: "2n-clx-xxv710-64b-2t1c-ip4routing-base-avf-dpdk"
       output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-2t1c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-2t1c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-4t2c-ip4routing-base-avf"
+    - title: "2n-clx-xxv710-64b-4t2c-ip4routing-base-avf-dpdk"
       output-file-name: "2n-clx-xxv710-64b-4t2c-ip4-base-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-4t2c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-4t2c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-8t4c-ip4routing-base-avf"
+    - title: "2n-clx-xxv710-64b-8t4c-ip4routing-base-avf-dpdk"
       output-file-name: "2n-clx-xxv710-64b-8t4c-ip4-base-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-8t4c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-8t4c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-2t1c-ip4routing-scale-avf"
         - "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-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"
+        - "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-scale-dpdk"
         - "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"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-mrr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-4t2c-features-ip4routing-base-avf"
         - "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"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-mrr.64B-4t2c-avf-ethip4udp-nat44det-h1-p1-s1-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-4t2c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-8t4c-features-ip4routing-base-avf"
         - "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"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-mrr.64B-8t4c-avf-ethip4udp-nat44det-h1-p1-s1-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-8t4c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-2t1c-features-ip4routing-base-dpdk"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-features-dpdk"
+    - title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-2t1c-ethip4udp-ip4base-nat44-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr.64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr.64b-2t1c-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr.64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr.64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr.64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-4t2c-features-ip4routing-base-dpdk"
-      output-file-name: "2n-clx-xxv710-64b-4t2c-ip4-features-dpdk"
+    - title: "2n-clx-xxv710-64b-4t2c-nat44det-ip4routing-stl-bidir-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-nat44det-ip4routing-stl-bidir-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-4t2c-ethip4udp-ip4base-nat44-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr.64b-4t2c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr.64b-4t2c-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr.64b-4t2c-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr.64b-4t2c-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr.64b-4t2c-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-xxv710-64b-8t4c-features-ip4routing-base-dpdk"
-      output-file-name: "2n-clx-xxv710-64b-8t4c-ip4-features-dpdk"
+    - title: "2n-clx-xxv710-64b-8t4c-nat44det-ip4routing-stl-bidir-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-nat44det-ip4routing-stl-bidir-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-8t4c-ethip4udp-ip4base-nat44-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr.64b-8t4c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr.64b-8t4c-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr.64b-8t4c-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr.64b-8t4c-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr.64b-8t4c-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-stl-unidir-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-stl-unidir-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-stl-unidir-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-stl-unidir-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-cps-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-cps-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-pps-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-pps-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-tcp-stf-pps-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-tcp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-tcp-stf-pps-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-tcp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-cx556a-64b-2t1c-rdma-ip4base"
         - "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-Ip4Scale1000-Udpsrcscale15-Nat44-Mrr.64B-2t1c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1-p1-s1-Mrr.64B-2t1c-rdma-ethip4udp-nat44det-h1-p1-s1-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-2t1c-rdma-ethip4udp-nat44det-h1024-p63-s64512-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-cx556a-64b-4t2c-rdma-ethip4-features"
         - "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-Ip4Scale1000-Udpsrcscale15-Nat44-Mrr.64B-4t2c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1-p1-s1-Mrr.64B-4t2c-rdma-ethip4udp-nat44det-h1-p1-s1-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-4t2c-rdma-ethip4udp-nat44det-h1024-p63-s64512-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-cx556a-64b-8t4c-ip4routing-base-scale-avf-dpdk"
         - "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-Ip4Scale1000-Udpsrcscale15-Nat44-Mrr.64B-8t4c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-dnv-x553-64b-1t1c-ip4routing-base-scale-ixgbe"
-      output-file-name: "2n-dnv-x553-64b-1t1c-ip4-ixgbe"
-      data: "plot-performance-trending-vpp-2n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Dot1Q-Ip4Base-mrr.64B-1t1c-dot1q-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-1t1c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-mrr.64B-1t1c-ethip4-ip4scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale200K-mrr.64B-1t1c-ethip4-ip4scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale2M-mrr.64B-1t1c-ethip4-ip4scale2m-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-dnv-x553-64b-2t2c-ip4routing-base-scale-ixgbe"
-      output-file-name: "2n-dnv-x553-64b-2t2c-ip4-ixgbe"
-      data: "plot-performance-trending-vpp-2n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Dot1Q-Ip4Base-mrr.64B-2t2c-dot1q-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-2t2c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-mrr.64B-2t2c-ethip4-ip4scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale200K-mrr.64B-2t2c-ethip4-ip4scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale2M-mrr.64B-2t2c-ethip4-ip4scale2m-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-dnv-x553-64b-4t4c-ip4routing-base-scale-ixgbe"
-      output-file-name: "2n-dnv-x553-64b-4t4c-ip4-ixgbe"
-      data: "plot-performance-trending-vpp-2n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Dot1Q-Ip4Base-mrr.64B-4t4c-dot1q-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-4t4c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-mrr.64B-4t4c-ethip4-ip4scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale200K-mrr.64B-4t4c-ethip4-ip4scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale2M-mrr.64B-4t4c-ethip4-ip4scale2m-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-dnv-x553-64b-1t1c-features-ip4routing-base-ixgbe"
-      output-file-name: "2n-dnv-x553-64b-1t1c-ip4-features-ixgbe"
-      data: "plot-performance-trending-vpp-2n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-.10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-1t1c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-1t1c-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-.10Ge2P1X553-Ethip4Udp-Ip4Base-Nat44-mrr.64B-1t1c-ethip4udp-ip4base-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-dnv-x553-64b-2t2c-features-ip4routing-base-ixgbe"
-      output-file-name: "2n-dnv-x553-64b-2t2c-ip4-features-ixgbe"
-      data: "plot-performance-trending-vpp-2n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-.10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-2t2c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-2t2c-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-2t2c-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-2t2c-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-2t2c-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-.10Ge2P1X553-Ethip4Udp-Ip4Base-Nat44-mrr.64B-2t2c-ethip4udp-ip4base-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-dnv-x553-64b-4t4c-features-ip4routing-base-ixgbe"
-      output-file-name: "2n-dnv-x553-64b-4t4c-ip4-features-ixgbe"
-      data: "plot-performance-trending-vpp-2n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-.10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-4t4c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-4t4c-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-4t4c-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-4t4c-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-4t4c-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-.10Ge2P1X553-Ethip4Udp-Ip4Base-Nat44-mrr.64B-4t4c-ethip4udp-ip4base-nat44-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1-p1-s1-Mrr.64B-8t4c-rdma-ethip4udp-nat44det-h1-p1-s1-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-8t4c-rdma-ethip4udp-nat44det-h1024-p63-s64512-mrr"
       layout: "plot-cpta"
 
     - title: "2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-dpdk"
       output-file-name: "2n-skx-x710-64b-2t1c-ip4-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Mrr.64B-2t1c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-mrr.64B-2t1c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-2t1c-avf-ethip4-ip4scale2m-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-mrr.64B-2t1c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
       output-file-name: "2n-skx-x710-64b-4t2c-ip4-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Mrr.64B-4t2c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-mrr.64B-4t2c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-4t2c-avf-ethip4-ip4scale2m-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-4t2c-avf-ethip4-ip4scale2m-rnd-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-mrr.64B-4t2c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
       output-file-name: "2n-skx-x710-64b-8t4c-ip4-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Mrr.64B-8t4c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-mrr.64B-8t4c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-8t4c-avf-ethip4-ip4scale2m-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-8t4c-avf-ethip4-ip4scale2m-rnd-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-mrr.64B-8t4c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
         - "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"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-mrr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-4t2c-features-ip4routing-base-avf"
         - "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"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-mrr.64B-4t2c-avf-ethip4udp-nat44det-h1-p1-s1-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-4t2c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-8t4c-features-ip4routing-base-avf"
         - "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"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-mrr.64B-8t4c-avf-ethip4udp-nat44det-h1-p1-s1-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-8t4c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk"
-      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-features-dpdk"
+    - title: "2n-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-2t1c-ethip4udp-ip4base-nat44-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr.64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr.64b-2t1c-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr.64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr.64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr.64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-xxv710-64b-4t2c-features-ip4routing-base-dpdk"
-      output-file-name: "2n-skx-xxv710-64b-4t2c-ip4-features-dpdk"
+    - title: "2n-skx-xxv710-64b-4t2c-nat44det-ip4routing-stl-bidir-avf"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-nat44det-ip4routing-stl-bidir-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-4t2c-ethip4udp-ip4base-nat44-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr.64b-4t2c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr.64b-4t2c-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr.64b-4t2c-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr.64b-4t2c-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr.64b-4t2c-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-xxv710-64b-8t4c-features-ip4routing-base-dpdk"
-      output-file-name: "2n-skx-xxv710-64b-8t4c-ip4-features-dpdk"
+    - title: "2n-skx-xxv710-64b-8t4c-nat44det-ip4routing-stl-bidir-avf"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-nat44det-ip4routing-stl-bidir-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-8t4c-ethip4udp-ip4base-nat44-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr.64b-8t4c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr.64b-8t4c-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr.64b-8t4c-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr.64b-8t4c-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr.64b-8t4c-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-dnv-x553-64b-1t1c-ip4routing-base-scale-ixgbe"
-      output-file-name: "3n-dnv-x553-64b-1t1c-ip4-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Dot1Q-Ip4Base-mrr.64B-1t1c-dot1q-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-1t1c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale20K-mrr.64B-1t1c-ethip4-ip4scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale200K-mrr.64B-1t1c-ethip4-ip4scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale2M-mrr.64B-1t1c-ethip4-ip4scale2m-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-dnv-x553-64b-2t2c-ip4routing-base-scale-ixgbe"
-      output-file-name: "3n-dnv-x553-64b-2t2c-ip4-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
+    - title: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-stl-unidir-avf"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-stl-unidir-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Dot1Q-Ip4Base-mrr.64B-2t2c-dot1q-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-2t2c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale20K-mrr.64B-2t2c-ethip4-ip4scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale200K-mrr.64B-2t2c-ethip4-ip4scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale2M-mrr.64B-2t2c-ethip4-ip4scale2m-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-dnv-x553-64b-4t4c-ip4routing-base-scale-ixgbe"
-      output-file-name: "3n-dnv-x553-64b-4t4c-ip4-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
+    - title: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-stl-unidir-avf"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-stl-unidir-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Dot1Q-Ip4Base-mrr.64B-4t4c-dot1q-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-4t4c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale20K-mrr.64B-4t4c-ethip4-ip4scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale200K-mrr.64B-4t4c-ethip4-ip4scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale2M-mrr.64B-4t4c-ethip4-ip4scale2m-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-dnv-x553-64b-1t1c-features-ip4routing-base-ixgbe"
-      output-file-name: "3n-dnv-x553-64b-1t1c-ip4-features-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-1t1c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-1t1c-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Nat44-mrr.64B-1t1c-ethip4udp-ip4base-nat44-mrr"
-      layout: "plot-cpta"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
 
-    - title: "3n-dnv-x553-64b-2t2c-features-ip4routing-base-ixgbe"
-      output-file-name: "3n-dnv-x553-64b-2t2c-ip4-features-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
+    - title: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-cps-avf"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-2t2c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-2t2c-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-2t2c-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-2t2c-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-2t2c-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Nat44-mrr.64B-2t2c-ethip4udp-ip4base-nat44-mrr"
-      layout: "plot-cpta"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-cps-avf"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
 
-    - title: "3n-dnv-x553-64b-4t4c-features-ip4routing-base-ixgbe"
-      output-file-name: "3n-dnv-x553-64b-4t4c-ip4-features-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-4t4c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-4t4c-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-4t4c-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-4t4c-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-4t4c-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Nat44-mrr.64B-4t4c-ethip4udp-ip4base-nat44-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-pps-avf"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-pps-avf"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-dpdk"
-      output-file-name: "3n-hsw-xl710-64b-1t1c-ip4-base-scale-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
+    - title: "2n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-features-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-mrr.64B-1t1c-dot1q-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-mrr.64B-1t1c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-ip4scale20k-mrr.64B-1t1c-ethip4-ip4scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-ip4scale200k-mrr.64B-1t1c-ethip4-ip4scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-mrr.64B-1t1c-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-mrr.64B-2t1c-ethip4udp-nat44det-h1-p1-s1-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-xl710-64b-2t2c-ip4routing-base-scale-dpdk"
-      output-file-name: "3n-hsw-xl710-64b-2t2c-ip4-base-scale-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
+    - title: "2n-skx-xxv710-64b-4t2c-features-ip4routing-base-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-ip4-features-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-mrr.64B-2t2c-dot1q-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-mrr.64B-2t2c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-ip4scale20k-mrr.64B-2t2c-ethip4-ip4scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-ip4scale200k-mrr.64B-2t2c-ethip4-ip4scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-mrr.64B-2t2c-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-mrr.64B-4t2c-ethip4udp-nat44det-h1-p1-s1-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-xl710-64b-4t4c-ip4routing-base-scale-dpdk"
-      output-file-name: "3n-hsw-xl710-64b-4t4c-ip4-base-scale-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
+    - title: "2n-skx-xxv710-64b-8t4c-features-ip4routing-base-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-ip4-features-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-mrr.64B-4t4c-dot1q-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-mrr.64B-4t4c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-ip4scale20k-mrr.64B-4t4c-ethip4-ip4scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-ip4scale200k-mrr.64B-4t4c-ethip4-ip4scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-mrr.64B-4t4c-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-mrr.64B-8t4c-ethip4udp-nat44det-h1-p1-s1-mrr"
       layout: "plot-cpta"
 
     - title: "3n-skx-x710-64b-2t1c-ip4routing-base-scale-avf"
       output-file-name: "3n-skx-x710-64b-2t1c-ip4-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Dot1Q-Ip4Base-Mrr.64B-2t1c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Mrr.64B-2t1c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Mrr.64B-2t1c-avf-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
       output-file-name: "3n-skx-x710-64b-4t2c-ip4-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Dot1Q-Ip4Base-Mrr.64B-4t2c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Mrr.64B-4t2c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Mrr.64B-4t2c-avf-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
       output-file-name: "3n-skx-x710-64b-8t4c-ip4-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Dot1Q-Ip4Base-Mrr.64B-8t4c-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Mrr.64B-8t4c-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Mrr.64B-8t4c-avf-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
       output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-mrr.64B-2t1c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-mrr.64B-2t1c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
       output-file-name: "3n-skx-xxv710-64b-4t2c-ip4-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-mrr.64B-4t2c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-mrr.64B-4t2c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
       output-file-name: "3n-skx-xxv710-64b-8t4c-ip4-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-mrr.64B-8t4c-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-mrr.64B-8t4c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-features-avf"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-2t1c-avf-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-mrr.64B-2t1c-avf-ethip4udp-ip4base-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-4t2c-features-ip4routing-base-avf"
-      output-file-name: "3n-skx-xxv710-64b-4t2c-ip4-features-avf"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-4t2c-avf-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-mrr.64B-4t2c-avf-ethip4udp-ip4base-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-8t4c-features-ip4routing-base-avf"
-      output-file-name: "3n-skx-xxv710-64b-8t4c-ip4-features-avf"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-8t4c-avf-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-mrr.64B-8t4c-avf-ethip4udp-ip4base-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-features-dpdk"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-2t1c-ethip4udp-ip4base-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-4t2c-features-ip4routing-base-dpdk"
-      output-file-name: "3n-skx-xxv710-64b-4t2c-ip4-features-dpdk"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-4t2c-ethip4udp-ip4base-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-8t4c-features-ip4routing-base-dpdk"
-      output-file-name: "3n-skx-xxv710-64b-8t4c-ip4-features-dpdk"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-8t4c-ethip4udp-ip4base-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-1t1c-ip4routing-base-scale-ixgbe"
-      output-file-name: "3n-tsh-x520-64b-1t1c-ip4-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Dot1Q-Ip4Base-mrr.64B-1t1c-dot1q-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-mrr.64B-1t1c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale20K-mrr.64B-1t1c-ethip4-ip4scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale200K-mrr.64B-1t1c-ethip4-ip4scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale2M-mrr.64B-1t1c-ethip4-ip4scale2m-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-2t2c-ip4routing-base-scale-ixgbe"
-      output-file-name: "3n-tsh-x520-64b-2t2c-ip4-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Dot1Q-Ip4Base-mrr.64B-2t2c-dot1q-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-mrr.64B-2t2c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale20K-mrr.64B-2t2c-ethip4-ip4scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale200K-mrr.64B-2t2c-ethip4-ip4scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale2M-mrr.64B-2t2c-ethip4-ip4scale2m-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-4t4c-ip4routing-base-scale-ixgbe"
-      output-file-name: "3n-tsh-x520-64b-4t4c-ip4-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Dot1Q-Ip4Base-mrr.64B-4t4c-dot1q-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-mrr.64B-4t4c-ethip4-ip4base-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale20K-mrr.64B-4t4c-ethip4-ip4scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale200K-mrr.64B-4t4c-ethip4-ip4scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale2M-mrr.64B-4t4c-ethip4-ip4scale2m-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-1t1c-ip4routing-features-ixgbe"
-      output-file-name: "3n-tsh-x520-64b-1t1c-ip4-features-ixgbe-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Mrr.64B-1t1c-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Mrr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Mrr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Mrr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Nat44-Mrr.64B-1t1c-ethip4udp-ip4base-nat44-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Mrr.64B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-2t2c-ip4routing-features-ixgbe"
-      output-file-name: "3n-tsh-x520-64b-2t2c-ip4-features-ixgbe-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Mrr.64B-2t2c-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Mrr.64B-2t2c-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Mrr.64B-2t2c-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Mrr.64B-2t2c-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Nat44-Mrr.64B-2t2c-ethip4udp-ip4base-nat44-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Mrr.64B-2t2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-4t4c-ip4routing-features-ixgbe"
-      output-file-name: "3n-tsh-x520-64b-4t4c-ip4-features-ixgbe-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Mrr.64B-4t4c-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Mrr.64B-4t4c-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Mrr.64B-4t4c-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Mrr.64B-4t4c-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Nat44-Mrr.64B-4t4c-ethip4udp-ip4base-nat44-mrr"
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Mrr.64B-4t4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-64b-1t1c-ip4tunnel-base-scale-ixgbe"
-      output-file-name: "3n-dnv-x553-64b-1t1c-ip4-tunnels-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Ethip4Vxlan-L2Xcbase-mrr.64B-1t1c-ethip4vxlan-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-mrr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-mrr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-64b-2t2c-ip4tunnel-base-scale-ixgbe"
-      output-file-name: "3n-dnv-x553-64b-2t2c-ip4-tunnels-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Ethip4Vxlan-L2Xcbase-mrr.64B-2t2c-ethip4vxlan-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-2t2c-ethip4vxlan-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-mrr.64B-2t2c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-mrr.64B-2t2c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-64b-4t4c-ip4tunnel-base-scale-ixgbe"
-      output-file-name: "3n-dnv-x553-64b-4t4c-ip4-tunnels-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Ethip4Vxlan-L2Xcbase-mrr.64B-4t4c-ethip4vxlan-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-4t4c-ethip4vxlan-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-mrr.64B-4t4c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-mrr.64B-4t4c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-ndr"
-      output-file-name: "3n-hsw-xl710-64b-1t1c-ip4-tunnels-base-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-mrr.64B-1t1c-ethip4vxlan-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-64b-2t2c-ip4tunnel-base-dpdk-ndr"
-      output-file-name: "3n-hsw-xl710-64b-2t2c-ip4-tunnels-base-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-mrr.64B-2t2c-ethip4vxlan-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-2t2c-ethip4vxlan-l2bdbasemaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-64b-4t4c-ip4tunnel-base-dpdk-ndr"
-      output-file-name: "3n-hsw-xl710-64b-4t4c-ip4-tunnels-base-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-mrr.64B-4t4c-ethip4vxlan-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-4t4c-ethip4vxlan-l2bdbasemaclrn-mrr"
-      layout: "plot-cpta"
-
     - title: "3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-avf-dpdk"
       output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
         - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-Mrr.64B-8t4c-ethip4vxlan-l2xcbase-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-ixgbe"
-      output-file-name: "3n-tsh-x520-64b-1t1c-ip4-tunnels-base-scale-dpdk"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Xcbase-mrr.64B-1t1c-ethip4vxlan-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-mrr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-mrr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-2t2c-ip4tunnel-base-scale-ixgbe"
-      output-file-name: "3n-tsh-x520-64b-2t2c-ip4-tunnels-base-scale-dpdk"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Xcbase-mrr.64B-2t2c-ethip4vxlan-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-2t2c-ethip4vxlan-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-mrr.64B-2t2c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-mrr.64B-2t2c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-4t4c-ip4tunnel-base-scale-ixgbe"
-      output-file-name: "3n-tsh-x520-64b-4t4c-ip4-tunnels-base-scale-dpdk"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Xcbase-mrr.64B-4t4c-ethip4vxlan-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-4t4c-ethip4vxlan-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-mrr.64B-4t4c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-mrr.64B-1t1c-4t4c--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-clx-x710-78b-2t1c-ip6routing-base-scale-dpdk"
-      output-file-name: "2n-clx-x710-78b-2t1c-ip6-base-scale-dpdk"
+    - title: "2n-clx-x710-78b-2t1c-ip6routing-base-scale-avf-dpdk"
+      output-file-name: "2n-clx-x710-78b-2t1c-ip6-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Mrr.78B-2t1c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Mrr.78B-2t1c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-2t1c-avf-ethip6-ip6scale2m-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-mrr.78B-2t1c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-2t1c-ethip6-ip6base-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-78b-4t2c-ip6routing-base-scale-dpdk"
-      output-file-name: "2n-clx-x710-78b-4t2c-ip6-base-scale-dpdk"
+    - title: "2n-clx-x710-78b-4t2c-ip6routing-base-scale-avf-dpdk"
+      output-file-name: "2n-clx-x710-78b-4t2c-ip6-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Mrr.78B-4t2c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Mrr.78B-4t2c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-4t2c-avf-ethip6-ip6scale2m-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-mrr.78B-4t2c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-4t2c-ethip6-ip6base-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-78b-8t4c-ip6routing-base-scale-dpdk"
-      output-file-name: "2n-clx-x710-78b-8t4c-ip6-base-scale-dpdk"
+    - title: "2n-clx-x710-78b-8t4c-ip6routing-base-scale-avf-dpdk"
+      output-file-name: "2n-clx-x710-78b-8t4c-ip6-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Mrr.78B-8t4c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Mrr.78B-8t4c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-8t4c-avf-ethip6-ip6scale2m-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-mrr.78B-8t4c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-8t4c-ethip6-ip6base-mrr"
       layout: "plot-cpta"
 
       output-file-name: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-mrr.78B-2t1c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-2t1c-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-mrr.78B-2t1c-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-mrr.78B-2t1c-ethip6-ip6scale200k-mrr"
       output-file-name: "2n-clx-xxv710-78b-4t2c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-mrr.78B-4t2c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-4t2c-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-mrr.78B-4t2c-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-mrr.78B-4t2c-ethip6-ip6scale200k-mrr"
       output-file-name: "2n-clx-xxv710-78b-8t4c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-mrr.78B-8t4c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-8t4c-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-mrr.78B-8t4c-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-mrr.78B-8t4c-ethip6-ip6scale200k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale2M-Mrr.78B-8t4c-rdma-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-dnv-x553-78b-1t1c-ip6-base-scale-ixgbe"
-      output-file-name: "2n-dnv-x553-78b-1t1c-ip6-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-2n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Dot1Q-Ip6Base-mrr.78B-1t1c-dot1q-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Base-mrr.78B-1t1c-ethip6-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale20K-mrr.78B-1t1c-ethip6-ip6scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale200K-mrr.78B-1t1c-ethip6-ip6scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale2M-mrr.78B-1t1c-ethip6-ip6scale2m-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-dnv-x553-78b-2t2c-ip6-base-scale-ixgbe"
-      output-file-name: "2n-dnv-x553-78b-2t2c-ip6-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-2n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Dot1Q-Ip6Base-mrr.78B-2t2c-dot1q-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Base-mrr.78B-2t2c-ethip6-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale20K-mrr.78B-2t2c-ethip6-ip6scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale200K-mrr.78B-2t2c-ethip6-ip6scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale2M-mrr.78B-2t2c-ethip6-ip6scale2m-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-dnv-x553-78b-4t4c-ip6-base-scale-ixgbe"
-      output-file-name: "2n-dnv-x553-78b-4t4c-ip6-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-2n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Dot1Q-Ip6Base-mrr.78B-4t4c-dot1q-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Base-mrr.78B-4t4c-ethip6-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale20K-mrr.78B-4t4c-ethip6-ip6scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale200K-mrr.78B-4t4c-ethip6-ip6scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale2M-mrr.78B-4t4c-ethip6-ip6scale2m-mrr"
-      layout: "plot-cpta"
-
     - title: "2n-skx-x710-78b-2t1c-ip6routing-base-scale-avf-dpdk"
       output-file-name: "2n-skx-x710-78b-2t1c-ip6-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Mrr.78B-2t1c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Mrr.78B-2t1c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-2t1c-avf-ethip6-ip6scale2m-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-mrr.78B-2t1c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-2t1c-ethip6-ip6base-mrr"
       layout: "plot-cpta"
 
       output-file-name: "2n-skx-x710-78b-4t2c-ip6-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Mrr.78B-4t2c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Mrr.78B-4t2c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-4t2c-avf-ethip6-ip6scale2m-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-mrr.78B-4t2c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-4t2c-ethip6-ip6base-mrr"
       layout: "plot-cpta"
 
       output-file-name: "2n-skx-x710-78b-8t4c-ip6-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Mrr.78B-8t4c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Mrr.78B-8t4c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-8t4c-avf-ethip6-ip6scale2m-mrr"
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-mrr.78B-8t4c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-8t4c-ethip6-ip6base-mrr"
       layout: "plot-cpta"
 
       output-file-name: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-mrr.78B-2t1c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-mrr.78B-2t1c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-mrr.78B-2t1c-avf-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-mrr.78B-2t1c-avf-ethip6-ip6scale200k-mrr"
       output-file-name: "2n-skx-xxv710-78b-4t2c-ip6-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-mrr.78B-4t2c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-mrr.78B-4t2c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-mrr.78B-4t2c-avf-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-mrr.78B-4t2c-avf-ethip6-ip6scale200k-mrr"
       output-file-name: "2n-skx-xxv710-78b-8t4c-ip6-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-mrr.78B-8t4c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-mrr.78B-8t4c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-mrr.78B-8t4c-avf-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-mrr.78B-8t4c-avf-ethip6-ip6scale200k-mrr"
       output-file-name: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-mrr.78B-2t1c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-2t1c-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-mrr.78B-2t1c-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-mrr.78B-2t1c-ethip6-ip6scale200k-mrr"
       output-file-name: "2n-skx-xxv710-78b-4t2c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-mrr.78B-4t2c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-4t2c-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-mrr.78B-4t2c-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-mrr.78B-4t2c-ethip6-ip6scale200k-mrr"
       output-file-name: "2n-skx-xxv710-78b-8t4c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-mrr.78B-8t4c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-8t4c-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-mrr.78B-8t4c-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-mrr.78B-8t4c-ethip6-ip6scale200k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-mrr.78B-8t4c-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-dnv-x553-78b-1t1c-ip6routing-base-scale-ixgbe"
-      output-file-name: "3n-dnv-x553-78b-1t1c-ip6-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Dot1Q-Ip6Base-mrr.78B-1t1c-dot1q-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Base-mrr.78B-1t1c-ethip6-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale20K-mrr.78B-1t1c-ethip6-ip6scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale200K-mrr.78B-1t1c-ethip6-ip6scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale2M-mrr.78B-1t1c-ethip6-ip6scale2m-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-78b-2t2c-ip6routing-base-scale-ixgbe"
-      output-file-name: "3n-dnv-x553-78b-2t2c-ip6-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Dot1Q-Ip6Base-mrr.78B-2t2c-dot1q-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Base-mrr.78B-2t2c-ethip6-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale20K-mrr.78B-2t2c-ethip6-ip6scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale200K-mrr.78B-2t2c-ethip6-ip6scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale2M-mrr.78B-2t2c-ethip6-ip6scale2m-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-78b-4t4c-ip6routing-base-scale-ixgbe"
-      output-file-name: "3n-dnv-x553-78b-4t4c-ip6-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Dot1Q-Ip6Base-mrr.78B-4t4c-dot1q-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Base-mrr.78B-4t4c-ethip6-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale20K-mrr.78B-4t4c-ethip6-ip6scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale200K-mrr.78B-4t4c-ethip6-ip6scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale2M-mrr.78B-4t4c-ethip6-ip6scale2m-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk"
-      output-file-name: "3n-hsw-xl710-78b-1t1c-ip6-base-scale-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-mrr.78B-1t1c-dot1q-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-mrr.78B-1t1c-ethip6-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-mrr.78B-1t1c-ethip6-ip6scale2m-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-78b-2t2c-ip6routing-base-scale-dpdk"
-      output-file-name: "3n-hsw-xl710-78b-2t2c-ip6-base-scale-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-mrr.78B-2t2c-dot1q-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-mrr.78B-2t2c-ethip6-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-mrr.78B-2t2c-ethip6-ip6scale2m-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-78b-4t4c-ip6routing-base-scale-dpdk"
-      output-file-name: "3n-hsw-xl710-78b-4t4c-ip6-base-scale-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-mrr.78B-4t4c-dot1q-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-mrr.78B-4t4c-ethip6-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-mrr.78B-4t4c-ethip6-ip6scale2m-mrr"
-      layout: "plot-cpta"
-
     - title: "3n-skx-x710-78b-2t1c-ip6routing-base-scale-avf"
       output-file-name: "3n-skx-x710-78b-2t1c-ip6-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Dot1Q-Ip6Base-mrr.78B-2t1c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Base-mrr.78B-2t1c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-mrr.78B-2t1c-avf-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
       output-file-name: "3n-skx-x710-78b-4t2c-ip6-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Dot1Q-Ip6Base-mrr.78B-4t2c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Base-mrr.78B-4t2c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-mrr.78B-4t2c-avf-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
       output-file-name: "3n-skx-x710-78b-8t4c-ip6-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Dot1Q-Ip6Base-mrr.78B-8t4c-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Base-mrr.78B-8t4c-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-mrr.78B-8t4c-avf-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
       output-file-name: "3n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-mrr.78B-2t1c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-2t1c-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-mrr.78B-2t1c-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
       output-file-name: "3n-skx-xxv710-78b-4t2c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-mrr.78B-4t2c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-4t2c-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-mrr.78B-4t2c-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
       output-file-name: "3n-skx-xxv710-78b-8t4c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-mrr.78B-8t4c-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-8t4c-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-mrr.78B-8t4c-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-tsh-x520-78b-1t1c-ip6routing-base-scale-ixgbe"
-      output-file-name: "3n-tsh-x520-78b-1t1c-ip6-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Dot1Q-Ip6Base-mrr.78B-1t1c-dot1q-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Base-mrr.78B-1t1c-ethip6-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale20K-mrr.78B-1t1c-ethip6-ip6scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale200K-mrr.78B-1t1c-ethip6-ip6scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale2M-mrr.78B-1t1c-ethip6-ip6scale2m-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-78b-2t2c-ip6routing-base-scale-ixgbe"
-      output-file-name: "3n-tsh-x520-78b-2t2c-ip6-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Dot1Q-Ip6Base-mrr.78B-2t2c-dot1q-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Base-mrr.78B-2t2c-ethip6-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale20K-mrr.78B-2t2c-ethip6-ip6scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale200K-mrr.78B-2t2c-ethip6-ip6scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale2M-mrr.78B-2t2c-ethip6-ip6scale2m-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-78b-4t4c-ip6routing-base-scale-ixgbe"
-      output-file-name: "3n-tsh-x520-78b-4t4c-ip6-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Dot1Q-Ip6Base-mrr.78B-4t4c-dot1q-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Base-mrr.78B-4t4c-ethip6-ip6base-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale20K-mrr.78B-4t4c-ethip6-ip6scale20k-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale200K-mrr.78B-4t4c-ethip6-ip6scale200k-mrr"
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale2M-mrr.78B-4t4c-ethip6-ip6scale2m-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-imix-1t1c-ipsec-base-scale-sw-ixgbe"
-      output-file-name: "3n-dnv-x553-imix-1t1c-ipsec-base-scale-sw-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-imix-2t2c-ipsec-base-scale-sw-ixgbe"
-      output-file-name: "3n-dnv-x553-imix-2t2c-ipsec-base-scale-sw-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-imix-4t4c-ipsec-base-scale-sw-ixgbe"
-      output-file-name: "3n-dnv-x553-imix-4t4c-ipsec-base-scale-sw-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk"
-      output-file-name: "3n-hsw-xl710-imix-1t1c-ipsec-base-scale-sw-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-imix-2t2c-ipsec-ip4routing-base-scale-sw-dpdk"
-      output-file-name: "3n-hsw-xl710-imix-2t2c-ipsec-base-scale-sw-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-imix-4t4c-ipsec-ip4routing-base-scale-sw-dpdk"
-      output-file-name: "3n-hsw-xl710-imix-4t4c-ipsec-base-scale-sw-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk"
-      output-file-name: "3n-hsw-xl710-imix-1t1c-ipsec-base-scale-hw-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-imix-2t2c-ipsec-ip4routing-base-scale-hw-dpdk"
-      output-file-name: "3n-hsw-xl710-imix-2t2c-ipsec-base-scale-hw-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-imix-4t4c-ipsec-ip4routing-base-scale-hw-dpdk"
-      output-file-name: "3n-hsw-xl710-imix-4t4c-ipsec-base-scale-hw-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-mrr"
-      layout: "plot-cpta"
-
     - title: "3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-avf"
       output-file-name: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-imix-4t2c-ipsec-ip4routing-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-imix-8t4c-ipsec-ip4routing-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-8t4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-8t4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.8t4c-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-8t4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-1518b-4t2c-ipsec-ip4routing-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-4t2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-4t2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-4t2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-4t2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-1518b-8t4c-ipsec-ip4routing-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-8t4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-8t4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
         - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.8t4c-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-8t4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-ixgbe"
-      output-file-name: "3n-tsh-x520-imix-1t1c-ipsec-base-scale-sw-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-tsh-x520-imix-2t2c-ipsec-ip4routing-base-scale-sw-ixgbe"
-      output-file-name: "3n-tsh-x520-imix-2t2c-ipsec-base-scale-sw-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-imix-4t4c-ipsec-ip4routing-base-scale-sw-ixgbe"
-      output-file-name: "3n-tsh-x520-imix-4t4c-ipsec-base-scale-sw-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
-        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
-        - "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"
+    - title: "2n-clx-x710-64b-2t1c-l2switching-base-scale-avf-dpdk"
       output-file-name: "2n-clx-x710-64b-2t1c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-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"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-4t2c-l2switching-base-scale-dpdk"
-      output-file-name: "2n-clx-x710-64b-4t2c-l2-base-scale-dpdk"
+    - title: "2n-clx-x710-64b-4t2c-l2switching-base-scale-avf-dpdk"
+      output-file-name: "2n-clx-x710-64b-4t2c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Mrr.64B-4t2c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Mrr.64B-4t2c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t2c-eth-l2bdscale1mmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-4t2c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-clx-x710-64b-8t4c-l2switching-base-scale-dpdk"
-      output-file-name: "2n-clx-x710-64b-8t4c-l2-base-scale-dpdk"
+    - title: "2n-clx-x710-64b-8t4c-l2switching-base-scale-avf-dpdk"
+      output-file-name: "2n-clx-x710-64b-8t4c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Mrr.64B-8t4c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Mrr.64B-8t4c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-mrr.64B-8t4c-eth-l2bdscale1mmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-8t4c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-2t1c-l2switching-base-avf"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-mrr.64B-2t1c-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-mrr.64B-2t1c-avf-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-mrr.64B-2t1c-avf-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-gbp-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-4t2c-l2switching-base-avf"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-mrr.64B-4t2c-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-mrr.64B-4t2c-avf-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-mrr.64B-4t2c-avf-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-gbp-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-8t4c-l2switching-base-avf"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-mrr.64B-8t4c-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-mrr.64B-8t4c-avf-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-mrr.64B-8t4c-avf-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-gbp-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-2t1c-l2switching-base-dpdk"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-2t1c-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-2t1c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-mrr.64B-2t1c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-2t1c-dot1q-l2bdbasemaclrn-gbp-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-4t2c-l2switching-base-dpdk"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-4t2c-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-4t2c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-mrr.64B-4t2c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-4t2c-dot1q-l2bdbasemaclrn-gbp-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-8t4c-l2switching-base-dpdk"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-8t4c-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-8t4c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-mrr.64B-8t4c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-8t4c-dot1q-l2bdbasemaclrn-gbp-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-2t1c-l2switching-base-scale-avf"
       include:
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Mrr.64B-2t1c-rdma-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Mrr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-gbp-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Mrr.64B-2t1c-rdma-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Mrr.64B-2t1c-rdma-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Mrr.64B-2t1c-rdma-eth-l2bdbasemaclrn-mrr"
       include:
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Mrr.64B-4t2c-rdma-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Mrr.64B-4t2c-rdma-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-4t2c-rdma-dot1q-l2bdbasemaclrn-gbp-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Mrr.64B-4t2c-rdma-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Mrr.64B-4t2c-rdma-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Mrr.64B-4t2c-rdma-eth-l2bdbasemaclrn-mrr"
       include:
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Mrr.64B-8t4c-rdma-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Mrr.64B-8t4c-rdma-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-8t4c-rdma-dot1q-l2bdbasemaclrn-gbp-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Mrr.64B-8t4c-rdma-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Mrr.64B-8t4c-rdma-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Mrr.64B-8t4c-rdma-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale1Mmaclrn-Mrr.64B-8t4c-rdma-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-dnv-x553-64b-1t1c-l2switching-base-ixgbe"
-      output-file-name: "2n-dnv-x553-64b-1t1c-l2-base-ixgbe"
-      data: "plot-performance-trending-vpp-2n-dnv"
-      include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Xcbase-mrr.64B-1t1c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-mrr.64B-1t1c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-mrr.64B-1t1c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-1t1c-eth-l2bdbasemaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-dnv-x553-64b-2t2c-l2switching-base-ixgbe"
-      output-file-name: "2n-dnv-x553-64b-2t2c-l2-base-ixgbe"
-      data: "plot-performance-trending-vpp-2n-dnv"
-      include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Xcbase-mrr.64B-2t2c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-mrr.64B-2t2c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t2c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-2t2c-eth-l2bdbasemaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-dnv-x553-64b-4t4c-l2switching-base-ixgbe"
-      output-file-name: "2n-dnv-x553-64b-4t4c-l2-base-ixgbe"
-      data: "plot-performance-trending-vpp-2n-dnv"
-      include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Xcbase-mrr.64B-4t4c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-mrr.64B-4t4c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t4c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-4t4c-eth-l2bdbasemaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-dnv-x553-64b-1t1c-l2switching-base-scale-ixgbe"
-      output-file-name: "2n-dnv-x553-64b-1t1c-l2-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-2n-dnv"
+    - title: "2n-skx-x710-64b-2t1c-l2switching-base-scale-avf"
+      output-file-name: "2n-skx-x710-64b-2t1c-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Patch-mrr.64B-1t1c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-mrr.64B-1t1c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-1t1c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale10Kmaclrn-mrr.64B-1t1c-eth-l2bdscale10kmaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale100Kmaclrn-mrr.64B-1t1c-eth-l2bdscale100kmaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale1Mmaclrn-mrr.64B-1t1c-eth-l2bdscale1mmaclrn-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-Avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-dnv-x553-64b-2t2c-l2switching-base-scale-ixgbe"
-      output-file-name: "2n-dnv-x553-64b-2t2c-l2-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-2n-dnv"
+    - title: "2n-skx-x710-64b-4t2c-l2switching-base-scale-avf"
+      output-file-name: "2n-skx-x710-64b-4t2c-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Patch-mrr.64B-2t2c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-mrr.64B-2t2c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-2t2c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale10Kmaclrn-mrr.64B-2t2c-eth-l2bdscale10kmaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale100Kmaclrn-mrr.64B-2t2c-eth-l2bdscale100kmaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t2c-eth-l2bdscale1mmaclrn-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-Avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-4t2c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-dnv-x553-64b-4t4c-l2switching-base-scale-ixgbe"
-      output-file-name: "2n-dnv-x553-64b-4t4c-l2-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-2n-dnv"
+    - title: "2n-skx-x710-64b-8t4c-l2switching-base-scale-avf"
+      output-file-name: "2n-skx-x710-64b-8t4c-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Patch-mrr.64B-4t4c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-mrr.64B-4t4c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-4t4c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale10Kmaclrn-mrr.64B-4t4c-eth-l2bdscale10kmaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale100Kmaclrn-mrr.64B-4t4c-eth-l2bdscale100kmaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t4c-eth-l2bdscale1mmaclrn-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-Avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-8t4c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-dpdk"
-      output-file-name: "2n-skx-x710-64b-2t1c-l2-base-scale-avf-dpdk"
+    - title: "2n-skx-x710-64b-2t1c-l2switching-base-scale-dpdk"
+      output-file-name: "2n-skx-x710-64b-2t1c-l2-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-mrr.64B-2t1c-avf-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Mrr.64B-2t1c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Mrr.64B-2t1c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t1c-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-x710-64b-4t2c-l2switching-base-scale-avf-dpdk"
-      output-file-name: "2n-skx-x710-64b-4t2c-l2-base-scale-avf-dpdk"
+    - title: "2n-skx-x710-64b-4t2c-l2switching-base-scale-dpdk"
+      output-file-name: "2n-skx-x710-64b-4t2c-l2-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-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-skx-x710-64b-8t4c-l2switching-base-scale-avf-dpdk"
-      output-file-name: "2n-skx-x710-64b-8t4c-l2-base-scale-avf-dpdk"
+    - title: "2n-skx-x710-64b-8t4c-l2switching-base-scale-dpdk"
+      output-file-name: "2n-skx-x710-64b-8t4c-l2-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-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"
       include:
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Mrr.64B-2t1c-avf-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-gbp-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-mrr.64B-2t1c-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-mrr.64B-2t1c-avf-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
       include:
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Mrr.64B-4t2c-avf-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-gbp-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-mrr.64B-4t2c-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-mrr.64B-4t2c-avf-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
       include:
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Mrr.64B-8t4c-avf-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-gbp-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-mrr.64B-8t4c-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-mrr.64B-8t4c-avf-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
       output-file-name: "2n-skx-xxv710-64b-2t1c-l2-base-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-mrr.64B-2t1c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-2t1c-dot1q-l2bdbasemaclrn-gbp-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-2t1c-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-2t1c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
       output-file-name: "2n-skx-xxv710-64b-4t2c-l2-base-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-mrr.64B-4t2c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-4t2c-dot1q-l2bdbasemaclrn-gbp-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-4t2c-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-4t2c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
       output-file-name: "2n-skx-xxv710-64b-8t4c-l2-base-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-mrr.64B-8t4c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Mrr.64B-8t4c-dot1q-l2bdbasemaclrn-gbp-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-8t4c-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-8t4c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-8t4c-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-dnv-x553-64b-1t1c-l2switching-base-ixgbe"
-      output-file-name: "3n-dnv-x553-64b-1t1c-l2-base-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Xcbase-mrr.64B-1t1c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-mrr.64B-1t1c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-mrr.64B-1t1c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-1t1c-eth-l2bdbasemaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-64b-2t2c-l2switching-base-ixgbe"
-      output-file-name: "3n-dnv-x553-64b-2t2c-l2-base-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Xcbase-mrr.64B-2t2c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-mrr.64B-2t2c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t2c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-2t2c-eth-l2bdbasemaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-64b-4t4c-l2switching-base-ixgbe"
-      output-file-name: "3n-dnv-x553-64b-4t4c-l2-base-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Xcbase-mrr.64B-4t4c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-mrr.64B-4t4c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t4c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-4t4c-eth-l2bdbasemaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-64b-1t1c-l2switching-base-scale-ixgbe"
-      output-file-name: "3n-dnv-x553-64b-1t1c-l2-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Patch-mrr.64B-1t1c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-mrr.64B-1t1c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-1t1c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdscale10Kmaclrn-mrr.64B-1t1c-eth-l2bdscale10kmaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdscale100Kmaclrn-mrr.64B-1t1c-eth-l2bdscale100kmaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdscale1Mmaclrn-mrr.64B-1t1c-eth-l2bdscale1mmaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-64b-2t2c-l2switching-base-scale-ixgbe"
-      output-file-name: "3n-dnv-x553-64b-2t2c-l2-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Patch-mrr.64B-2t2c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-mrr.64B-2t2c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-2t2c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdscale10Kmaclrn-mrr.64B-2t2c-eth-l2bdscale10kmaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdscale100Kmaclrn-mrr.64B-2t2c-eth-l2bdscale100kmaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t2c-eth-l2bdscale1mmaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-64b-4t4c-l2switching-base-scale-ixgbe"
-      output-file-name: "3n-dnv-x553-64b-4t4c-l2-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Patch-mrr.64B-4t4c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-mrr.64B-4t4c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-4t4c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdscale10Kmaclrn-mrr.64B-4t4c-eth-l2bdscale10kmaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdscale100Kmaclrn-mrr.64B-4t4c-eth-l2bdscale100kmaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t4c-eth-l2bdscale1mmaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-64b-1t1c-features-l2switching-base-ixgbe"
-      output-file-name: "3n-dnv-x553-64b-1t1c-l2-features-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-mrr.64B-1t1c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-mrr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-mrr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-mrr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-mrr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-mrr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-64b-2t2c-features-l2switching-base-ixgbe"
-      output-file-name: "3n-dnv-x553-64b-2t2c-l2-features-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-mrr.64B-2t2c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-mrr.64B-2t2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-mrr.64B-2t2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-mrr.64B-2t2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-mrr.64B-2t2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-mrr.64B-2t2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-64b-4t4c-features-l2switching-base-ixgbe"
-      output-file-name: "3n-dnv-x553-64b-4t4c-l2-features-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-mrr.64B-4t4c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-mrr.64B-4t4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-mrr.64B-4t4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-mrr.64B-4t4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-mrr.64B-4t4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-mrr.64B-4t4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-64b-1t1c-l2switching-base-scale-dpdk"
-      output-file-name: "3n-hsw-xl710-64b-1t1c-l2-base-scale-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-mrr.64B-1t1c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-mrr.64B-1t1c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-mrr.64B-1t1c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-mrr.64B-1t1c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-mrr.64B-1t1c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-mrr.64B-1t1c-eth-l2bdscale1mmaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-64b-2t2c-l2switching-base-scale-dpdk"
-      output-file-name: "3n-hsw-xl710-64b-2t2c-l2-base-scale-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-mrr.64B-2t2c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-mrr.64B-2t2c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-mrr.64B-2t2c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t2c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-mrr.64B-2t2c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t2c-eth-l2bdscale1mmaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-64b-4t4c-l2switching-base-scale-dpdk"
-      output-file-name: "3n-hsw-xl710-64b-4t4c-l2-base-scale-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-mrr.64B-4t4c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-mrr.64B-4t4c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-mrr.64B-4t4c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t4c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-mrr.64B-4t4c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t4c-eth-l2bdscale1mmaclrn-mrr"
-      layout: "plot-cpta"
-
     - title: "3n-skx-x710-64b-2t1c-l2switching-base-scale-avf"
       output-file-name: "3n-skx-x710-64b-2t1c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Patch-Mrr.64B-2t1c-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Mrr.64B-2t1c-avf-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
       output-file-name: "3n-skx-x710-64b-4t2c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Patch-Mrr.64B-4t2c-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Mrr.64B-4t2c-avf-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
       output-file-name: "3n-skx-x710-64b-8t4c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Patch-Mrr.64B-8t4c-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Mrr.64B-8t4c-avf-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-8t4c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-2t1c-l2switching-base-scale-dpdk"
+    - title: "3n-skx-xxv710-64b-2t1c-l2switching-base-scale-avf-dpdk"
       output-file-name: "3n-skx-xxv710-64b-2t1c-l2-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Mrr.64B-2t1c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Mrr.64B-2t1c-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-2t1c-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-2t1c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t1c-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-4t2c-l2switching-base-scale-dpdk"
+    - title: "3n-skx-xxv710-64b-4t2c-l2switching-base-scale-avf-dpdk"
       output-file-name: "3n-skx-xxv710-64b-4t2c-l2-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Mrr.64B-4t2c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Mrr.64B-4t2c-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-4t2c-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-4t2c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t2c-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-8t4c-l2switching-base-scale-dpdk"
+    - title: "3n-skx-xxv710-64b-8t4c-l2switching-base-scale-avf-dpdk"
       output-file-name: "3n-skx-xxv710-64b-8t4c-l2-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Mrr.64B-8t4c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Mrr.64B-8t4c-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-8t4c-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-8t4c-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-8t4c-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-2t1c-features-l2switching-base-dpdk"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-l2-features-dpdk"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-mrr.64B-2t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-mrr.64B-2t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-mrr.64B-2t1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-mrr.64B-2t1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-mrr.64B-2t1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-4t2c-features-l2switching-base-dpdk"
-      output-file-name: "3n-skx-xxv710-64b-4t2c-l2-features-dpdk"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-mrr.64B-4t2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-mrr.64B-4t2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-mrr.64B-4t2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-mrr.64B-4t2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-mrr.64B-4t2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-8t4c-features-l2switching-base-dpdk"
-      output-file-name: "3n-skx-xxv710-64b-8t4c-l2-features-dpdk"
-      data: "plot-performance-trending-vpp-3n-skx"
-      include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-mrr.64B-8t4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-mrr.64B-8t4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-mrr.64B-8t4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-mrr.64B-8t4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-mrr.64B-8t4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-1t1c-l2switching-base-ixgbe"
-      output-file-name: "3n-tsh-x520-64b-1t1c-l2-base-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Xcbase-mrr.64B-1t1c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-mrr.64B-1t1c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Patch-Mrr.64B-1t1c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-mrr.64B-1t1c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-mrr.64B-1t1c-eth-l2bdbasemaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-2t2c-l2switching-base-ixgbe"
-      output-file-name: "3n-tsh-x520-64b-2t2c-l2-base-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Xcbase-mrr.64B-2t2c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t2c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Patch-Mrr.64B-2t2c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-mrr.64B-2t2c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-mrr.64B-2t2c-eth-l2bdbasemaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-4t4c-l2switching-base-ixgbe"
-      output-file-name: "3n-tsh-x520-64b-4t4c-l2-base-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Xcbase-mrr.64B-4t4c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t4c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Patch-Mrr.64B-4t4c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-mrr.64B-4t4c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-mrr.64B-4t4c-eth-l2bdbasemaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-1t1c-l2switching-base-scale-ixgbe"
-      output-file-name: "3n-tsh-x520-64b-1t1c-l2-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Patch-mrr.64B-1t1c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-mrr.64B-1t1c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-mrr.64B-1t1c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale10Kmaclrn-mrr.64B-1t1c-eth-l2bdscale10kmaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale100Kmaclrn-mrr.64B-1t1c-eth-l2bdscale100kmaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale1Mmaclrn-mrr.64B-1t1c-eth-l2bdscale1mmaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-2t2c-l2switching-base-scale-ixgbe"
-      output-file-name: "3n-tsh-x520-64b-2t2c-l2-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Patch-mrr.64B-2t2c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-mrr.64B-2t2c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-mrr.64B-2t2c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale10Kmaclrn-mrr.64B-2t2c-eth-l2bdscale10kmaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale100Kmaclrn-mrr.64B-2t2c-eth-l2bdscale100kmaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t2c-eth-l2bdscale1mmaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-4t4c-l2switching-base-scale-ixgbe"
-      output-file-name: "3n-tsh-x520-64b-4t4c-l2-base-scale-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Patch-mrr.64B-4t4c-eth-l2patch-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-mrr.64B-4t4c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-mrr.64B-4t4c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale10Kmaclrn-mrr.64B-4t4c-eth-l2bdscale10kmaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale100Kmaclrn-mrr.64B-4t4c-eth-l2bdscale100kmaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t4c-eth-l2bdscale1mmaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-1t1c-features-l2switching-base-ixgbe"
-      output-file-name: "3n-tsh-x520-64b-1t1c-l2-features-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-mrr.64B-1t1c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-mrr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-mrr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-mrr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-mrr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-mrr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-2t2c-features-l2switching-base-ixgbe"
-      output-file-name: "3n-tsh-x520-64b-2t2c-l2-features-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-mrr.64B-2t2c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-mrr.64B-2t2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-mrr.64B-2t2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-mrr.64B-2t2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-mrr.64B-2t2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-mrr.64B-2t2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-4t4c-features-l2switching-base-ixgbe"
-      output-file-name: "3n-tsh-x520-64b-4t4c-l2-features-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-mrr.64B-4t4c-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-mrr.64B-4t4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-mrr.64B-4t4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-mrr.64B-4t4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-mrr.64B-4t4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr"
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-mrr.64B-4t4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe"
-      output-file-name: "3n-dnv-x553-78b-1t1c-srv6-base-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-78b-2t2c-srv6-ip6routing-base-ixgbe"
-      output-file-name: "3n-dnv-x553-78b-2t2c-srv6-base-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-2t2c-ethip6ip6-ip6base-srv6enc1sid-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-dnv-x553-78b-4t4c-srv6-ip6routing-base-ixgbe"
-      output-file-name: "3n-dnv-x553-78b-4t4c-srv6-base-ixgbe"
-      data: "plot-performance-trending-vpp-3n-dnv"
-      include:
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-4t4c-ethip6ip6-ip6base-srv6enc1sid-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-dpdk"
-      output-file-name: "3n-hsw-xl710-78b-1t1c-srv6-base-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-mrr"
-        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-mrr"
-        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr"
-        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr"
-        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr"
-        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-78b-2t2c-srv6-ip6routing-base-dpdk"
-      output-file-name: "3n-hsw-xl710-78b-2t2c-srv6-base-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-2t2c-ethip6ip6-ip6base-srv6enc1sid-mrr"
-        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-mrr"
-        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr"
-        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr"
-        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr"
-        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-78b-4t4c-srv6-ip6routing-base-dpdk"
-      output-file-name: "3n-hsw-xl710-78b-4t4c-srv6-base-dpdk"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-4t4c-ethip6ip6-ip6base-srv6enc1sid-mrr"
-        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-mrr"
-        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr"
-        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr"
-        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr"
-        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-dpdk"
-      output-file-name: "3n-skx-xxv710-78b-2t1c-srv6-base-dpdk"
+    - title: "3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-avf"
+      output-file-name: "3n-skx-xxv710-78b-2t1c-srv6-base-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
         - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-2t1c-avf-ethip6ip6-ip6base-srv6enc1sid-mrr"
         - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-78b-4t2c-srv6-ip6routing-base-dpdk"
-      output-file-name: "3n-skx-xxv710-78b-4t2c-srv6-base-dpdk"
+    - title: "3n-skx-xxv710-78b-4t2c-srv6-ip6routing-base-avf"
+      output-file-name: "3n-skx-xxv710-78b-4t2c-srv6-base-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
         - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-4t2c-avf-ethip6ip6-ip6base-srv6enc1sid-mrr"
         - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-4t2c-avf-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-78b-8t4c-srv6-ip6routing-base-dpdk"
-      output-file-name: "3n-skx-xxv710-78b-8t4c-srv6-base-dpdk"
+    - title: "3n-skx-xxv710-78b-8t4c-srv6-ip6routing-base-avf"
+      output-file-name: "3n-skx-xxv710-78b-8t4c-srv6-base-avf"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
         - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-8t4c-avf-ethip6ip6-ip6base-srv6enc1sid-mrr"
         - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-8t4c-avf-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-ixgbe"
-      output-file-name: "3n-tsh-x520-78b-1t1c-srv6-base-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-78b-2t2c-srv6-ip6routing-base-ixgbe"
-      output-file-name: "3n-tsh-x520-78b-2t2c-srv6-base-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-2t2c-ethip6ip6-ip6base-srv6enc1sid-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-78b-4t4c-srv6-ip6routing-base-ixgbe"
-      output-file-name: "3n-tsh-x520-78b-4t4c-srv6-base-ixgbe"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-4t4c-ethip6ip6-ip6base-srv6enc1sid-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr"
-        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr"
-        - "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"
       output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
       output-file-name: "2n-clx-xxv710-64b-4t2c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
       output-file-name: "2n-clx-xxv710-64b-8t4c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
       output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-vpp"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
       output-file-name: "2n-clx-xxv710-64b-4t2c-vhost-base-dpdk-vpp"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
       output-file-name: "2n-clx-xxv710-64b-8t4c-vhost-base-dpdk-vpp"
       data: "plot-performance-trending-vpp-2n-clx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
         - "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"
         - "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"
         - "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-dpdk-testpmd"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-4t2c-vhost-base-dpdk-testpmd"
       output-file-name: "2n-skx-xxv710-64b-4t2c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-8t4c-vhost-base-dpdk-testpmd"
       output-file-name: "2n-skx-xxv710-64b-8t4c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp"
       output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-mrr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-mrr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-4t2c-vhost-base-dpdk-vpp"
       output-file-name: "2n-skx-xxv710-64b-4t2c-vhost-base-dpdk-vpp"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-4t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-mrr.64B-4t2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-mrr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-8t4c-vhost-base-dpdk-vpp"
       output-file-name: "2n-skx-xxv710-64b-8t4c-vhost-base-dpdk-vpp"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-8t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-mrr.64B-8t4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-testpmd"
-      output-file-name: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-testpmd"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-64b-2t2c-vhost-base-dpdk-testpmd"
-      output-file-name: "3n-hsw-xl710-64b-2t2c-vhost-base-dpdk-testpmd"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-2t2c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-64b-4t4c-vhost-base-dpdk-testpmd"
-      output-file-name: "3n-hsw-xl710-64b-4t4c-vhost-base-dpdk-testpmd"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-4t4c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-vpp"
-      output-file-name: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-vpp"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr10241Vm-Vppl2Xc-mrr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1V-m-Vppl2Xc-mrr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-mrr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-64b-2t2c-vhost-base-dpdk-vpp"
-      output-file-name: "3n-hsw-xl710-64b-2t2c-vhost-base-dpdk-vpp"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr10241Vm-Vppl2Xc-mrr.64B-2t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-2t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1V-m-Vppl2Xc-mrr.64B-2t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-mrr.64B-2t2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-64b-4t4c-vhost-base-dpdk-vpp"
-      output-file-name: "3n-hsw-xl710-64b-4t4c-vhost-base-dpdk-vpp"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr10241Vm-Vppl2Xc-mrr.64B-4t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-4t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1V-m-Vppl2Xc-mrr.64B-4t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-mrr.64B-4t4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-mrr"
       layout: "plot-cpta"
 
     - title: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-testpmd"
       output-file-name: "3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       output-file-name: "3n-skx-xxv710-64b-4t2c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       output-file-name: "3n-skx-xxv710-64b-8t4c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-3n-skx"
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-8t4c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-testpmd"
-      output-file-name: "3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-testpmd"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-2t2c-vhost-base-ixgbe-testpmd"
-      output-file-name: "3n-tsh-x520-64b-2t2c-vhost-base-ixgbe-testpmd"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-2t2c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-4t4c-vhost-base-ixgbe-testpmd"
-      output-file-name: "3n-tsh-x520-64b-4t4c-vhost-base-ixgbe-testpmd"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-4t4c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-vpp"
-      output-file-name: "3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-vpp"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-2t2c-vhost-base-ixgbe-vpp"
-      output-file-name: "3n-tsh-x520-64b-2t2c-vhost-base-ixgbe-vpp"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-tsh-x520-64b-4t4c-vhost-base-ixgbe-vpp"
-      output-file-name: "3n-tsh-x520-64b-4t4c-vhost-base-ixgbe-vpp"
-      data: "plot-performance-trending-vpp-3n-tsh"
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-skx-xxv710-114b-2t1c-vts-l2switching-base-avf-dpdk"
-      output-file-name: "2n-skx-xxv710-114b-2t1c-vts-l2switching-base-avf-dpdk"
+    - title: "2n-skx-xxv710-114b-2t1c-vts-l2switching-base-avf"
+      output-file-name: "2n-skx-xxv710-114b-2t1c-vts-l2switching-base-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-xxv710-114b-4t2c-vts-l2switching-base-avf-dpdk"
-      output-file-name: "2n-skx-xxv710-114b-4t2c-vts-l2switching-base-avf-dpdk"
+    - title: "2n-skx-xxv710-114b-4t2c-vts-l2switching-base-avf"
+      output-file-name: "2n-skx-xxv710-114b-4t2c-vts-l2switching-base-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-4t2c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-4t2c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-4t2c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-4t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-4t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-4t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-xxv710-114b-8t4c-vts-l2switching-base-avf-dpdk"
-      output-file-name: "2n-skx-xxv710-114b-8t4c-vts-l2switching-base-avf-dpdk"
+    - title: "2n-skx-xxv710-114b-8t4c-vts-l2switching-base-avf"
+      output-file-name: "2n-skx-xxv710-114b-8t4c-vts-l2switching-base-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       include:
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-8t4c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-8t4c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-8t4c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-8t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-8t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-8t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-skx-x710-64b-2t1c-dpdk"
-      output-file-name: "2n-skx-x710-64b-2t1c-dpdk"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      include:
-        - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-2t1c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-2t1c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-skx-x710-64b-4t2c-dpdk"
-      output-file-name: "2n-skx-x710-64b-4t2c-dpdk"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      include:
-        - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-4t2c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-4t2c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-skx-x710-64b-8t4c-dpdk"
-      output-file-name: "2n-skx-x710-64b-8t4c-dpdk"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      include:
-        - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-8t4c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-8t4c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-skx-xxv710-64b-2t1c-dpdk"
-      output-file-name: "2n-skx-xxv710-64b-2t1c-dpdk"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      include:
-        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.64b-2t1c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-2t1c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-skx-xxv710-64b-4t2c-dpdk"
-      output-file-name: "2n-skx-xxv710-64b-4t2c-dpdk"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      include:
-        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.64b-4t2c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-4t2c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-skx-xxv710-64b-8t4c-dpdk"
-      output-file-name: "2n-skx-xxv710-64b-8t4c-dpdk"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      include:
-        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.64b-8t4c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-8t4c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-clx-x710-64b-2t1c-dpdk"
-      output-file-name: "2n-clx-x710-64b-2t1c-dpdk"
-      data: "plot-performance-trending-dpdk-2n-clx"
-      include:
-        - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-2t1c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-2t1c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-clx-x710-64b-4t2c-dpdk"
-      output-file-name: "2n-clx-x710-64b-4t2c-dpdk"
-      data: "plot-performance-trending-dpdk-2n-clx"
-      include:
-        - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-4t2c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-4t2c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-clx-x710-64b-8t4c-dpdk"
-      output-file-name: "2n-clx-x710-64b-8t4c-dpdk"
-      data: "plot-performance-trending-dpdk-2n-clx"
-      include:
-        - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-8t4c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-8t4c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-clx-xxv710-64b-2t1c-dpdk"
-      output-file-name: "2n-clx-xxv710-64b-2t1c-dpdk"
-      data: "plot-performance-trending-dpdk-2n-clx"
-      include:
-        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.64b-2t1c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-2t1c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-clx-xxv710-64b-4t2c-dpdk"
-      output-file-name: "2n-clx-xxv710-64b-4t2c-dpdk"
-      data: "plot-performance-trending-dpdk-2n-clx"
-      include:
-        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.64b-4t2c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-4t2c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-clx-xxv710-64b-8t4c-dpdk"
-      output-file-name: "2n-clx-xxv710-64b-8t4c-dpdk"
-      data: "plot-performance-trending-dpdk-2n-clx"
-      include:
-        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.64b-8t4c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-8t4c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-
-    - title: "3n-hsw-x710-64b-1t1c-dpdk"
-      output-file-name: "3n-hsw-x710-64b-1t1c-dpdk"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      include:
-        - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-1t1c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-1t1c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-2t2c-dpdk"
-      output-file-name: "3n-hsw-x710-64b-2t2c-dpdk"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      include:
-        - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-2t2c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-2t2c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-x710-64b-4t4c-dpdk"
-      output-file-name: "3n-hsw-x710-64b-4t4c-dpdk"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      include:
-        - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-4t4c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-4t4c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-64b-1t1c-dpdk"
-      output-file-name: "3n-hsw-xl710-64b-1t1c-dpdk"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      include:
-        - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-mrr.64b-1t1c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-mrr.64b-1t1c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-64b-2t2c-dpdk"
-      output-file-name: "3n-hsw-xl710-64b-2t2c-dpdk"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      include:
-        - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-mrr.64b-2t2c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-mrr.64b-2t2c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-hsw-xl710-64b-4t4c-dpdk"
-      output-file-name: "3n-hsw-xl710-64b-4t4c-dpdk"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      include:
-        - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-mrr.64b-4t4c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-mrr.64b-4t4c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-x710-64b-2t1c-dpdk"
-      output-file-name: "3n-skx-x710-64b-2t1c-dpdk"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      include:
-        - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-2t1c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-2t1c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-x710-64b-4t2c-dpdk"
-      output-file-name: "3n-skx-x710-64b-4t2c-dpdk"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      include:
-        - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-4t2c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-4t2c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-x710-64b-8t4c-dpdk"
-      output-file-name: "3n-skx-x710-64b-8t4c-dpdk"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      include:
-        - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-8t4c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-8t4c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-2t1c-dpdk"
-      output-file-name: "3n-skx-xxv710-64b-2t1c-dpdk"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      include:
-        - "tests.dpdk.perf.25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.64b-2t1c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-2t1c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-4t2c-dpdk"
-      output-file-name: "3n-skx-xxv710-64b-4t2c-dpdk"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      include:
-        - "tests.dpdk.perf.25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.64b-4t2c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-4t2c-ethip4-ip4base-l3fwd-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-8t4c-dpdk"
-      output-file-name: "3n-skx-xxv710-64b-8t4c-dpdk"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      include:
-        - "tests.dpdk.perf.25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.64b-8t4c-eth-l2xcbase-testpmd-mrr"
-        - "tests.dpdk.perf.25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-8t4c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"