X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification_CPTA.yaml;h=c6fc5fd9fd375c50beb3ac439345a378b4201fb1;hp=7bb7312b11e3408decb1f626d557c1985329d4be;hb=30c5d0cb071650a26357ef6e2737f17422ad824d;hpb=8853921639f749a0e49e37759df2b973947977e3

diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 7bb7312b11..c6fc5fd9fd 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 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:
@@ -45,8 +45,8 @@
   urls:
     URL[JENKINS,CSIT]: "https://jenkins.fd.io/view/csit/job"
     URL[NEXUS,LOG]: "https://logs.fd.io/production/vex-yul-rot-jenkins-1"
-    URL[NEXUS]: "https://docs.fd.io/csit"
-    DIR[NEXUS]: "trending/_static/archive"
+    URL[NEXUS,DOC]: "https://docs.fd.io/csit"
+    DIR[NEXUS,DOC]: "trending/_static/archive"
 
   make-dirs:
   # List the directories which are created while preparing the environment.
@@ -61,77 +61,551 @@
   # All directories MUST be defined in "paths" section.
   - "DIR[BUILD,HTML]"
 
+  testbeds:
+    "10.30.51.45": "LF-2n-SKX-21"
+    "10.30.51.53": "LF-2n-SKX-22"
+    "10.30.51.55": "LF-2n-SKX-23"
+    "10.30.51.57": "LF-2n-SKX-24"
+    "10.30.51.16": "LF-3n-HSW-01"
+    "10.30.51.20": "LF-3n-HSW-02"
+    "10.30.51.24": "LF-3n-HSW-03"
+    "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.10": "LF-DNV"
+
 -
   type: "configuration"
 
+  archive-inputs: False
+
   mapping-file: "mapping_tc_names.yaml"
 
   ignore-list: "ignored_tcs.yaml"
 
+  alerting:
+
+    alerts:
+
+# As Jenkins slave is not configured to send emails, this is now only as
+# a working example:
+#
+#      # Send the list of failed tests vie email.
+#      # Pre-requisites:
+#      # - SMTP server is installed on the Jenkins slave
+#      # - SMTP server is configured to send emails. Default configuration is
+#      #   sufficient.
+#      email-failed-tests:
+#        # Title is used in logs and also as the email subject.
+#        title: "Trending: Failed Tests"
+#        # Type of alert.
+#        type: "failed-tests"
+#        # How to send the alert. The used way must be specified in the
+#        # configuration part.
+#        way: "email"
+#        # Data to be included in the alert.
+#        # Here is used the list of tables generated by the function
+#        # "table_failed_tests_html".
+#        include:
+#        - "failed-tests-3n-hsw"
+#        - "failed-tests-3n-skx"
+#        - "failed-tests-2n-skx"
+#        # This url is used in the tables instead of the original one. The aim
+#        # is to make the links usable also from the email.
+#        url: "https://docs.fd.io/csit/master/trending/trending"
+
+      # Jenkins job sends the email with failed tests.
+      # Pre-requisites:
+      # - Jenkins job is configured to send emails in "Post-build Actions" -->
+      #   "Editable Email Notification".
+      jenkins-send-failed-tests:
+        title: "Trending: Failed Tests"
+        type: "failed-tests"
+        way: "jenkins"
+        include:
+          - "last-failed-tests-2n-skx"
+          - "last-failed-tests-3n-skx"
+          - "last-failed-tests-3n-hsw"
+          - "last-failed-tests-3n-tsh"
+          - "last-failed-tests-2n-dnv"
+          - "last-failed-tests-3n-dnv"
+        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"
+          - "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"
+
+    configurations:
+      # Configuration of the email notifications.
+      email:
+        # SMTP server
+        server: "localhost"
+        # List of recipients.
+        address-to:
+        - "csit-report@lists.fd.io"
+        # Sender
+        address-from: "testuser@testserver.com"
+
+      # Configuration of notifications sent by Jenkins.
+      jenkins:
+        # The directory in the workspace where the generated data is stored and
+        # then read by Jenkins job.
+        output-dir: "_build/_static/vpp"
+        # The name of the output files. ASCII text and HTML formats are
+        # generated.
+        output-file: "trending-failed-tests"
+        # If defined, all output files are zipped into this file.
+        zip-output: "failed-tests.tar.gz"
+
   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:
+        - "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:
+        - "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:
+        - "lastCompletedBuild"
+
     # 3n-hsw
     plot-performance-trending-all-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 100
+        start: 763
         end: "lastCompletedBuild"
+        skip:
+          - 781
+          - 782
+          - 783
+          - 784
+          - 786
+          - 787
+          - 788
+          - 789
+          - 791 #
+          - 792 #
+          - 793
+          - 795
+          - 796
+          - 797
+          - 798
+          - 799
+          - 801 #
+          - 802 #
+          - 804 #
+          - 805
+          - 806
+          - 807 #
+          - 808 #
+          - 810 #
+          - 815
+          - 818
+          - 819
+          - 820
+          - 831
+          - 832
+          - 852
+          - 855
+          - 856
+          - 860
+          - 867
       csit-dpdk-perf-mrr-weekly-master:
-        start: 3
+        start: 81
         end: "lastCompletedBuild"
+        skip:
+          - 87
+          - 89
+          - 90
 
     plot-performance-trending-vpp-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 100
+        start: 763
         end: "lastCompletedBuild"
+        skip:
+          - 781
+          - 782
+          - 783
+          - 784
+          - 786
+          - 787
+          - 788
+          - 789
+          - 791 #
+          - 792 #
+          - 793
+          - 795
+          - 796
+          - 797
+          - 798
+          - 799
+          - 801 #
+          - 802 #
+          - 804 #
+          - 805
+          - 806
+          - 807 #
+          - 808 #
+          - 810 #
+          - 815
+          - 818
+          - 819
+          - 820
+          - 831
+          - 832
+          - 852
+          - 855
+          - 856
+          - 860
+          - 867
 
     plot-performance-trending-dpdk-3n-hsw:
       csit-dpdk-perf-mrr-weekly-master:
-        start: 3
+        start: 81
         end: "lastCompletedBuild"
+        skip:
+          - 87
+          - 89
+          - 90
 
     # 3n-skx
     plot-performance-trending-all-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 1
+        start: 513
         end: "lastCompletedBuild"
+        skip:
+          - 531
+          - 532
+          - 533
+          - 534
+          - 536
+          - 537
+          - 538
+          - 539
+          - 541 #
+          - 542 #
+          - 544 #
+          - 545
+          - 546
+          - 547
+          - 548
+          - 549
+          - 551 #
+          - 552 #
+          - 554 #
+          - 555
+          - 556
+          - 557 #
+          - 558 #
+          - 560 #
+          - 562 #
+          - 565
+          - 568
+          - 569
+          - 570
+          - 582
+          - 584
+          - 585
+          - 586
+          - 588
+          - 600
+          - 601
+          - 603
+          - 604
+          - 612
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
-        start: 1
+        start: 46
         end: "lastCompletedBuild"
+        skip:
+          - 52
+          - 54
+          - 55
+          - 56
 
     plot-performance-trending-vpp-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 1
+        start: 513
         end: "lastCompletedBuild"
+        skip:
+          - 531
+          - 532
+          - 533
+          - 534
+          - 536
+          - 537
+          - 538
+          - 539
+          - 541 #
+          - 542 #
+          - 544 #
+          - 545
+          - 546
+          - 547
+          - 548
+          - 549
+          - 551 #
+          - 552 #
+          - 554 #
+          - 555
+          - 556
+          - 557 #
+          - 558 #
+          - 560 #
+          - 562 #
+          - 565
+          - 568
+          - 569
+          - 570
+          - 582
+          - 584
+          - 585
+          - 586
+          - 588
+          - 600
+          - 601
+          - 603
+          - 604
+          - 612
 
     plot-performance-trending-dpdk-3n-skx:
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
-        start: 1
+        start: 46
         end: "lastCompletedBuild"
+        skip:
+          - 52
+          - 54
+          - 55
+          - 56
 
     # 2n-skx
     plot-performance-trending-all-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
-        start: 1
+        start: 514
         end: "lastCompletedBuild"
+        skip:
+          - 532
+          - 533
+          - 534
+          - 537
+          - 538
+          - 539
+          - 540
+          - 546
+          - 547
+          - 548
+          - 549
+          - 550
+          - 556
+          - 557
+          - 567
+          - 568
+          - 569
+          - 582
+          - 583
+          - 605
+          - 608
+          - 609
+          - 612
+          - 620
+          - 627
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 1
+        start: 46
         end: "lastCompletedBuild"
+        skip:
+          - 52
+          - 54
+          - 55
+          - 56
 
     plot-performance-trending-vpp-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
-        start: 1
+        start: 514
         end: "lastCompletedBuild"
+        skip:
+          - 532
+          - 533
+          - 534
+          - 537
+          - 538
+          - 539
+          - 540
+          - 546
+          - 547
+          - 548
+          - 549
+          - 550
+          - 556
+          - 557
+          - 567
+          - 568
+          - 569
+          - 582
+          - 583
+          - 605
+          - 608
+          - 609
+          - 612
+          - 620
+          - 627
 
     plot-performance-trending-dpdk-2n-skx:
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 1
+        start: 46
+        end: "lastCompletedBuild"
+        skip:
+          - 52
+          - 54
+          - 55
+          - 56
+
+    plot-performance-trending-vpp-nfv-2n-skx:
+      csit-vpp-perf-mrr-weekly-master-2n-skx:
+        start: 20
+        end: "lastCompletedBuild"
+        skip:
+          - 21
+          - 29
+
+    # 3n-tsh
+    plot-performance-trending-all-3n-tsh:
+      csit-vpp-perf-mrr-daily-master-3n-tsh:
+        start: 55
         end: "lastCompletedBuild"
+        skip:
+          - 61
+          - 62
+          - 63
+          - 64
+          - 65
+          - 69
+          - 70
+          - 71
+          - 72
+          - 73
+          - 80
+          - 84
+          - 89
+
+    plot-performance-trending-vpp-3n-tsh:
+      csit-vpp-perf-mrr-daily-master-3n-tsh:
+        start: 55
+        end: "lastCompletedBuild"
+        skip:
+          - 61
+          - 62
+          - 63
+          - 64
+          - 65
+          - 69
+          - 70
+          - 71
+          - 72
+          - 73
+          - 80
+          - 84
+          - 89
+
+    plot-performance-trending-vpp-3n-dnv:
+      csit-vpp-perf-mrr-daily-master-3n-dnv:
+        start: 41
+        end: "lastCompletedBuild"
+        skip:
+          - 46
+          - 47
+          - 57
+          - 58
+          - 59
+          - 60
+          - 62
+          - 63
+          - 64
+          - 65
+          - 66
+          - 67
+          - 68
+          - 78
+          - 80
+          - 83
+          - 84
+          - 91
+          - 92
+          - 93
+          - 94
+          - 95
+          - 96
+          - 97
+          - 98
+          - 99
+          - 100
+          - 101
+          - 102
+          - 103
+          - 104
+          - 105
+          - 106
+          - 107
+          - 108
+          - 109
+
+    plot-performance-trending-vpp-2n-dnv:
+      csit-vpp-perf-mrr-daily-master-2n-dnv:
+        start: 41
+        end: "lastCompletedBuild"
+        skip:
+          - 46
+          - 47
+          - 57
+          - 58
+          - 59
+          - 64
+          - 65
+          - 66
+          - 79
+          - 80
+          - 83
+          - 90
+          - 91
+          - 92
+          - 93
+          - 94
+          - 95
+          - 96
+          - 97
+          - 98
+          - 99
+          - 100
+          - 101
+          - 102
+          - 103
+          - 104
+          - 105
+          - 106
+          - 107
+          - 108
 
   plot-layouts:
 
     plot-cpta:
       title: ""
-      autosize: False
+      titlefont:
+        size: 16
+      autosize: True
       showlegend: True
       width: 1100
       height: 800
@@ -203,36 +677,263 @@
 -
   type: "input"
   general:
-    file-name: "output.xml.gz"
+    file-name: "output_info.xml.gz"
     file-format: ".gz"
     download-path: "{job}/{build}/archives/{filename}"
     extract: "output.xml"
+    # Number of days from now to the past. Only files generated in this
+    # time period are used.
+    time-period: 90
+
+    zip-file-name: "robot-plugin.zip"
+    zip-file-format: ".zip"
+    zip-download-path: "{job}/{build}/robot/report/*zip*/{filename}"
+    zip-extract: "robot-plugin/output.xml"
 
   builds:
 
     # 3n-hsw
     csit-vpp-perf-mrr-daily-master:
-      start: 100
+      start: 763
       end: "lastCompletedBuild"
+      skip:
+        - 781
+        - 782
+        - 783
+        - 784
+        - 786
+        - 787
+        - 788
+        - 789
+        - 791 #
+        - 792 #
+        - 793
+        - 795
+        - 796
+        - 797
+        - 798
+        - 799
+        - 801 #
+        - 802 #
+        - 804 #
+        - 805
+        - 806
+        - 807 #
+        - 808 #
+        - 810 #
+        - 815
+        - 818
+        - 819
+        - 820
+        - 831
+        - 832
+        - 852
+        - 855
+        - 856
+        - 860
+        - 867
     csit-dpdk-perf-mrr-weekly-master:
-      start: 3
+      start: 81
       end: "lastCompletedBuild"
+      skip:
+        - 87
+        - 89
+        - 90
 
     # 3n-skx
     csit-vpp-perf-mrr-daily-master-3n-skx:
-      start: 1
+      start: 513
       end: "lastCompletedBuild"
+      skip:
+        - 531
+        - 532
+        - 533
+        - 534
+        - 536
+        - 537
+        - 538
+        - 539
+        - 541 #
+        - 542 #
+        - 544 #
+        - 545
+        - 546
+        - 547
+        - 548
+        - 549
+        - 551 #
+        - 552 #
+        - 554 #
+        - 555
+        - 556
+        - 557 #
+        - 558 #
+        - 560 #
+        - 562 #
+        - 565
+        - 568
+        - 569
+        - 570
+        - 582
+        - 584
+        - 585
+        - 586
+        - 588
+        - 600
+        - 601
+        - 603
+        - 604
+        - 612
     csit-dpdk-perf-mrr-weekly-master-3n-skx:
-      start: 1
+      start: 46
       end: "lastCompletedBuild"
+      skip:
+        - 52
+        - 54
+        - 55
+        - 56
 
     # 2n-skx
     csit-vpp-perf-mrr-daily-master-2n-skx:
-      start: 1
+      start: 514
       end: "lastCompletedBuild"
+      skip:
+        - 532
+        - 533
+        - 534
+        - 537
+        - 538
+        - 539
+        - 540
+        - 546
+        - 547
+        - 548
+        - 549
+        - 550
+        - 556
+        - 557
+        - 567
+        - 568
+        - 569
+        - 582
+        - 583
+        - 605
+        - 608
+        - 609
+        - 612
+        - 620
+        - 627
+    csit-vpp-perf-mrr-weekly-master-2n-skx:
+      start: 20
+      end: "lastCompletedBuild"
+      skip:
+        - 21
+        - 29
     csit-dpdk-perf-mrr-weekly-master-2n-skx:
-      start: 1
+      start: 46
+      end: "lastCompletedBuild"
+      skip:
+        - 52
+        - 54
+        - 55
+        - 56
+
+    # 3n-tsh
+    csit-vpp-perf-mrr-daily-master-3n-tsh:
+      start: 55
+      end: "lastCompletedBuild"
+      skip:
+        - 61
+        - 62
+        - 63
+        - 64
+        - 65
+        - 69
+        - 70
+        - 71
+        - 72
+        - 73
+        - 80
+        - 84
+        - 89
+
+    # 3n-dnv
+    csit-vpp-perf-mrr-daily-master-3n-dnv:
+      start: 41
+      end: "lastCompletedBuild"
+      skip:
+        - 46
+        - 47
+        - 57
+        - 58
+        - 59
+        - 60
+        - 62
+        - 63
+        - 64
+        - 65
+        - 66
+        - 67
+        - 68
+        - 78
+        - 80
+        - 83
+        - 84
+        - 91
+        - 92
+        - 93
+        - 94
+        - 95
+        - 96
+        - 97
+        - 98
+        - 99
+        - 100
+        - 101
+        - 102
+        - 103
+        - 104
+        - 105
+        - 106
+        - 107
+        - 108
+        - 109
+
+    # 2n-dnv
+    csit-vpp-perf-mrr-daily-master-2n-dnv:
+      start: 41
       end: "lastCompletedBuild"
+      skip:
+        - 46
+        - 47
+        - 57
+        - 58
+        - 59
+        - 64
+        - 65
+        - 66
+        - 79
+        - 80
+        - 83
+        - 90
+        - 91
+        - 92
+        - 93
+        - 94
+        - 95
+        - 96
+        - 97
+        - 98
+        - 99
+        - 100
+        - 101
+        - 102
+        - 103
+        - 104
+        - 105
+        - 106
+        - 107
+        - 108
 
 -
   type: "output"
@@ -247,6 +948,86 @@
 ################################################################################
 
 ################################################################################
+
+# Compressed failed tests (last build)
+-
+  type: "table"
+  title: "Last failed tests (last builds) 3n-hsw"
+  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"
+  data: "table-last-failed-tests-3n-skx"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) 2n-skx"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-2n-skx"
+  data: "table-last-failed-tests-2n-skx"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "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"
@@ -264,9 +1045,7 @@
     # 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"
-  outlier-const: 1.5
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
@@ -285,9 +1064,7 @@
     # 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"
-  outlier-const: 1.5
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
@@ -306,9 +1083,7 @@
     # 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"
-  outlier-const: 1.5
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
@@ -351,7 +1126,7 @@
     # 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
+  window: 7  # days
 
 -
   type: "table"
@@ -379,9 +1154,7 @@
     # 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"
-  outlier-const: 1.5
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
@@ -400,9 +1173,7 @@
     # 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"
-  outlier-const: 1.5
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
@@ -421,9 +1192,7 @@
     # 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"
-  outlier-const: 1.5
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
@@ -466,7 +1235,7 @@
     # 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"
-  window: 14
+  window: 7  # days
 
 -
   type: "table"
@@ -494,9 +1263,7 @@
     # 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"
-  outlier-const: 1.5
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
@@ -515,9 +1282,7 @@
     # 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"
-  outlier-const: 1.5
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
@@ -536,9 +1301,7 @@
     # 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"
-  outlier-const: 1.5
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
@@ -581,7 +1344,7 @@
     # 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"
-  window: 14
+  window: 7  # days
 
 -
   type: "table"
@@ -591,6 +1354,284 @@
   output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-skx.rst"
   testbed: "2n-skx"
 
+################################################################################
+# 3n-tsh
+-
+  type: "table"
+  title: "Performance trending dashboard 1t1c-3n-tsh"
+  algorithm: "table_performance_trending_dashboard"
+  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_performance_trending_dashboard"
+  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_performance_trending_dashboard"
+  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_performance_trending_dashboard_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_performance_trending_dashboard_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_performance_trending_dashboard_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_performance_trending_dashboard"
+  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_performance_trending_dashboard"
+  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_performance_trending_dashboard"
+  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_performance_trending_dashboard_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_performance_trending_dashboard_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_performance_trending_dashboard_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_performance_trending_dashboard"
+  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_performance_trending_dashboard"
+  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_performance_trending_dashboard"
+  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_performance_trending_dashboard_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_performance_trending_dashboard_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_performance_trending_dashboard_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                                  ###
@@ -606,160 +1647,422 @@
 
   plots:
 
+################################################################################
+# NFV
+
+    - title: "VPP 2T1C NF Service Density VNFc 64B MRR Trending 2n-skx"
+      output-file-name: "vnfc-eth-l2bd-64b-2t1c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-X710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and '64B' and '2T1C' and 'L2BDMACLRN'"
+      groups:
+      - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+      - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
+      - ["4R1C", "4R2C", "4R4C"]
+      - ["6R1C", "6R2C"]
+      - ["8R1C", "8R2C"]
+      - ["10R1C"]
+      group-names:
+      - "1 Chain"
+      - "2 Chains"
+      - "4 Chains"
+      - "6 Chains"
+      - "8 Chains"
+      - "10 Chains"
+      parameters:
+      - "result"
+      - "tags"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C NF Service Density VNFc 64B MRR Trending 2n-skx"
+      output-file-name: "vnfc-eth-l2bd-64b-4t2c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-X710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and '64B' and '4T2C' and 'L2BDMACLRN'"
+      groups:
+      - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+      - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
+      - ["4R1C", "4R2C", "4R4C"]
+      - ["6R1C", "6R2C"]
+      - ["8R1C", "8R2C"]
+      - ["10R1C"]
+      group-names:
+      - "1 Chain"
+      - "2 Chains"
+      - "4 Chains"
+      - "6 Chains"
+      - "8 Chains"
+      - "10 Chains"
+      parameters:
+      - "result"
+      - "tags"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C NF Service Density VNFc 64B MRR Trending 2n-skx"
+      output-file-name: "vnfc-eth-l2bd-64b-8t4c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-X710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and '64B' and '8T4C' and 'L2BDMACLRN'"
+      groups:
+      - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+      - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
+      - ["4R1C", "4R2C", "4R4C"]
+      - ["6R1C", "6R2C"]
+      - ["8R1C", "8R2C"]
+      - ["10R1C"]
+      group-names:
+      - "1 Chain"
+      - "2 Chains"
+      - "4 Chains"
+      - "6 Chains"
+      - "8 Chains"
+      - "10 Chains"
+      parameters:
+      - "result"
+      - "tags"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C NF Service Density CNFc 64B MRR Trending 2n-skx"
+      output-file-name: "cnfc-eth-l2bd-64b-2t1c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-X710' and 'NF_DENSITY' and 'DOCKER' and 'CHAIN' and 'MRR' and '64B' and '2T1C' and 'L2BDMACLRN'"
+      groups:
+      - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+      - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
+      - ["4R1C", "4R2C", "4R4C"]
+      - ["6R1C", "6R2C"]
+      - ["8R1C", "8R2C"]
+      - ["10R1C"]
+      group-names:
+      - "1 Chain"
+      - "2 Chains"
+      - "4 Chains"
+      - "6 Chains"
+      - "8 Chains"
+      - "10 Chains"
+      parameters:
+      - "result"
+      - "tags"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C NF Service Density CNFc 64B MRR Trending 2n-skx"
+      output-file-name: "cnfc-eth-l2bd-64b-4t2c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-X710' and 'NF_DENSITY' and 'DOCKER' and 'CHAIN' and 'MRR' and '64B' and '4T2C' and 'L2BDMACLRN'"
+      groups:
+      - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+      - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
+      - ["4R1C", "4R2C", "4R4C"]
+      - ["6R1C", "6R2C"]
+      - ["8R1C", "8R2C"]
+      - ["10R1C"]
+      group-names:
+      - "1 Chain"
+      - "2 Chains"
+      - "4 Chains"
+      - "6 Chains"
+      - "8 Chains"
+      - "10 Chains"
+      parameters:
+      - "result"
+      - "tags"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C NF Service Density CNFc 64B MRR Trending 2n-skx"
+      output-file-name: "cnfc-eth-l2bd-64b-8t4c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-X710' and 'NF_DENSITY' and 'DOCKER' and 'CHAIN' and 'MRR' and '64B' and '8T4C' and 'L2BDMACLRN'"
+      groups:
+      - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+      - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
+      - ["4R1C", "4R2C", "4R4C"]
+      - ["6R1C", "6R2C"]
+      - ["8R1C", "8R2C"]
+      - ["10R1C"]
+      group-names:
+      - "1 Chain"
+      - "2 Chains"
+      - "4 Chains"
+      - "6 Chains"
+      - "8 Chains"
+      - "10 Chains"
+      parameters:
+      - "result"
+      - "tags"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C NF Service Density CNFp 64B MRR Trending 2n-skx"
+      output-file-name: "cnfp-eth-l2bd-64b-2t1c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-X710' and 'NF_DENSITY' and 'DOCKER' and 'PIPELINE' and 'MRR' and '64B' and '2T1C' and 'L2BDMACLRN'"
+      groups:
+      - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+      - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
+      - ["4R1C", "4R2C", "4R4C"]
+      - ["6R1C", "6R2C"]
+      - ["8R1C", "8R2C"]
+      - ["10R1C"]
+      group-names:
+      - "1 Pipe"
+      - "2 Pipes"
+      - "4 Pipes"
+      - "6 Pipes"
+      - "8 Pipes"
+      - "10 Pipes"
+      parameters:
+      - "result"
+      - "tags"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C NF Service Density CNFp 64B MRR Trending 2n-skx"
+      output-file-name: "cnfp-eth-l2bd-64b-4t2c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-X710' and 'NF_DENSITY' and 'DOCKER' and 'PIPELINE' and 'MRR' and '64B' and '4T2C' and 'L2BDMACLRN'"
+      groups:
+      - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+      - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
+      - ["4R1C", "4R2C", "4R4C"]
+      - ["6R1C", "6R2C"]
+      - ["8R1C", "8R2C"]
+      - ["10R1C"]
+      group-names:
+      - "1 Pipe"
+      - "2 Pipes"
+      - "4 Pipes"
+      - "6 Pipes"
+      - "8 Pipes"
+      - "10 Pipes"
+      parameters:
+      - "result"
+      - "tags"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C NF Service Density CNFp 64B MRR Trending 2n-skx"
+      output-file-name: "cnfp-eth-l2bd-64b-8t4c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-X710' and 'NF_DENSITY' and 'DOCKER' and 'PIPELINE' and 'MRR' and '64B' and '8T4C' and 'L2BDMACLRN'"
+      groups:
+      - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+      - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
+      - ["4R1C", "4R2C", "4R4C"]
+      - ["6R1C", "6R2C"]
+      - ["8R1C", "8R2C"]
+      - ["10R1C"]
+      group-names:
+      - "1 Pipe"
+      - "2 Pipes"
+      - "4 Pipes"
+      - "6 Pipes"
+      - "8 Pipes"
+      - "10 Pipes"
+      parameters:
+      - "result"
+      - "tags"
+      layout: "plot-cpta"
+
 ################################################################################
 # 3n-hsw
 
-# L2 - x520
+# L2 - VIC-1227
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-1t1c-x520-3n-hsw"
+    - title: "3n-hsw-vic1227-l2sw-64b-base-scale-1t1c"
+      output-file-name: "l2-1t1c-vic1227-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Cisco-VIC-1227' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-2t2c-x520-3n-hsw"
+    - title: "3n-hsw-vic1227-l2sw-64b-base-scale-2t2c"
+      output-file-name: "l2-2t2c-vic1227-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Cisco-VIC-1227' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-4t4c-x520-3n-hsw"
+    - title: "3n-hsw-vic1227-l2sw-64b-base-scale-4t4c"
+      output-file-name: "l2-4t4c-vic1227-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Cisco-VIC-1227' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B IACL MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-1t1c-x520-3n-hsw-iacl"
+# L2 - VIC-1385
+
+    - title: "3n-hsw-vic1385-l2sw-64b-base-scale-1t1c"
+      output-file-name: "l2-1t1c-vic1385-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Cisco-VIC-1385' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B IACL MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-2t2c-x520-3n-hsw-iacl"
+    - title: "3n-hsw-vic1385-l2sw-64b-base-scale-2t2c"
+      output-file-name: "l2-2t2c-vic1385-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Cisco-VIC-1385' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B IACL MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-4t4c-x520-3n-hsw-iacl"
+    - title: "3n-hsw-vic1385-l2sw-64b-base-scale-4t4c"
+      output-file-name: "l2-4t4c-vic1385-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Cisco-VIC-1385' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B OACL MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-1t1c-x520-3n-hsw-oacl"
+# L2 - x520
+
+    - title: "3n-hsw-x520-l2sw-64b-base-scale-1t1c"
+      output-file-name: "l2-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B OACL MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-2t2c-x520-3n-hsw-oacl"
+    - title: "3n-hsw-x520-l2sw-64b-base-scale-2t2c"
+      output-file-name: "l2-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B OACL MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-4t4c-x520-3n-hsw-oacl"
+    - title: "3n-hsw-x520-l2sw-64b-base-scale-4t4c"
+      output-file-name: "l2-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B MACIP MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-1t1c-x520-3n-hsw-macip"
+    - title: "3n-hsw-x520-l2sw-64b-features-iacl-1t1c"
+      output-file-name: "l2-feature-1t1c-x520-3n-hsw-iacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS') and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-x520-l2sw-64b-features-iacl-2t2c"
+      output-file-name: "l2-feature-2t2c-x520-3n-hsw-iacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS') and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-x520-l2sw-64b-features-iacl-4t4c"
+      output-file-name: "l2-feature-4t4c-x520-3n-hsw-iacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS') and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-x520-l2sw-64b-features-oacl-1t1c"
+      output-file-name: "l2-feature-1t1c-x520-3n-hsw-oacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS') and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-x520-l2sw-64b-features-oacl-2t2c"
+      output-file-name: "l2-feature-2t2c-x520-3n-hsw-oacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS') and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-x520-l2sw-64b-features-oacl-4t4c"
+      output-file-name: "l2-feature-4t4c-x520-3n-hsw-oacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS') and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-x520-l2sw-64b-features-macip-1t1c"
+      output-file-name: "l2-feature-1t1c-x520-3n-hsw-macip"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MACIP MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-macip-2t2c"
       output-file-name: "l2-feature-2t2c-x520-3n-hsw-macip"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MACIP MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-macip-4t4c"
       output-file-name: "l2-feature-4t4c-x520-3n-hsw-macip"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # L2 - xl710
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-64b-base-scale-1t1c"
       output-file-name: "l2-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-64b-base-scale-2t2c"
       output-file-name: "l2-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-64b-base-scale-4t4c"
       output-file-name: "l2-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # L2 - x710
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-base-scale-1t1c"
       output-file-name: "l2-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-base-scale-2t2c"
       output-file-name: "l2-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-base-scale-4t4c"
       output-file-name: "l2-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-features-1t1c"
       output-file-name: "l2-feature-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -767,7 +2070,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-features-2t2c"
       output-file-name: "l2-feature-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -775,7 +2078,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-features-4t4c"
       output-file-name: "l2-feature-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -785,155 +2088,155 @@
 
 # IPv4 - x520
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-base-scale-1t1c"
       output-file-name: "ip4-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-base-scale-2t2c"
       output-file-name: "ip4-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-base-scale-4t4c"
       output-file-name: "ip4-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-iacl-1t1c"
       output-file-name: "ip4-feature-1t1c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and 'IACL' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and 'IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS') and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-iacl-2t2c"
       output-file-name: "ip4-feature-2t2c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and 'IACL' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and 'IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS') and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-iacl-4t4c"
       output-file-name: "ip4-feature-4t4c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and 'IACL' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and 'IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS') and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-oacl-1t1c"
       output-file-name: "ip4-feature-1t1c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and 'OACL' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and 'OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS') and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-oacl-2t2c"
       output-file-name: "ip4-feature-2t2c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and 'OACL' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and 'OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS') and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-oacl-4t4c"
       output-file-name: "ip4-feature-4t4c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and 'OACL' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and 'OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS') and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-1t1c"
       output-file-name: "ip4-feature-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'OACL' and not 'IACL' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'NAT44' and('BASE' or 'SRC_USER_4000') and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-2t2c"
       output-file-name: "ip4-feature-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'OACL' and not 'IACL' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'NAT44' and('BASE' or 'SRC_USER_4000') and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-4t4c"
       output-file-name: "ip4-feature-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'OACL' and not 'IACL' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'NAT44' and('BASE' or 'SRC_USER_4000') and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # IPv4 - xl710
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-64b-base-scale-features-1t1c"
       output-file-name: "ip4-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-64b-base-scale-features-2t2c"
       output-file-name: "ip4-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-64b-base-scale-features-4t4c"
       output-file-name: "ip4-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # IPv4 - x710
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-base-scale-1t1c"
       output-file-name: "ip4-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-base-scale-2t2c"
       output-file-name: "ip4-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-base-scale-4t4c"
       output-file-name: "ip4-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-features-1t1c"
       output-file-name: "ip4-feature-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -941,7 +2244,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-features-2t2c"
       output-file-name: "ip4-feature-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -949,7 +2252,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-features-4t4c"
       output-file-name: "ip4-feature-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -959,33 +2262,33 @@
 
 # IPv4 Tunnels - x520
 
-    - title: "VPP 1T1C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4tun-64b-base-1t1c"
       output-file-name: "ip4-tunnels-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and 'LISP' and 'IP6UNRLAY' and 'IP4OVRLAY' and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4tun-64b-base-2t2c"
       output-file-name: "ip4-tunnels-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and 'LISP' and 'IP6UNRLAY' and 'IP4OVRLAY' and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4tun-64b-base-4t4c"
       output-file-name: "ip4-tunnels-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and 'LISP' and 'IP6UNRLAY' and 'IP4OVRLAY' and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # IPv4 Tunnels - x710
 
-    - title: "VPP 1T1C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4tun-64b-base-1t1c"
       output-file-name: "ip4-tunnels-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -993,7 +2296,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4tun-64b-base-2t2c"
       output-file-name: "ip4-tunnels-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -1001,7 +2304,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4tun-64b-base-4t4c"
       output-file-name: "ip4-tunnels-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -1011,33 +2314,33 @@
 
 # IPv6 - x520
 
-    - title: "VPP 1T1C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip6-78b-base-scale-1t1c"
       output-file-name: "ip6-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and 'BASE' and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip6-78b-base-scale-2t2c"
       output-file-name: "ip6-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and 'BASE' and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip6-78b-base-scale-4t4c"
       output-file-name: "ip6-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and 'BASE' and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # IPv6 - xl710
 
-    - title: "VPP 1T1C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip6-78b-base-scale-1t1c"
       output-file-name: "ip6-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
@@ -1045,7 +2348,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip6-78b-base-scale-2t2c"
       output-file-name: "ip6-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
@@ -1053,7 +2356,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip6-78b-base-scale-4t4c"
       output-file-name: "ip6-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
@@ -1063,399 +2366,399 @@
 
 # IPv6 - x710
 
-    - title: "VPP 1T1C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip6-78b-base-scale-1t1c"
       output-file-name: "ip6-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip6-78b-base-scale-2t2c"
       output-file-name: "ip6-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip6-78b-base-scale-4t4c"
       output-file-name: "ip6-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - x520, 64B
 
-    - title: "VPP 1T1C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-64b-base-1t1c"
       output-file-name: "container-memif-l2-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-64b-base-2t2c"
       output-file-name: "container-memif-l2-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-64b-base-4t4c"
       output-file-name: "container-memif-l2-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - x520, IMIX
 
-    - title: "VPP 1T1C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-imix-base-1t1c"
       output-file-name: "container-memif-imix-l2-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-imix-base-2t2c"
       output-file-name: "container-memif-imix-l2-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-imix-base-4t4c"
       output-file-name: "container-memif-imix-l2-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - xl710, 64B
 
-    - title: "VPP 1T1C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-64b-base-1t1c"
       output-file-name: "container-memif-l2-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-64b-base-2t2c"
       output-file-name: "container-memif-l2-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-64b-base-4t4c"
       output-file-name: "container-memif-l2-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - xl710, IMIX
 
-    - title: "VPP 1T1C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-imix-base-1t1c"
       output-file-name: "container-memif-imix-l2-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-imix-base-2t2c"
       output-file-name: "container-memif-imix-l2-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-imix-base-4t4c"
       output-file-name: "container-memif-imix-l2-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - x710, 64B
 
-    - title: "VPP 1T1C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-64b-base-1t1c"
       output-file-name: "container-memif-l2-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-64b-base-2t2c"
       output-file-name: "container-memif-l2-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-64b-base-4t4c"
       output-file-name: "container-memif-l2-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - x710, IMIX
 
-    - title: "VPP 1T1C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-imix-base-1t1c"
       output-file-name: "container-memif-imix-l2-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-imix-base-2t2c"
       output-file-name: "container-memif-imix-l2-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-imix-base-4t4c"
       output-file-name: "container-memif-imix-l2-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x520, ethip4, 64B
 
-    - title: "VPP 1T1C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-64b-base-1t1c"
       output-file-name: "vm-vhost-ethip4-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-64b-base-2t2c"
       output-file-name: "vm-vhost-ethip4-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-64b-base-4t4c"
       output-file-name: "vm-vhost-ethip4-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x520, ethip4, IMIX
 
-    - title: "VPP 1T1C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-imix-base-1t1c"
       output-file-name: "vm-vhost-imix-ethip4-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-imix-base-2t2c"
       output-file-name: "vm-vhost-imix-ethip4-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-imix-base-4t4c"
       output-file-name: "vm-vhost-imix-ethip4-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x520, eth, 64B
 
-    - title: "VPP 1T1C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2xc-1t1c"
       output-file-name: "vm-vhost-eth-1t1c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
 
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2xc-2t2c"
       output-file-name: "vm-vhost-eth-2t2c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2xc-4t4c"
       output-file-name: "vm-vhost-eth-4t4c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2bd-1t1c"
       output-file-name: "vm-vhost-eth-1t1c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
 
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2bd-2t2c"
       output-file-name: "vm-vhost-eth-2t2c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2bd-4t4c"
       output-file-name: "vm-vhost-eth-4t4c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x520, eth, IMIX
 
-    - title: "VPP 1T1C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2xc-1t1c"
       output-file-name: "vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
 
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2xc-2t2c"
       output-file-name: "vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2xc-4t4c"
       output-file-name: "vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2bd-1t1c"
       output-file-name: "vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
 
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2bd-2t2c"
       output-file-name: "vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2bd-4t4c"
       output-file-name: "vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# VM vhost - xl710, eth, 64B
-
-    - title: "VPP 1T1C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-1t1c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-2t2c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-4t4c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# VM vhost - xl710, eth, IMIX
-
-    - title: "VPP 1T1C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-1t1c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-2t2c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-4t4c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+## VM vhost - xl710, eth, 64B
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-64b-base-1t1c"
+#      output-file-name: "vm-vhost-eth-1t1c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-64b-base-2t2c"
+#      output-file-name: "vm-vhost-eth-2t2c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-64b-base-4t4c"
+#      output-file-name: "vm-vhost-eth-4t4c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+
+## VM vhost - xl710, eth, IMIX
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-imix-base-1t1c"
+#      output-file-name: "vm-vhost-imix-eth-1t1c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-imix-base-2t2c"
+#      output-file-name: "vm-vhost-imix-eth-2t2c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-imix-base-4t4c"
+#      output-file-name: "vm-vhost-imix-eth-4t4c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
 # VM vhost - x710, ethip4, 64B
 
-    - title: "VPP 1T1C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-64b-base-1t1c"
       output-file-name: "vm-vhost-ethip4-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -1463,7 +2766,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-64b-base-2t2c"
       output-file-name: "vm-vhost-ethip4-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -1471,7 +2774,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-64b-base-4t4c"
       output-file-name: "vm-vhost-ethip4-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -1481,7 +2784,7 @@
 
 # VM vhost - x710, ethip4, IMIX
 
-    - title: "VPP 1T1C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-imix-base-1t1c"
       output-file-name: "vm-vhost-imix-ethip4-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -1489,7 +2792,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-imix-base-2t2c"
       output-file-name: "vm-vhost-imix-ethip4-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -1497,7 +2800,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-imix-base-4t4c"
       output-file-name: "vm-vhost-imix-ethip4-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -1507,7 +2810,7 @@
 
 # VM vhost - x710, eth, 64B
 
-    - title: "VPP 1T1C VM vhost eth 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-64b-base-1t1c"
       output-file-name: "vm-vhost-eth-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -1516,7 +2819,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-64b-base-2t2c"
       output-file-name: "vm-vhost-eth-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -1524,7 +2827,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-64b-base-4t4c"
       output-file-name: "vm-vhost-eth-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -1534,7 +2837,7 @@
 
 # VM vhost - x710, eth, IMIX
 
-    - title: "VPP 1T1C VM vhost eth IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-imix-base-1t1c"
       output-file-name: "vm-vhost-imix-eth-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -1543,7 +2846,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-imix-base-2t2c"
       output-file-name: "vm-vhost-imix-eth-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -1551,7 +2854,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-imix-base-4t4c"
       output-file-name: "vm-vhost-imix-eth-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -1559,135 +2862,211 @@
       - "result"
       layout: "plot-cpta"
 
-# IPSec
+# VTS - x520, 114B
 
-    - title: "VPP 1T1C IPSec 64B MRR Trending 3n-hsw"
-      output-file-name: "ipsec-1t1c-xl710-3n-hsw"
+    - title: "3n-hsw-x520-vts-114b-1t1c"
+      output-file-name: "vts-114b-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and '114B' and 'MRR' and '1T1C' and 'VHOST' and 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPSec 64B MRR Trending 3n-hsw"
-      output-file-name: "ipsec-2t2c-xl710-3n-hsw"
+    - title: "3n-hsw-x520-vts-114b-2t2c"
+      output-file-name: "vts-114b-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and '114B' and 'MRR' and '2T2C' and 'VHOST' and 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPSec 64B MRR Trending 3n-hsw"
-      output-file-name: "ipsec-4t4c-xl710-3n-hsw"
+    - title: "3n-hsw-x520-vts-114b-4t4c"
+      output-file-name: "vts-114b-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and '114B' and 'MRR' and '4T4C' and 'VHOST' and 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# SRv6 - x520
+# IPSec
 
-    - title: "VPP 1T1C SRv6 78B MRR Trending 3n-hsw"
-      output-file-name: "srv6-78b-1t1c-x520-3n-hsw"
+#    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-1t1c"
+#      output-file-name: "ipsec-1t1c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and not 'VHOST'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-2t2c"
+#      output-file-name: "ipsec-2t2c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and not 'VHOST'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-4t4c"
+#      output-file-name: "ipsec-4t4c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and not 'VHOST'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+
+# IPSec - SW INT
+    - title: "3n-hsw-x710-ip4-ipsecsw-int-64b-base-scale-1t1c"
+      output-file-name: "ipsecsw-int-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '1T1C' and 'SRv6'"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECSW' and 'IPSECINT' and 'AES_256_GCM' and ('BASE' or 'TNL_4' or 'TNL_40' or 'TNL_1000' or 'TNL_60000') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C SRv6 78B MRR Trending 3n-hsw"
-      output-file-name: "srv6-78b-2t2c-x520-3n-hsw"
+    - title: "3n-hsw-x710-ip4-ipsecsw-int-64b-base-scale-2t2c"
+      output-file-name: "ipsecsw-int-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '2T2C' and 'SRv6'"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECSW' and 'IPSECINT' and 'AES_256_GCM' and ('BASE' or 'TNL_4' or 'TNL_40' or 'TNL_1000' or 'TNL_60000') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C SRv6 78B MRR Trending 3n-hsw"
-      output-file-name: "srv6-78b-4t4c-x520-3n-hsw"
+    - title: "3n-hsw-x710-ip4-ipsecsw-int-64b-base-scale-4t4c"
+      output-file-name: "ipsecsw-int-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '4T4C' and 'SRv6'"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECSW' and 'IPSECINT' and 'AES_256_GCM' and ('BASE' or 'TNL_4' or 'TNL_40' or 'TNL_1000' or 'TNL_60000') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C SRv6 IMIX MRR Trending 3n-hsw"
-      output-file-name: "srv6-imix-1t1c-x520-3n-hsw"
+# IPSec - SW TUN
+    - title: "3n-hsw-x710-ip4-ipsecsw-tnl-64b-base-scale-1t1c"
+      output-file-name: "ipsecsw-tnl-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'SRv6'"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECSW' and 'IPSECTUN' and 'AES_256_GCM' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C SRv6 IMIX MRR Trending 3n-hsw"
-      output-file-name: "srv6-imix-2t2c-x520-3n-hsw"
+    - title: "3n-hsw-x710-ip4-ipsecsw-tnl-64b-base-scale-2t2c"
+      output-file-name: "ipsecsw-tnl-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'SRv6'"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECSW' and 'IPSECTUN' and 'AES_256_GCM' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C SRv6 IMIX MRR Trending 3n-hsw"
-      output-file-name: "srv6-imix-4t4c-x520-3n-hsw"
+    - title: "3n-hsw-x710-ip4-ipsecsw-tnl-64b-base-scale-4t4c"
+      output-file-name: "ipsecsw-tnl-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'SRv6'"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECSW' and 'IPSECTUN' and 'AES_256_GCM' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
+# SRv6 - x520
+
+    - title: "3n-hsw-x520-srv6-78b-1t1c"
+      output-file-name: "srv6-78b-1t1c-x520-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '1T1C' and 'SRv6'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-x520-srv6-78b-2t2c"
+      output-file-name: "srv6-78b-2t2c-x520-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '2T2C' and 'SRv6'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-x520-srv6-78b-4t4c"
+      output-file-name: "srv6-78b-4t4c-x520-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '4T4C' and 'SRv6'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+#    - title: "3n-hsw-x520-srv6-imix-1t1c"
+#      output-file-name: "srv6-imix-1t1c-x520-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'SRv6'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-x520-srv6-imix-2t2c"
+#      output-file-name: "srv6-imix-2t2c-x520-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'SRv6'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-x520-srv6-imix-4t4c"
+#      output-file-name: "srv6-imix-4t4c-x520-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'SRv6'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+
 # Link Bonding - x520
 
-    - title: "VPP 1T1C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-64b-1t1c"
       output-file-name: "lb-64b-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'LBOND'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'LBOND' and not 'LBOND_DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-64b-2t2c"
       output-file-name: "lb-64b-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'LBOND'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'LBOND' and not 'LBOND_DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-64b-4t4c"
       output-file-name: "lb-64b-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'LBOND'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'LBOND' and not 'LBOND_DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-imix-1t1c"
       output-file-name: "lb-imix-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'LBOND'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'LBOND' and not 'LBOND_DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-imix-2t2c"
       output-file-name: "lb-imix-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'LBOND'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'LBOND' and not 'LBOND_DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-imix-4t4c"
       output-file-name: "lb-imix-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'LBOND'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'LBOND' and not 'LBOND_DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Link Bonding - x710
 
-    - title: "VPP 1T1C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-64b-1t1c"
       output-file-name: "lb-64b-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'LBOND'"
@@ -1695,7 +3074,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-64b-2t2c"
       output-file-name: "lb-64b-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'LBOND'"
@@ -1703,7 +3082,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-64b-4t4c"
       output-file-name: "lb-64b-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'LBOND'"
@@ -1711,7 +3090,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-imix-1t1c"
       output-file-name: "lb-imix-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'LBOND'"
@@ -1719,7 +3098,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-imix-2t2c"
       output-file-name: "lb-imix-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'LBOND'"
@@ -1727,7 +3106,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-imix-4t4c"
       output-file-name: "lb-imix-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'LBOND'"
@@ -1737,7 +3116,7 @@
 
 # DPDK - x520 - 64B
 
-    - title: "DPDK 1T1C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-dpdk-64b-1t1c"
       output-file-name: "dpdk-64b-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
@@ -1745,7 +3124,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 2T2C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-dpdk-64b-2t2c"
       output-file-name: "dpdk-64b-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
@@ -1753,7 +3132,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T4C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-dpdk-64b-4t4c"
       output-file-name: "dpdk-64b-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
@@ -1763,7 +3142,7 @@
 
 # DPDK - x710 - 64B
 
-    - title: "DPDK 1T1C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-dpdk-64b-1t1c"
       output-file-name: "dpdk-64b-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
@@ -1771,7 +3150,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 2T2C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-dpdk-64b-2t2c"
       output-file-name: "dpdk-64b-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
@@ -1779,7 +3158,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T4C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-dpdk-64b-4t4c"
       output-file-name: "dpdk-64b-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
@@ -1789,7 +3168,7 @@
 
 # DPDK - xl710 - 64B
 
-    - title: "DPDK 1T1C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-dpdk-64b-1t1c"
       output-file-name: "dpdk-64b-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
@@ -1797,7 +3176,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 2T2C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-dpdk-64b-2t2c"
       output-file-name: "dpdk-64b-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
@@ -1805,7 +3184,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T4C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-dpdk-64b-4t4c"
       output-file-name: "dpdk-64b-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
@@ -1813,90 +3192,90 @@
       - "result"
       layout: "plot-cpta"
 
-# DPDK - x520 - IMIX
-
-    - title: "DPDK 1T1C IMIX MRR Trending 3n-hsw"
-      output-file-name: "dpdk-imix-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 2T2C IMIX MRR Trending 3n-hsw"
-      output-file-name: "dpdk-imix-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 4T4C IMIX MRR Trending 3n-hsw"
-      output-file-name: "dpdk-imix-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# DPDK - x710 - IMIX
-
-    - title: "DPDK 1T1C IMIX MRR Trending 3n-hsw"
-      output-file-name: "dpdk-imix-1t1c-x710-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 2T2C IMIX MRR Trending 3n-hsw"
-      output-file-name: "dpdk-imix-2t2c-x710-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 4T4C IMIX MRR Trending 3n-hsw"
-      output-file-name: "dpdk-imix-4t4c-x710-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# DPDK - xl710 - IMIX
-
-    - title: "DPDK 1T1C IMIX MRR Trending 3n-hsw"
-      output-file-name: "dpdk-imix-1t1c-xl710-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 2T2C IMIX MRR Trending 3n-hsw"
-      output-file-name: "dpdk-imix-2t2c-xl710-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 4T4C IMIX MRR Trending 3n-hsw"
-      output-file-name: "dpdk-imix-4t4c-xl710-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+## DPDK - x520 - IMIX
+#
+#    - title: "DPDK 1T1C IMIX MRR Trending 3n-hsw"
+#      output-file-name: "dpdk-imix-1t1c-x520-3n-hsw"
+#      data: "plot-performance-trending-dpdk-3n-hsw"
+#      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 2T2C IMIX MRR Trending 3n-hsw"
+#      output-file-name: "dpdk-imix-2t2c-x520-3n-hsw"
+#      data: "plot-performance-trending-dpdk-3n-hsw"
+#      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 4T4C IMIX MRR Trending 3n-hsw"
+#      output-file-name: "dpdk-imix-4t4c-x520-3n-hsw"
+#      data: "plot-performance-trending-dpdk-3n-hsw"
+#      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+## DPDK - x710 - IMIX
+#
+#    - title: "DPDK 1T1C IMIX MRR Trending 3n-hsw"
+#      output-file-name: "dpdk-imix-1t1c-x710-3n-hsw"
+#      data: "plot-performance-trending-dpdk-3n-hsw"
+#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 2T2C IMIX MRR Trending 3n-hsw"
+#      output-file-name: "dpdk-imix-2t2c-x710-3n-hsw"
+#      data: "plot-performance-trending-dpdk-3n-hsw"
+#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 4T4C IMIX MRR Trending 3n-hsw"
+#      output-file-name: "dpdk-imix-4t4c-x710-3n-hsw"
+#      data: "plot-performance-trending-dpdk-3n-hsw"
+#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+## DPDK - xl710 - IMIX
+#
+#    - title: "DPDK 1T1C IMIX MRR Trending 3n-hsw"
+#      output-file-name: "dpdk-imix-1t1c-xl710-3n-hsw"
+#      data: "plot-performance-trending-dpdk-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 2T2C IMIX MRR Trending 3n-hsw"
+#      output-file-name: "dpdk-imix-2t2c-xl710-3n-hsw"
+#      data: "plot-performance-trending-dpdk-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 4T4C IMIX MRR Trending 3n-hsw"
+#      output-file-name: "dpdk-imix-4t4c-xl710-3n-hsw"
+#      data: "plot-performance-trending-dpdk-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
 ################################################################################
 # 3n-skx
 
 # L2 - x710
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-base-scale-2t1c"
       output-file-name: "l2-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -1904,7 +3283,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-base-scale-4t2c"
       output-file-name: "l2-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -1912,7 +3291,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-base-scale-8t4c"
       output-file-name: "l2-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -1920,7 +3299,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-features-2t1c"
       output-file-name: "l2-feature-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -1928,7 +3307,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-features-4t2c"
       output-file-name: "l2-feature-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -1936,7 +3315,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-features-8t4c"
       output-file-name: "l2-feature-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -1946,31 +3325,31 @@
 
 # L2 - xxv710
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-base-scale-2t1c"
       output-file-name: "l2-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-base-scale-4t2c"
       output-file-name: "l2-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-base-scale-8t4c"
       output-file-name: "l2-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-features-2t1c"
       output-file-name: "l2-feature-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -1978,7 +3357,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-features-4t2c"
       output-file-name: "l2-feature-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -1986,7 +3365,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-features-8t4c"
       output-file-name: "l2-feature-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -1996,31 +3375,31 @@
 
 # IPv4 - x710
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-base-scale-2t1c"
       output-file-name: "ip4-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-base-scale-4t2c"
       output-file-name: "ip4-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-base-scale-8t4c"
       output-file-name: "ip4-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-features-2t1c"
       output-file-name: "ip4-feature-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2028,7 +3407,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-features-4t2c"
       output-file-name: "ip4-feature-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2036,7 +3415,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-features-8t4c"
       output-file-name: "ip4-feature-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2046,7 +3425,7 @@
 
 # IPv4 - xxv710
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-base-scale-2t1c"
       output-file-name: "ip4-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
@@ -2054,7 +3433,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-base-scale-4t2c"
       output-file-name: "ip4-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
@@ -2062,7 +3441,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-base-scale-8t4c"
       output-file-name: "ip4-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
@@ -2070,7 +3449,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-features-2t1c"
       output-file-name: "ip4-feature-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2078,7 +3457,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-features-4t2c"
       output-file-name: "ip4-feature-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2086,7 +3465,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-features-8t4c"
       output-file-name: "ip4-feature-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2096,7 +3475,7 @@
 
 # IPv4 Tunnels - x710
 
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4tun-64b-base-2t1c"
       output-file-name: "ip4-tunnels-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2104,7 +3483,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4tun-64b-base-4t2c"
       output-file-name: "ip4-tunnels-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2112,7 +3491,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4tun-64b-base-8t4c"
       output-file-name: "ip4-tunnels-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2122,7 +3501,7 @@
 
 # IPv4 Tunnels - xxv710
 
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4tun-64b-base-2t1c"
       output-file-name: "ip4-tunnels-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2130,7 +3509,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4tun-64b-base-4t2c"
       output-file-name: "ip4-tunnels-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2138,7 +3517,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4tun-64b-base-8t4c"
       output-file-name: "ip4-tunnels-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2148,163 +3527,163 @@
 
 # IPv6 - x710
 
-    - title: "VPP 2T1C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip6-78b-base-scale-2t1c"
       output-file-name: "ip6-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip6-78b-base-scale-4t2c"
       output-file-name: "ip6-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip6-78b-base-scale-8t4c"
       output-file-name: "ip6-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # IPv6 - xxv710
 
-    - title: "VPP 2T1C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip6-78b-base-scale-2t1c"
       output-file-name: "ip6-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip6-78b-base-scale-4t2c"
       output-file-name: "ip6-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip6-78b-base-scale-8t4c"
       output-file-name: "ip6-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - x710, 64B
 
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-64b-base-2t1c"
       output-file-name: "container-memif-l2-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-64b-base-4t2c"
       output-file-name: "container-memif-l2-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-64b-base-8t4c"
       output-file-name: "container-memif-l2-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - xxv710, 64B
 
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-64b-base-2t1c"
       output-file-name: "container-memif-l2-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-64b-base-4t2c"
       output-file-name: "container-memif-l2-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-64b-base-8t4c"
       output-file-name: "container-memif-l2-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - x710, IMIX
 
-    - title: "VPP 2T1C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-imix-base-2t1c"
       output-file-name: "container-memif-imix-l2-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-imix-base-4t2c"
       output-file-name: "container-memif-imix-l2-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-imix-base-8t4c"
       output-file-name: "container-memif-imix-l2-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - xxv710, IMIX
 
-    - title: "VPP 2T1C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-imix-base-2t1c"
       output-file-name: "container-memif-imix-l2-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-imix-base-4t2c"
       output-file-name: "container-memif-imix-l2-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-imix-base-8t4c"
       output-file-name: "container-memif-imix-l2-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x710, ethip4, 64B
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-ethip4-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2312,7 +3691,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-ethip4-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2320,7 +3699,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-ethip4-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2330,7 +3709,7 @@
 
 # VM vhost - xxv710, ethip4, 64B
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-ethip4-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2338,7 +3717,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-ethip4-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2346,7 +3725,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-ethip4-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2356,7 +3735,7 @@
 
 # VM vhost - x710, ethip4, IMIX
 
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-ethip4-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2364,7 +3743,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-ethip4-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2372,7 +3751,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-ethip4-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2382,7 +3761,7 @@
 
 # VM vhost - xxv710, ethip4, IMIX
 
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-ethip4-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2390,7 +3769,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-ethip4-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2398,7 +3777,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-ethip4-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2408,7 +3787,7 @@
 
 # VM vhost - x710, eth, 64B
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-eth-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2417,7 +3796,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-eth-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2425,7 +3804,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-eth-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2435,7 +3814,7 @@
 
 # VM vhost - xxv710, eth, 64B
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-eth-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2444,7 +3823,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-eth-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2452,7 +3831,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-eth-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2462,7 +3841,7 @@
 
 # VM vhost - x710, eth, IMIX
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-eth-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2471,7 +3850,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-eth-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2479,7 +3858,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-eth-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2489,7 +3868,7 @@
 
 # VM vhost - xxv710, eth, IMIX
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-eth-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2498,7 +3877,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-eth-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2506,7 +3885,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-eth-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2514,109 +3893,160 @@
       - "result"
       layout: "plot-cpta"
 
-# Link Bonding - x710
 
-    - title: "VPP 2T1C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-2t1c-x710-3n-skx"
+# IPSec - SW INT
+    - title: "3n-skx-x710-ip4-ipsecsw-int-64b-base-scale-2t1c"
+      output-file-name: "ipsecsw-int-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'LBOND'"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '2T1C' and 'IPSECSW' and 'IPSECINT' and 'AES_256_GCM' and ('BASE' or 'TNL_4' or 'TNL_40' or 'TNL_1000' or 'TNL_60000') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-4t2c-x710-3n-skx"
+    - title: "3n-skx-x710-ip4-ipsecsw-int-64b-base-scale-4t2c"
+      output-file-name: "ipsecsw-int-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'LBOND'"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '4T2C' and 'IPSECSW' and 'IPSECINT' and 'AES_256_GCM' and ('BASE' or 'TNL_4' or 'TNL_40' or 'TNL_1000' or 'TNL_60000') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-8t4c-x710-3n-skx"
+    - title: "3n-skx-x710-ip4-ipsecsw-int-64b-base-scale-8t4c"
+      output-file-name: "ipsecsw-int-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'LBOND'"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '8T4C' and 'IPSECSW' and 'IPSECINT' and 'AES_256_GCM' and ('BASE' or 'TNL_4' or 'TNL_40' or 'TNL_1000' or 'TNL_60000') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-2t1c-x710-3n-skx"
+# IPSec - SW TUN
+    - title: "3n-skx-x710-ip4-ipsecsw-tnl-64b-base-scale-2t1c"
+      output-file-name: "ipsecsw-tnl-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND'"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '2T1C' and 'IPSECSW' and 'IPSECTUN' and 'AES_256_GCM' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-4t2c-x710-3n-skx"
+    - title: "3n-skx-x710-ip4-ipsecsw-tnl-64b-base-scale-4t2c"
+      output-file-name: "ipsecsw-tnl-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND'"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '4T2C' and 'IPSECSW' and 'IPSECTUN' and 'AES_256_GCM' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-8t4c-x710-3n-skx"
+    - title: "3n-skx-x710-ip4-ipsecsw-tnl-64b-base-scale-8t4c"
+      output-file-name: "ipsecsw-tnl-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND'"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '8T4C' and 'IPSECSW' and 'IPSECTUN' and 'AES_256_GCM' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# Link Bonding - xxv710
+# Link Bonding - x710
 
-    - title: "VPP 2T1C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-2t1c-xxv710-3n-skx"
+    - title: "3n-skx-x710-lb-64b-2t1c"
+      output-file-name: "lb-64b-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'LBOND_VPP'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-4t2c-xxv710-3n-skx"
+    - title: "3n-skx-x710-lb-64b-4t2c"
+      output-file-name: "lb-64b-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'LBOND_VPP'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-8t4c-xxv710-3n-skx"
+    - title: "3n-skx-x710-lb-64b-8t4c"
+      output-file-name: "lb-64b-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'LBOND_VPP'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-2t1c-xxv710-3n-skx"
+    - title: "3n-skx-x710-lb-imix-2t1c"
+      output-file-name: "lb-imix-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND_VPP'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-4t2c-xxv710-3n-skx"
+    - title: "3n-skx-x710-lb-imix-4t2c"
+      output-file-name: "lb-imix-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND_VPP'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-8t4c-xxv710-3n-skx"
+    - title: "3n-skx-x710-lb-imix-8t4c"
+      output-file-name: "lb-imix-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND_VPP'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
+## Link Bonding - xxv710
+#
+#    - title: "VPP 2T1C Link Bonding 64B MRR Trending 3n-skx"
+#      output-file-name: "lb-64b-2t1c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 4T2C Link Bonding 64B MRR Trending 3n-skx"
+#      output-file-name: "lb-64b-4t2c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 8T4C Link Bonding 64B MRR Trending 3n-skx"
+#      output-file-name: "lb-64b-8t4c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 3n-skx"
+#      output-file-name: "lb-imix-2t1c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 3n-skx"
+#      output-file-name: "lb-imix-4t2c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 3n-skx"
+#      output-file-name: "lb-imix-8t4c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+
 # DPDK - x710 - 64B
 
-    - title: "DPDK 2T1C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-dpdk-64b-2t1c"
       output-file-name: "dpdk-64b-2t1c-x710-3n-skx"
       data: "plot-performance-trending-dpdk-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
@@ -2624,7 +4054,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-dpdk-64b-4t2c"
       output-file-name: "dpdk-64b-4t2c-x710-3n-skx"
       data: "plot-performance-trending-dpdk-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
@@ -2632,7 +4062,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-dpdk-64b-8t4c"
       output-file-name: "dpdk-64b-8t4c-x710-3n-skx"
       data: "plot-performance-trending-dpdk-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'DPDK'"
@@ -2640,35 +4070,35 @@
       - "result"
       layout: "plot-cpta"
 
-# DPDK - x710 - IMIX
-
-    - title: "DPDK 2T1C IMIX MRR Trending 3n-skx"
-      output-file-name: "dpdk-imix-2t1c-x710-3n-skx"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 4T2C IMIX MRR Trending 3n-skx"
-      output-file-name: "dpdk-imix-4t2c-x710-3n-skx"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 8T4C IMIX MRR Trending 3n-skx"
-      output-file-name: "dpdk-imix-8t4c-x710-3n-skx"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+## DPDK - x710 - IMIX
+#
+#    - title: "DPDK 2T1C IMIX MRR Trending 3n-skx"
+#      output-file-name: "dpdk-imix-2t1c-x710-3n-skx"
+#      data: "plot-performance-trending-dpdk-3n-skx"
+#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 4T2C IMIX MRR Trending 3n-skx"
+#      output-file-name: "dpdk-imix-4t2c-x710-3n-skx"
+#      data: "plot-performance-trending-dpdk-3n-skx"
+#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 8T4C IMIX MRR Trending 3n-skx"
+#      output-file-name: "dpdk-imix-8t4c-x710-3n-skx"
+#      data: "plot-performance-trending-dpdk-3n-skx"
+#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
 # DPDK - xxv710 - 64B
 
-    - title: "DPDK 2T1C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-dpdk-64b-2t1c"
       output-file-name: "dpdk-64b-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-dpdk-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
@@ -2676,7 +4106,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-dpdk-64b-4t2c"
       output-file-name: "dpdk-64b-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-dpdk-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
@@ -2684,7 +4114,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-dpdk-64b-8t4c"
       output-file-name: "dpdk-64b-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-dpdk-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'DPDK'"
@@ -2692,62 +4122,62 @@
       - "result"
       layout: "plot-cpta"
 
-# DPDK - xxv710 - IMIX
-
-    - title: "DPDK 2T1C IMIX MRR Trending 3n-skx"
-      output-file-name: "dpdk-imix-2t1c-xxv710-3n-skx"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 4T2C IMIX MRR Trending 3n-skx"
-      output-file-name: "dpdk-imix-4t2c-xxv710-3n-skx"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 8T4C IMIX MRR Trending 3n-skx"
-      output-file-name: "dpdk-imix-8t4c-xxv710-3n-skx"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+## DPDK - xxv710 - IMIX
+#
+#    - title: "DPDK 2T1C IMIX MRR Trending 3n-skx"
+#      output-file-name: "dpdk-imix-2t1c-xxv710-3n-skx"
+#      data: "plot-performance-trending-dpdk-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 4T2C IMIX MRR Trending 3n-skx"
+#      output-file-name: "dpdk-imix-4t2c-xxv710-3n-skx"
+#      data: "plot-performance-trending-dpdk-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 8T4C IMIX MRR Trending 3n-skx"
+#      output-file-name: "dpdk-imix-8t4c-xxv710-3n-skx"
+#      data: "plot-performance-trending-dpdk-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
 ################################################################################
 # 2n-skx
 
 # L2 - x710
 
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-base-scale-2t1c"
       output-file-name: "l2-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-base-scale-4t2c"
       output-file-name: "l2-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-base-scale-8t4c"
       output-file-name: "l2-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-features-2t1c"
       output-file-name: "l2-feature-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2755,7 +4185,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-features-4t2c"
       output-file-name: "l2-feature-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2763,7 +4193,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-features-8t4c"
       output-file-name: "l2-feature-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2773,31 +4203,31 @@
 
 # L2 - xxv710
 
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-base-scale-2t1c"
       output-file-name: "l2-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-base-scale-4t2c"
       output-file-name: "l2-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-base-scale-8t4c"
       output-file-name: "l2-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-features-2t1c"
       output-file-name: "l2-feature-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2805,7 +4235,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-features-4t2c"
       output-file-name: "l2-feature-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2813,7 +4243,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-features-8t4c"
       output-file-name: "l2-feature-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2823,31 +4253,31 @@
 
 # IPv4 - x710
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-base-scale-2t1c"
       output-file-name: "ip4-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-base-scale-4t2c"
       output-file-name: "ip4-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-base-scale-8t4c"
       output-file-name: "ip4-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-features-2t1c"
       output-file-name: "ip4-feature-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2855,7 +4285,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-features-4t2c"
       output-file-name: "ip4-feature-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2863,7 +4293,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-features-8t4c"
       output-file-name: "ip4-feature-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2873,57 +4303,57 @@
 
 # IPv4 - xxv710
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-base-scale-2t1c"
       output-file-name: "ip4-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-base-scale-4t2c"
       output-file-name: "ip4-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-base-scale-8t4c"
       output-file-name: "ip4-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-feature-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-feature-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-feature-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+#    - title: "2n-skx-xxv710-ip4-64b-features-2t1c"
+#      output-file-name: "ip4-feature-2t1c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-skx-xxv710-ip4-64b-features-4t2c"
+#      output-file-name: "ip4-feature-4t2c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-skx-xxv710-ip4-64b-features-8t4c"
+#      output-file-name: "ip4-feature-8t4c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
 # IPv4 Tunnels - x710
 
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4tun-64b-base-2t1c"
       output-file-name: "ip4-tunnels-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2931,7 +4361,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4tun-64b-base-4t2c"
       output-file-name: "ip4-tunnels-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2939,7 +4369,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4tun-64b-base-8t4c"
       output-file-name: "ip4-tunnels-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2949,7 +4379,7 @@
 
 # IPv4 Tunnels - xxv710
 
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4tun-64b-base-2t1c"
       output-file-name: "ip4-tunnels-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2957,7 +4387,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4tun-64b-base-4t2c"
       output-file-name: "ip4-tunnels-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2965,7 +4395,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4tun-64b-base-8t4c"
       output-file-name: "ip4-tunnels-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2975,520 +4405,1048 @@
 
 # IPv6 - x710
 
-    - title: "VPP 2T1C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip6-78b-base-scale-2t1c"
       output-file-name: "ip6-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip6-78b-base-scale-4t2c"
       output-file-name: "ip6-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip6-78b-base-scale-8t4c"
       output-file-name: "ip6-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # IPv6 - xxv710
 
-    - title: "VPP 2T1C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip6-78b-base-scale-2t1c"
       output-file-name: "ip6-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip6-78b-base-scale-4t2c"
       output-file-name: "ip6-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip6-78b-base-scale-8t4c"
       output-file-name: "ip6-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - x710, 64B
 
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-memif-64b-base-2t1c"
       output-file-name: "container-memif-l2-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'DRV_AVF' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-memif-64b-base-4t2c"
       output-file-name: "container-memif-l2-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'DRV_AVF' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-memif-64b-base-8t4c"
       output-file-name: "container-memif-l2-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'DRV_AVF' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# Container memif - xxv710, 64B
+## Container memif - xxv710, 64B
+#
+#    - title: "2n-skx-xxv710-l2sw-memif-64b-base-2t1c"
+#      output-file-name: "container-memif-l2-2t1c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-skx-xxv710-l2sw-memif-64b-base-4t2c"
+#      output-file-name: "container-memif-l2-4t2c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-skx-xxv710-l2sw-memif-64b-base-8t4c"
+#      output-file-name: "container-memif-l2-8t4c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+
+# VM vhost - x710, ethip4, 64B
 
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 2n-skx"
-      output-file-name: "container-memif-l2-2t1c-xxv710-2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-64b-base-2t1c-mrr"
+      output-file-name: "vm-vhost-ethip4-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 2n-skx"
-      output-file-name: "container-memif-l2-4t2c-xxv710-2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-64b-base-4t2c-mrr"
+      output-file-name: "vm-vhost-ethip4-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 2n-skx"
-      output-file-name: "container-memif-l2-8t4c-xxv710-2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-64b-base-8t4c-mrr"
+      output-file-name: "vm-vhost-ethip4-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# VM vhost - x710, ethip4, 64B
+## VM vhost - xxv710, ethip4, 64B
+#
+#    - title: "2n-skx-xxv710-ip4-vhost-64b-base-2t1c"
+#      output-file-name: "vm-vhost-ethip4-2t1c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-skx-xxv710-ip4-vhost-64b-base-4t2c"
+#      output-file-name: "vm-vhost-ethip4-4t2c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-skx-xxv710-ip4-vhost-64b-base-8t4c"
+#      output-file-name: "vm-vhost-ethip4-8t4c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-ethip4-2t1c-x710-2n-skx"
+# VM vhost - x710, ethip4, IMIX
+
+    - title: "2n-skx-x710-ip4-vhost-imix-base-2t1c"
+      output-file-name: "vm-vhost-imix-ethip4-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-ethip4-4t2c-x710-2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-imix-base-4t2c"
+      output-file-name: "vm-vhost-imix-ethip4-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-ethip4-8t4c-x710-2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-imix-base-8t4c"
+      output-file-name: "vm-vhost-imix-ethip4-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# VM vhost - xxv710, ethip4, 64B
+## VM vhost - xxv710, ethip4, IMIX
+#
+#    - title: "2n-skx-xxv710-ip4-vhost-imix-base-2t1c"
+#      output-file-name: "vm-vhost-imix-ethip4-2t1c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-skx-xxv710-ip4-vhost-imix-base-4t2c"
+#      output-file-name: "vm-vhost-imix-ethip4-4t2c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-skx-xxv710-ip4-vhost-imix-base-8t4c"
+#      output-file-name: "vm-vhost-imix-ethip4-8t4c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+
+# VM vhost - x710, eth, 64B
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-ethip4-2t1c-xxv710-2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-64b-base-2t1c"
+      output-file-name: "vm-vhost-eth-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
+
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-ethip4-4t2c-xxv710-2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-64b-base-4t2c"
+      output-file-name: "vm-vhost-eth-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-ethip4-8t4c-xxv710-2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-64b-base-8t4c"
+      output-file-name: "vm-vhost-eth-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# VM vhost - x710, ethip4, IMIX
+## VM vhost - xxv710, eth, 64B
+#
+#    - title: "2n-skx-xxv710-l2sw-vhost-64b-base-2t1c"
+#      output-file-name: "vm-vhost-eth-2t1c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-skx-xxv710-l2sw-vhost-64b-base-4t2c"
+#      output-file-name: "vm-vhost-eth-4t2c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-skx-xxv710-l2sw-vhost-64b-base-8t4c"
+#      output-file-name: "vm-vhost-eth-8t4c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-ethip4-2t1c-x710-2n-skx"
+# VM vhost - x710, eth, IMIX
+
+    - title: "2n-skx-x710-l2sw-vhost-imix-base-2t1c"
+      output-file-name: "vm-vhost-imix-eth-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
+
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-ethip4-4t2c-x710-2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-imix-base-4t2c"
+      output-file-name: "vm-vhost-imix-eth-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-ethip4-8t4c-x710-2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-imix-base-8t4c"
+      output-file-name: "vm-vhost-imix-eth-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# VM vhost - xxv710, ethip4, IMIX
+## VM vhost - xxv710, eth, IMIX
+#
+#    - title: "2n-skx-xxv710-l2sw-vhost-imix-base-2t1c"
+#      output-file-name: "vm-vhost-imix-eth-2t1c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-skx-xxv710-l2sw-vhost-imix-base-4t2c"
+#      output-file-name: "vm-vhost-imix-eth-4t2c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "2n-skx-xxv710-l2sw-vhost-imix-base-8t4c"
+#      output-file-name: "vm-vhost-imix-eth-8t4c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+
+# Link Bonding - x710
 
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-ethip4-2t1c-xxv710-2n-skx"
+    - title: "2n-skx-x710-lb-64b-2t1c"
+      output-file-name: "lb-64b-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'LBOND'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-ethip4-4t2c-xxv710-2n-skx"
+    - title: "2n-skx-x710-lb-64b-4t2c"
+      output-file-name: "lb-64b-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'LBOND'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-ethip4-8t4c-xxv710-2n-skx"
+    - title: "2n-skx-x710-lb-64b-8t4c"
+      output-file-name: "lb-64b-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'LBOND'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# VM vhost - x710, eth, 64B
-
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-eth-2t1c-x710-2n-skx"
+    - title: "2n-skx-x710-lb-imix-2t1c"
+      output-file-name: "lb-imix-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-eth-4t2c-x710-2n-skx"
+    - title: "2n-skx-x710-lb-imix-4t2c"
+      output-file-name: "lb-imix-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-eth-8t4c-x710-2n-skx"
+    - title: "2n-skx-x710-lb-imix-8t4c"
+      output-file-name: "lb-imix-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# VM vhost - xxv710, eth, 64B
+## Link Bonding - xxv710
+#
+#    - title: "VPP 2T1C Link Bonding 64B MRR Trending 2n-skx"
+#      output-file-name: "lb-64b-2t1c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 4T2C Link Bonding 64B MRR Trending 2n-skx"
+#      output-file-name: "lb-64b-4t2c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 8T4C Link Bonding 64B MRR Trending 2n-skx"
+#      output-file-name: "lb-64b-8t4c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 2n-skx"
+#      output-file-name: "lb-imix-2t1c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 2n-skx"
+#      output-file-name: "lb-imix-4t2c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 2n-skx"
+#      output-file-name: "lb-imix-8t4c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-eth-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+# DPDK - x710 - 64B
 
+    - title: "2n-skx-x710-dpdk-64b-2t1c"
+      output-file-name: "dpdk-64b-2t1c-x710-2n-skx"
+      data: "plot-performance-trending-dpdk-2n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-eth-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+    - title: "2n-skx-x710-dpdk-64b-4t2c"
+      output-file-name: "dpdk-64b-4t2c-x710-2n-skx"
+      data: "plot-performance-trending-dpdk-2n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-eth-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+    - title: "2n-skx-x710-dpdk-64b-8t4c"
+      output-file-name: "dpdk-64b-8t4c-x710-2n-skx"
+      data: "plot-performance-trending-dpdk-2n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# VM vhost - x710, eth, IMIX
+## DPDK - x710 - IMIX
+#
+#    - title: "DPDK 2T1C IMIX MRR Trending 2n-skx"
+#      output-file-name: "dpdk-imix-2t1c-x710-2n-skx"
+#      data: "plot-performance-trending-dpdk-2n-skx"
+#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 4T2C IMIX MRR Trending 2n-skx"
+#      output-file-name: "dpdk-imix-4t2c-x710-2n-skx"
+#      data: "plot-performance-trending-dpdk-2n-skx"
+#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 8T4C IMIX MRR Trending 2n-skx"
+#      output-file-name: "dpdk-imix-8t4c-x710-2n-skx"
+#      data: "plot-performance-trending-dpdk-2n-skx"
+#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-eth-2t1c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+# DPDK - xxv710 - 64B
 
+    - title: "2n-skx-xxv710-dpdk-64b-2t1c"
+      output-file-name: "dpdk-64b-2t1c-xxv710-2n-skx"
+      data: "plot-performance-trending-dpdk-2n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-eth-4t2c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+    - title: "2n-skx-xxv710-dpdk-64b-4t2c"
+      output-file-name: "dpdk-64b-4t2c-xxv710-2n-skx"
+      data: "plot-performance-trending-dpdk-2n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-eth-8t4c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+    - title: "2n-skx-xxv710-dpdk-64b-8t4c"
+      output-file-name: "dpdk-64b-8t4c-xxv710-2n-skx"
+      data: "plot-performance-trending-dpdk-2n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# VM vhost - xxv710, eth, IMIX
+## DPDK - xxv710 - IMIX
+#
+#    - title: "DPDK 2T1C IMIX MRR Trending 2n-skx"
+#      output-file-name: "dpdk-imix-2t1c-xxv710-2n-skx"
+#      data: "plot-performance-trending-dpdk-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 4T2C IMIX MRR Trending 2n-skx"
+#      output-file-name: "dpdk-imix-4t2c-xxv710-2n-skx"
+#      data: "plot-performance-trending-dpdk-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 8T4C IMIX MRR Trending 2n-skx"
+#      output-file-name: "dpdk-imix-8t4c-xxv710-2n-skx"
+#      data: "plot-performance-trending-dpdk-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-eth-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+################################################################################
+# 3n-tsh
+
+# L2 - x520
 
+    - title: "3n-tsh-x520-l2sw-64b-base-scale-1t1c"
+      output-file-name: "l2-1t1c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-eth-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+    - title: "3n-tsh-x520-l2sw-64b-base-scale-2t2c"
+      output-file-name: "l2-2t2c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-eth-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+    - title: "3n-tsh-x520-l2sw-64b-base-scale-4t4c"
+      output-file-name: "l2-4t4c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# Link Bonding - x710
+# IPv4 - x520
 
-    - title: "VPP 2T1C Link Bonding 64B MRR Trending 2n-skx"
-      output-file-name: "lb-64b-2t1c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'LBOND'"
+    - title: "3n-tsh-x520-ip4-64b-base-scale-1t1c"
+      output-file-name: "ip4-1t1c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 2n-skx"
-      output-file-name: "lb-64b-4t2c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'LBOND'"
+    - title: "3n-tsh-x520-ip4-64b-base-scale-2t2c"
+      output-file-name: "ip4-2t2c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 2n-skx"
-      output-file-name: "lb-64b-8t4c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'LBOND'"
+    - title: "3n-tsh-x520-ip4-64b-base-scale-4t4c"
+      output-file-name: "ip4-4t4c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 2n-skx"
-      output-file-name: "lb-imix-2t1c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND'"
+    - title: "3n-tsh-x520-ip4-64b-features-1t1c"
+      output-file-name: "ip4-feature-1t1c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 2n-skx"
-      output-file-name: "lb-imix-4t2c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND'"
+    - title: "3n-tsh-x520-ip4-64b-features-2t2c"
+      output-file-name: "ip4-feature-2t2c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 2n-skx"
-      output-file-name: "lb-imix-8t4c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND'"
+    - title: "3n-tsh-x520-ip4-64b-features-4t4c"
+      output-file-name: "ip4-feature-4t4c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# Link Bonding - xxv710
+# IPv4 Tunnels - x520
 
-    - title: "VPP 2T1C Link Bonding 64B MRR Trending 2n-skx"
-      output-file-name: "lb-64b-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND'"
+    - title: "3n-tsh-x520-ip4tun-64b-base-1t1c"
+      output-file-name: "ip4-tunnels-1t1c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 2n-skx"
-      output-file-name: "lb-64b-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND'"
+    - title: "3n-tsh-x520-ip4tun-64b-base-2t2c"
+      output-file-name: "ip4-tunnels-2t2c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 2n-skx"
-      output-file-name: "lb-64b-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND'"
+    - title: "3n-tsh-x520-ip4tun-64b-base-4t4c"
+      output-file-name: "ip4-tunnels-4t4c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 2n-skx"
-      output-file-name: "lb-imix-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND'"
+# IPv6 - x520
+
+    - title: "3n-tsh-x520-ip6-78b-base-scale-1t1c"
+      output-file-name: "ip6-1t1c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 2n-skx"
-      output-file-name: "lb-imix-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND'"
+    - title: "3n-tsh-x520-ip6-78b-base-scale-2t2c"
+      output-file-name: "ip6-2t2c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 2n-skx"
-      output-file-name: "lb-imix-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND'"
+    - title: "3n-tsh-x520-ip6-78b-base-scale-4t4c"
+      output-file-name: "ip6-4t4c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# DPDK - x710 - 64B
+# Container memif - x520, 64B
 
-    - title: "DPDK 2T1C 64B MRR Trending 2n-skx"
-      output-file-name: "dpdk-64b-2t1c-x710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
+    - title: "3n-tsh-x520-l2sw-memif-64b-base-1t1c"
+      output-file-name: "container-memif-l2-1t1c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 2n-skx"
-      output-file-name: "dpdk-64b-4t2c-x710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
+    - title: "3n-tsh-x520-l2sw-memif-64b-base-2t2c"
+      output-file-name: "container-memif-l2-2t2c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 2n-skx"
-      output-file-name: "dpdk-64b-8t4c-x710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'DPDK'"
+    - title: "3n-tsh-x520-l2sw-memif-64b-base-4t4c"
+      output-file-name: "container-memif-l2-4t4c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# DPDK - x710 - IMIX
+# VM vhost - x520, ethip4, 64B
 
-    - title: "DPDK 2T1C IMIX MRR Trending 2n-skx"
-      output-file-name: "dpdk-imix-2t1c-x710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
+    - title: "3n-tsh-x520-ip4-vhost-64b-base-1t1c"
+      output-file-name: "vm-vhost-ethip4-1t1c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C IMIX MRR Trending 2n-skx"
-      output-file-name: "dpdk-imix-4t2c-x710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
+    - title: "3n-tsh-x520-ip4-vhost-64b-base-2t2c"
+      output-file-name: "vm-vhost-ethip4-2t2c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C IMIX MRR Trending 2n-skx"
-      output-file-name: "dpdk-imix-8t4c-x710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
+    - title: "3n-tsh-x520-ip4-vhost-64b-base-4t4c"
+      output-file-name: "vm-vhost-ethip4-4t4c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# DPDK - xxv710 - 64B
+# VM vhost - x520, eth, 64B
+
+    - title: "3n-tsh-x520-l2sw-vhost-64b-base-1t1c"
+      output-file-name: "vm-vhost-eth-1t1c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
 
-    - title: "DPDK 2T1C 64B MRR Trending 2n-skx"
-      output-file-name: "dpdk-64b-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 2n-skx"
-      output-file-name: "dpdk-64b-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
+    - title: "3n-tsh-x520-l2sw-vhost-64b-base-2t2c"
+      output-file-name: "vm-vhost-eth-2t2c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 2n-skx"
-      output-file-name: "dpdk-64b-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'DPDK'"
+    - title: "3n-tsh-x520-l2sw-vhost-64b-base-4t4c"
+      output-file-name: "vm-vhost-eth-4t4c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# DPDK - xxv710 - IMIX
+# IPSec SW INT
 
-    - title: "DPDK 2T1C IMIX MRR Trending 2n-skx"
-      output-file-name: "dpdk-imix-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
+    - title: "3n-tsh-x520-ip4-ipsecsw-int-64b-base-scale-1t1c"
+      output-file-name: "ipsecsw-int-1t1c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECSW' and 'IPSECINT' and 'AES_256_GCM' and ('BASE' or 'TNL_4' or 'TNL_40' or 'TNL_1000' or 'TNL_60000') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C IMIX MRR Trending 2n-skx"
-      output-file-name: "dpdk-imix-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
+    - title: "3n-tsh-x520-ip4-ipsecsw-int-64b-base-scale-2t2c"
+      output-file-name: "ipsecsw-int-2t2c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECSW' and 'IPSECINT' and 'AES_256_GCM' and ('BASE' or 'TNL_4' or 'TNL_40' or 'TNL_1000' or 'TNL_60000') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C IMIX MRR Trending 2n-skx"
-      output-file-name: "dpdk-imix-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
+    - title: "3n-tsh-x520-ip4-ipsecsw-int-64b-base-scale-4t4c"
+      output-file-name: "ipsecsw-int-4t4c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECSW' and 'IPSECINT' and 'AES_256_GCM' and ('BASE' or 'TNL_4' or 'TNL_40' or 'TNL_1000' or 'TNL_60000') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPSec SW TNL
+
+    - title: "3n-tsh-x520-ip4-ipsecsw-tnl-64b-base-scale-1t1c"
+      output-file-name: "ipsecsw-tnl-1t1c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECSW' and 'IPSECTUN' and 'AES_256_GCM' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-ip4-ipsecsw-tnl-64b-base-scale-2t2c"
+      output-file-name: "ipsecsw-tnl-2t2c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECSW' and 'IPSECTUN' and 'AES_256_GCM' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-ip4-ipsecsw-tnl-64b-base-scale-4t4c"
+      output-file-name: "ipsecsw-tnl-4t4c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECSW' and 'IPSECTUN' and 'AES_256_GCM' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# Link Bonding - x520
+
+    - title: "3n-tsh-x520-lb-64b-1t1c"
+      output-file-name: "lb-64b-1t1c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'LBOND_VPP'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-lb-64b-2t2c"
+      output-file-name: "lb-64b-2t2c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'LBOND_VPP'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-lb-64b-4t4c"
+      output-file-name: "lb-64b-4t4c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'LBOND_VPP'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+################################################################################
+# 3n-dnv
+
+# L2 - x553
+
+    - title: "3n-dnv-x553-l2sw-64b-base-scale-1t1c"
+      output-file-name: "l2-1t1c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-l2sw-64b-base-scale-2t2c"
+      output-file-name: "l2-2t2c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-l2sw-64b-base-scale-4t4c"
+      output-file-name: "l2-4t4c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPv4 - x553
+
+    - title: "3n-dnv-x553-ip4-64b-base-scale-1t1c"
+      output-file-name: "ip4-1t1c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-ip4-64b-base-scale-2t2c"
+      output-file-name: "ip4-2t2c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-ip4-64b-base-scale-4t4c"
+      output-file-name: "ip4-4t4c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPv4 Tunnels - x553
+
+    - title: "3n-dnv-x553-ip4tun-64b-base-1t1c"
+      output-file-name: "ip4-tunnels-1t1c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-ip4tun-64b-base-2t2c"
+      output-file-name: "ip4-tunnels-2t2c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-ip4tun-64b-base-4t4c"
+      output-file-name: "ip4-tunnels-4t4c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPv6 - x553
+
+    - title: "3n-dnv-x553-ip6-78b-base-scale-1t1c"
+      output-file-name: "ip6-1t1c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-ip6-78b-base-scale-2t2c"
+      output-file-name: "ip6-2t2c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-ip6-78b-base-scale-4t4c"
+      output-file-name: "ip6-4t4c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPSec HW IPSECINT
+
+    - title: "3n-dnv-x553-ip4-ipsechw-int-64b-base-scale-1t1c"
+      output-file-name: "ipsechw-int-1t1c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and 'IPSECINT' and 'AES_256_GCM' and ('BASE' or 'TNL_4' or 'TNL_40' or 'TNL_1000' or 'TNL_60000') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-ip4-ipsechw-int-64b-base-scale-2t2c"
+      output-file-name: "ipsechw-int-2t2c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and 'IPSECINT' and 'AES_256_GCM' and ('BASE' or 'TNL_4' or 'TNL_40' or 'TNL_1000' or 'TNL_60000') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-ip4-ipsechw-int-64b-base-scale-4t4c"
+      output-file-name: "ipsechw-int-4t4c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and 'IPSECINT' and 'AES_256_GCM' and ('BASE' or 'TNL_4' or 'TNL_40' or 'TNL_1000' or 'TNL_60000') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPSec HW IPSECTUN
+
+    - title: "3n-dnv-x553-ip4-ipsechw-tnl-64b-base-scale-1t1c"
+      output-file-name: "ipsechw-tnl-1t1c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and 'IPSECTUN' and 'AES_256_GCM' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-ip4-ipsechw-tnl-64b-base-scale-2t2c"
+      output-file-name: "ipsechw-tnl-2t2c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and 'IPSECTUN' and 'AES_256_GCM' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-ip4-ipsechw-tnl-64b-base-scale-4t4c"
+      output-file-name: "ipsechw-tnl-4t4c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and 'IPSECTUN' and 'AES_256_GCM' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+################################################################################
+# 2n-dnv
+
+# L2 - x553
+
+    - title: "2n-dnv-x553-l2sw-64b-base-scale-1t1c"
+      output-file-name: "l2-1t1c-x553-2n-dnv"
+      data: "plot-performance-trending-vpp-2n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "2n-dnv-x553-l2sw-64b-base-scale-2t2c"
+      output-file-name: "l2-2t2c-x553-2n-dnv"
+      data: "plot-performance-trending-vpp-2n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "2n-dnv-x553-l2sw-64b-base-scale-4t4c"
+      output-file-name: "l2-4t4c-x553-2n-dnv"
+      data: "plot-performance-trending-vpp-2n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPv4 - x553
+
+    - title: "2n-dnv-x553-ip4-64b-base-scale-1t1c"
+      output-file-name: "ip4-1t1c-x553-2n-dnv"
+      data: "plot-performance-trending-vpp-2n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "2n-dnv-x553-ip4-64b-base-scale-2t2c"
+      output-file-name: "ip4-2t2c-x553-2n-dnv"
+      data: "plot-performance-trending-vpp-2n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "2n-dnv-x553-ip4-64b-base-scale-4t4c"
+      output-file-name: "ip4-4t4c-x553-2n-dnv"
+      data: "plot-performance-trending-vpp-2n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPv6 - x553
+
+    - title: "2n-dnv-x553-ip6-78b-base-scale-1t1c"
+      output-file-name: "ip6-1t1c-x553-2n-dnv"
+      data: "plot-performance-trending-vpp-2n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "2n-dnv-x553-ip6-78b-base-scale-2t2c"
+      output-file-name: "ip6-2t2c-x553-2n-dnv"
+      data: "plot-performance-trending-vpp-2n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "2n-dnv-x553-ip6-78b-base-scale-4t4c"
+      output-file-name: "ip6-4t4c-x553-2n-dnv"
+      data: "plot-performance-trending-vpp-2n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"