X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification_CPTA.yaml;h=a08dda70cffa4c8495c0f6f9563e4436d7a57858;hb=5d49bc99a61bbc59b2cd7c0b58e577c3f9a46365;hp=ae152b4918beb628c42c8d24b19f6aad85a7207d;hpb=98bfad4c882e1a9b9b404c2ad298920a80e480da;p=csit.git

diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index ae152b4918..a08dda70cf 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -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.
@@ -123,15 +123,19 @@
         type: "failed-tests"
         way: "jenkins"
         include:
-        - "last-failed-tests-3n-hsw"
-        - "last-failed-tests-3n-skx"
-        - "last-failed-tests-2n-skx"
-        - "last-failed-tests-3n-tsh"
+          - "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"
-          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx"
           - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-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:
@@ -184,21 +188,9 @@
     # 3n-hsw
     plot-performance-trending-all-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 700
+        start: 780
         end: "lastCompletedBuild"
         skip:
-          - 726
-          - 749
-          - 750
-          - 751
-          - 752
-          - 753
-          - 754
-          - 755
-          - 756
-          - 757
-          - 758
-          - 760
           - 781
           - 782
           - 783
@@ -224,27 +216,29 @@
           - 808 #
           - 810 #
           - 815
+          - 818
+          - 819
+          - 820
+          - 831
+          - 832
+          - 852
+          - 855
+          - 856
+          - 860
+          - 867
       csit-dpdk-perf-mrr-weekly-master:
-        start: 73
+        start: 81
         end: "lastCompletedBuild"
+        skip:
+          - 87
+          - 89
+          - 90
 
     plot-performance-trending-vpp-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 700
+        start: 780
         end: "lastCompletedBuild"
         skip:
-          - 726
-          - 749
-          - 750
-          - 751
-          - 752
-          - 753
-          - 754
-          - 755
-          - 756
-          - 757
-          - 758
-          - 760
           - 781
           - 782
           - 783
@@ -270,32 +264,32 @@
           - 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: 73
+        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: 450
+        start: 530
         end: "lastCompletedBuild"
         skip:
-          - 480
-          - 481
-          - 499
-          - 500
-          - 501
-          - 502
-          - 503
-          - 504
-          - 505
-          - 506
-          - 507
-          - 508
-          - 510
-          - 511
           - 531
           - 532
           - 533
@@ -321,29 +315,34 @@
           - 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: 38
+        start: 46
         end: "lastCompletedBuild"
+        skip:
+          - 52
+          - 54
+          - 55
+          - 56
 
     plot-performance-trending-vpp-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 450
+        start: 530
         end: "lastCompletedBuild"
         skip:
-          - 480
-          - 481
-          - 499
-          - 500
-          - 501
-          - 502
-          - 503
-          - 504
-          - 505
-          - 506
-          - 507
-          - 508
-          - 510
-          - 511
           - 531
           - 532
           - 533
@@ -369,29 +368,37 @@
           - 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: 38
+        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: 450
+        start: 530
         end: "lastCompletedBuild"
         skip:
-          - 477
-          - 500
-          - 501
-          - 502
-          - 503
-          - 504
-          - 505
-          - 506
-          - 507
-          - 508
-          - 509
           - 532
           - 533
           - 534
@@ -406,28 +413,31 @@
           - 550
           - 556
           - 557
+          - 567
+          - 568
+          - 569
+          - 582
+          - 583
+          - 605
+          - 608
+          - 609
+          - 612
+          - 620
+          - 627
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 37
+        start: 46
         end: "lastCompletedBuild"
         skip:
-          - 39
+          - 52
+          - 54
+          - 55
+          - 56
 
     plot-performance-trending-vpp-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
-        start: 450
+        start: 530
         end: "lastCompletedBuild"
         skip:
-          - 477
-          - 500
-          - 501
-          - 502
-          - 503
-          - 504
-          - 505
-          - 506
-          - 507
-          - 508
-          - 509
           - 532
           - 533
           - 534
@@ -442,20 +452,35 @@
           - 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: 37
+        start: 46
         end: "lastCompletedBuild"
         skip:
-          - 39
+          - 52
+          - 54
+          - 55
+          - 56
 
     plot-performance-trending-vpp-nfv-2n-skx:
       csit-vpp-perf-mrr-weekly-master-2n-skx:
-        start: 16
+        start: 20
         end: "lastCompletedBuild"
         skip:
           - 21
+          - 29
 
     # 3n-tsh
     plot-performance-trending-all-3n-tsh:
@@ -468,6 +493,14 @@
           - 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:
@@ -479,6 +512,14 @@
           - 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:
@@ -493,6 +534,34 @@
           - 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:
@@ -504,6 +573,31 @@
           - 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:
 
@@ -572,6 +666,8 @@
         traceorder: "normal"  # "grouped" does not work: bug https://github.com/plotly/plotly.js/issues/1913
         tracegroupgap: 20
         bordercolor: "rgb(238, 238, 238)"
+      paper_bgcolor: "#fff"
+      plot_bgcolor: "#fff"
       hoverlabel:
         namelength: -1
 
@@ -589,27 +685,20 @@
     extract: "output.xml"
     # Number of days from now to the past. Only files generated in this
     # time period are used.
-    time-period: 60
+    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: 700
+      start: 780
       end: "lastCompletedBuild"
       skip:
-        - 726
-        - 749
-        - 750
-        - 751
-        - 752
-        - 753
-        - 754
-        - 755
-        - 756
-        - 757
-        - 758
-        - 760
         - 781
         - 782
         - 783
@@ -635,29 +724,29 @@
         - 808 #
         - 810 #
         - 815
+        - 818
+        - 819
+        - 820
+        - 831
+        - 832
+        - 852
+        - 855
+        - 856
+        - 860
+        - 867
     csit-dpdk-perf-mrr-weekly-master:
-      start: 73
+      start: 81
       end: "lastCompletedBuild"
+      skip:
+        - 87
+        - 89
+        - 90
 
     # 3n-skx
     csit-vpp-perf-mrr-daily-master-3n-skx:
-      start: 450
+      start: 530
       end: "lastCompletedBuild"
       skip:
-        - 480
-        - 481
-        - 499
-        - 500
-        - 501
-        - 502
-        - 503
-        - 504
-        - 505
-        - 506
-        - 507
-        - 508
-        - 510
-        - 511
         - 531
         - 532
         - 533
@@ -683,26 +772,34 @@
         - 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: 38
+      start: 46
       end: "lastCompletedBuild"
+      skip:
+        - 52
+        - 54
+        - 55
+        - 56
 
     # 2n-skx
     csit-vpp-perf-mrr-daily-master-2n-skx:
-      start: 450
+      start: 530
       end: "lastCompletedBuild"
       skip:
-        - 477
-        - 500
-        - 501
-        - 502
-        - 503
-        - 504
-        - 505
-        - 506
-        - 507
-        - 508
-        - 509
         - 532
         - 533
         - 534
@@ -717,16 +814,31 @@
         - 550
         - 556
         - 557
+        - 567
+        - 568
+        - 569
+        - 582
+        - 583
+        - 605
+        - 608
+        - 609
+        - 612
+        - 620
+        - 627
     csit-vpp-perf-mrr-weekly-master-2n-skx:
-      start: 16
+      start: 20
       end: "lastCompletedBuild"
       skip:
         - 21
+        - 29
     csit-dpdk-perf-mrr-weekly-master-2n-skx:
-      start: 37
+      start: 46
       end: "lastCompletedBuild"
       skip:
-        - 39
+        - 52
+        - 54
+        - 55
+        - 56
 
     # 3n-tsh
     csit-vpp-perf-mrr-daily-master-3n-tsh:
@@ -736,6 +848,16 @@
         - 61
         - 62
         - 63
+        - 64
+        - 65
+        - 69
+        - 70
+        - 71
+        - 72
+        - 73
+        - 80
+        - 84
+        - 89
 
     # 3n-dnv
     csit-vpp-perf-mrr-daily-master-3n-dnv:
@@ -750,6 +872,34 @@
         - 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:
@@ -761,6 +911,31 @@
         - 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"
@@ -2717,50 +2892,76 @@
 
 # IPSec
 
-    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-1t1c"
-      output-file-name: "ipsec-1t1c-xl710-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-XL710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and not 'VHOST'"
+      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: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-2t2c"
-      output-file-name: "ipsec-2t2c-xl710-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-XL710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and not 'VHOST'"
+      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: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-4t4c"
-      output-file-name: "ipsec-4t4c-xl710-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-XL710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and not 'VHOST'"
+      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: "3n-hsw-xl710-ip4-ipsecsw-64b-base-scale-1t1c"
-      output-file-name: "ipsecsw-1t1c-xl710-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-XL710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECSW' and not 'VHOST'"
+      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: "3n-hsw-xl710-ip4-ipsecsw-64b-base-scale-2t2c"
-      output-file-name: "ipsecsw-2t2c-xl710-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-XL710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECSW' and not 'VHOST'"
+      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: "3n-hsw-xl710-ip4-ipsecsw-64b-base-scale-4t4c"
-      output-file-name: "ipsecsw-4t4c-xl710-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-XL710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECSW' and not 'VHOST'"
+      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"
@@ -3694,6 +3895,57 @@
       - "result"
       layout: "plot-cpta"
 
+
+# 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 '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: "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 '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: "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 '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"
+
+# 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 '64B' and 'IP4FWD' and 'MRR' and '2T1C' and 'IPSECSW' and 'IPSECTUN' and 'AES_256_GCM' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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 '64B' and 'IP4FWD' and 'MRR' and '4T2C' and 'IPSECSW' and 'IPSECTUN' and 'AES_256_GCM' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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 '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 - x710
 
     - title: "3n-skx-x710-lb-64b-2t1c"
@@ -4883,28 +5135,54 @@
       - "result"
       layout: "plot-cpta"
 
-# IPSec
+# IPSec SW INT
+
+    - 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: "3n-tsh-x520-ip4-ipsecsw-64b-base-scale-1t1c"
-      output-file-name: "ipsecsw-1t1c-x520-3n-tsh"
+    - 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 '1T1C' and 'IPSECSW' and not 'VHOST'"
+      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: "3n-tsh-x520-ip4-ipsecsw-64b-base-scale-2t2c"
-      output-file-name: "ipsecsw-2t2c-x520-3n-tsh"
+    - 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 '2T2C' and 'IPSECSW' and not 'VHOST'"
+      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"
 
-    - title: "3n-tsh-x520-ip4-ipsecsw-64b-base-scale-4t4c"
-      output-file-name: "ipsecsw-4t4c-x520-3n-tsh"
+# 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 '4T4C' and 'IPSECSW' and not 'VHOST'"
+      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"
@@ -4938,132 +5216,158 @@
 ################################################################################
 # 3n-dnv
 
-# L2 - x533
+# 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-x533-l2sw-64b-base-scale-1t1c"
-      output-file-name: "l2-1t1c-x533-3n-dnv"
+    - 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-X533' 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-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-x533-l2sw-64b-base-scale-2t2c"
-      output-file-name: "l2-2t2c-x533-3n-dnv"
+    - 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-X533' 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-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-x533-l2sw-64b-base-scale-4t4c"
-      output-file-name: "l2-4t4c-x533-3n-dnv"
+    - 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-X533' 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-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 - x533
+# IPv4 Tunnels - x553
 
-    - title: "3n-dnv-x533-ip4-64b-base-scale-1t1c"
-      output-file-name: "ip4-1t1c-x533-3n-dnv"
+    - 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-X533' 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'"
+      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-x533-ip4-64b-base-scale-2t2c"
-      output-file-name: "ip4-2t2c-x533-3n-dnv"
+    - 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-X533' 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'"
+      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-x533-ip4-64b-base-scale-4t4c"
-      output-file-name: "ip4-4t4c-x533-3n-dnv"
+    - 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-X533' 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'"
+      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"
 
-# IPv4 Tunnels - x533
+# IPv6 - x553
 
-    - title: "3n-dnv-x533-ip4tun-64b-base-1t1c"
-      output-file-name: "ip4-tunnels-1t1c-x533-3n-dnv"
+    - 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-X533' 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-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-x533-ip4tun-64b-base-2t2c"
-      output-file-name: "ip4-tunnels-2t2c-x533-3n-dnv"
+    - 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-X533' 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-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-x533-ip4tun-64b-base-4t4c"
-      output-file-name: "ip4-tunnels-4t4c-x533-3n-dnv"
+    - 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-X533' 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-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"
 
-# IPv6 - x533
+# IPSec HW IPSECINT
 
-    - title: "3n-dnv-x533-ip6-78b-base-scale-1t1c"
-      output-file-name: "ip6-1t1c-x533-3n-dnv"
+    - 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-X533' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
+      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-x533-ip6-78b-base-scale-2t2c"
-      output-file-name: "ip6-2t2c-x533-3n-dnv"
+    - 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-X533' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
+      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-x533-ip6-78b-base-scale-4t4c"
-      output-file-name: "ip6-4t4c-x533-3n-dnv"
+    - 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-X533' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
+      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
+# IPSec HW IPSECTUN
 
-    - title: "3n-dnv-x533-ip4-ipsechw-64b-base-scale-1t1c"
-      output-file-name: "ipsechw-1t1c-x533-3n-dnv"
+    - 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-X533' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and not 'VHOST'"
+      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-x533-ip4-ipsechw-64b-base-scale-2t2c"
-      output-file-name: "ipsechw-2t2c-x533-3n-dnv"
+    - 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-X533' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and not 'VHOST'"
+      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-x533-ip4-ipsechw-64b-base-scale-4t4c"
-      output-file-name: "ipsechw-4t4c-x533-3n-dnv"
+    - 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-X533' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and not 'VHOST'"
+      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"
@@ -5071,80 +5375,80 @@
 ################################################################################
 # 2n-dnv
 
-# L2 - x533
+# L2 - x553
 
-    - title: "2n-dnv-x533-l2sw-64b-base-scale-1t1c"
-      output-file-name: "l2-1t1c-x533-2n-dnv"
+    - 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-X533' 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-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-x533-l2sw-64b-base-scale-2t2c"
-      output-file-name: "l2-2t2c-x533-2n-dnv"
+    - 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-X533' 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-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-x533-l2sw-64b-base-scale-4t4c"
-      output-file-name: "l2-4t4c-x533-2n-dnv"
+    - 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-X533' 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-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 - x533
+# IPv4 - x553
 
-    - title: "2n-dnv-x533-ip4-64b-base-scale-1t1c"
-      output-file-name: "ip4-1t1c-x533-2n-dnv"
+    - 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-X533' 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'"
+      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-x533-ip4-64b-base-scale-2t2c"
-      output-file-name: "ip4-2t2c-x533-2n-dnv"
+    - 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-X533' 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'"
+      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-x533-ip4-64b-base-scale-4t4c"
-      output-file-name: "ip4-4t4c-x533-2n-dnv"
+    - 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-X533' 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'"
+      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 - x533
+# IPv6 - x553
 
-    - title: "2n-dnv-x533-ip6-78b-base-scale-1t1c"
-      output-file-name: "ip6-1t1c-x533-2n-dnv"
+    - 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-X533' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
+      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-x533-ip6-78b-base-scale-2t2c"
-      output-file-name: "ip6-2t2c-x533-2n-dnv"
+    - 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-X533' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
+      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-x533-ip6-78b-base-scale-4t4c"
-      output-file-name: "ip6-4t4c-x533-2n-dnv"
+    - 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-X533' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
+      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"