X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification_CPTA.yaml;h=5a954188b053fdf17799f53dac0cd08035251b43;hp=55abc8c0a34a68b72e83cf3e582cffb2e092d0c0;hb=4e9256f1c7d46949e5aeecae2e5b8aecc72f16e9;hpb=60ad88e982229ffe48d153f2294c6d2d280d7cce

diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 55abc8c0a3..5a954188b0 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.
@@ -66,6 +66,9 @@
     "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.32.8.19": "LF-2n-CLX-27"
+    "10.32.8.21": "LF-2n-CLX-28"
+    "10.32.8.23": "LF-2n-CLX-29"
     "10.30.51.16": "LF-3n-HSW-01"
     "10.30.51.20": "LF-3n-HSW-02"
     "10.30.51.24": "LF-3n-HSW-03"
@@ -123,15 +126,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,37 +191,9 @@
     # 3n-hsw
     plot-performance-trending-all-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 700
+        start: 890  # 800
         end: "lastCompletedBuild"
         skip:
-          - 726
-          - 749
-          - 750
-          - 751
-          - 752
-          - 753
-          - 754
-          - 755
-          - 756
-          - 757
-          - 758
-          - 760
-          - 781
-          - 782
-          - 783
-          - 784
-          - 786
-          - 787
-          - 788
-          - 789
-          - 791 #
-          - 792 #
-          - 793
-          - 795
-          - 796
-          - 797
-          - 798
-          - 799
           - 801 #
           - 802 #
           - 804 #
@@ -224,43 +203,38 @@
           - 808 #
           - 810 #
           - 815
+          - 818
+          - 819
+          - 820
+          - 831
+          - 832
+          - 852
+          - 855
+          - 856
+          - 860
+          - 867
+          - 891
+          - 892
+          - 893
+          - 899
+          - 900
+          - 901
+          - 902
+          - 903
+          - 904
       csit-dpdk-perf-mrr-weekly-master:
-        start: 73
+        start: 83
         end: "lastCompletedBuild"
+        skip:
+          - 87
+          - 89
+          - 90
 
     plot-performance-trending-vpp-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 700
+        start: 890  # 800
         end: "lastCompletedBuild"
         skip:
-          - 726
-          - 749
-          - 750
-          - 751
-          - 752
-          - 753
-          - 754
-          - 755
-          - 756
-          - 757
-          - 758
-          - 760
-          - 781
-          - 782
-          - 783
-          - 784
-          - 786
-          - 787
-          - 788
-          - 789
-          - 791 #
-          - 792 #
-          - 793
-          - 795
-          - 796
-          - 797
-          - 798
-          - 799
           - 801 #
           - 802 #
           - 804 #
@@ -270,48 +244,41 @@
           - 808 #
           - 810 #
           - 815
+          - 818
+          - 819
+          - 820
+          - 831
+          - 832
+          - 852
+          - 855
+          - 856
+          - 860
+          - 867
+          - 891
+          - 892
+          - 893
+          - 899
+          - 900
+          - 901
+          - 902
+          - 903
+          - 904
 
     plot-performance-trending-dpdk-3n-hsw:
       csit-dpdk-perf-mrr-weekly-master:
-        start: 73
+        start: 83
         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: 635  # 550
         end: "lastCompletedBuild"
         skip:
-          - 480
-          - 481
-          - 499
-          - 500
-          - 501
-          - 502
-          - 503
-          - 504
-          - 505
-          - 506
-          - 507
-          - 508
-          - 510
-          - 511
-          - 531
-          - 532
-          - 533
-          - 534
-          - 536
-          - 537
-          - 538
-          - 539
-          - 541 #
-          - 542 #
-          - 544 #
-          - 545
-          - 546
-          - 547
-          - 548
-          - 549
           - 551 #
           - 552 #
           - 554 #
@@ -321,45 +288,42 @@
           - 558 #
           - 560 #
           - 562 #
+          - 565
+          - 568
+          - 569
+          - 570
+          - 582
+          - 584
+          - 585
+          - 586
+          - 588
+          - 600
+          - 601
+          - 603
+          - 604
+          - 612
+          - 633
+          - 634
+          - 641
+          - 642
+          - 643
+          - 644
+          - 645
+          - 646
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
-        start: 38
+        start: 48
         end: "lastCompletedBuild"
+        skip:
+          - 52
+          - 54
+          - 55
+          - 56
 
     plot-performance-trending-vpp-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 450
+        start: 635  # 550
         end: "lastCompletedBuild"
         skip:
-          - 480
-          - 481
-          - 499
-          - 500
-          - 501
-          - 502
-          - 503
-          - 504
-          - 505
-          - 506
-          - 507
-          - 508
-          - 510
-          - 511
-          - 531
-          - 532
-          - 533
-          - 534
-          - 536
-          - 537
-          - 538
-          - 539
-          - 541 #
-          - 542 #
-          - 544 #
-          - 545
-          - 546
-          - 547
-          - 548
-          - 549
           - 551 #
           - 552 #
           - 554 #
@@ -369,98 +333,124 @@
           - 558 #
           - 560 #
           - 562 #
+          - 565
+          - 568
+          - 569
+          - 570
+          - 582
+          - 584
+          - 585
+          - 586
+          - 588
+          - 600
+          - 601
+          - 603
+          - 604
+          - 612
+          - 633
+          - 634
+          - 641
+          - 642
+          - 643
+          - 644
+          - 645
+          - 646
 
     plot-performance-trending-dpdk-3n-skx:
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
-        start: 38
+        start: 48
         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: 635  # 551
         end: "lastCompletedBuild"
         skip:
-          - 477
-          - 500
-          - 501
-          - 502
-          - 503
-          - 504
-          - 505
-          - 506
-          - 507
-          - 508
-          - 509
-          - 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
+          - 645
+          - 646
+          - 653
+          - 654
+          - 655
+          - 656
+          - 657
+          - 658
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 37
+        start: 48
         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: 635  # 551
         end: "lastCompletedBuild"
         skip:
-          - 477
-          - 500
-          - 501
-          - 502
-          - 503
-          - 504
-          - 505
-          - 506
-          - 507
-          - 508
-          - 509
-          - 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
+          - 645
+          - 646
+          - 653
+          - 654
+          - 655
+          - 656
+          - 657
+          - 658
 
     plot-performance-trending-dpdk-2n-skx:
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 37
+        start: 48
         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: 22
         end: "lastCompletedBuild"
         skip:
           - 21
+          - 29
 
     # 3n-tsh
     plot-performance-trending-all-3n-tsh:
       csit-vpp-perf-mrr-daily-master-3n-tsh:
-        start: 55
+        start: 80  # 55
         end: "lastCompletedBuild"
         skip:
           - 61
@@ -468,10 +458,18 @@
           - 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
+        start: 80  # 55
         end: "lastCompletedBuild"
         skip:
           - 61
@@ -479,10 +477,18 @@
           - 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
+        start: 120  # 36
         end: "lastCompletedBuild"
         skip:
           - 46
@@ -493,10 +499,56 @@
           - 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
+          - 110
+          - 111
+          - 112
+          - 113
+          - 114
+          - 115
+          - 116
+          - 117
+          - 118
+          - 119
+          - 120
+          - 121
+          - 128
+          - 129
+          - 130
+          - 131
+          - 132
+          - 133
 
     plot-performance-trending-vpp-2n-dnv:
       csit-vpp-perf-mrr-daily-master-2n-dnv:
-        start: 41
+        start: 120  # 36
         end: "lastCompletedBuild"
         skip:
           - 46
@@ -504,6 +556,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 +649,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,43 +668,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: 890  # 800
       end: "lastCompletedBuild"
       skip:
-        - 726
-        - 749
-        - 750
-        - 751
-        - 752
-        - 753
-        - 754
-        - 755
-        - 756
-        - 757
-        - 758
-        - 760
-        - 781
-        - 782
-        - 783
-        - 784
-        - 786
-        - 787
-        - 788
-        - 789
-        - 791 #
-        - 792 #
-        - 793
-        - 795
-        - 796
-        - 797
-        - 798
-        - 799
         - 801 #
         - 802 #
         - 804 #
@@ -635,45 +691,38 @@
         - 808 #
         - 810 #
         - 815
+        - 818
+        - 819
+        - 820
+        - 831
+        - 832
+        - 852
+        - 855
+        - 856
+        - 860
+        - 867
+        - 891
+        - 892
+        - 893
+        - 899
+        - 900
+        - 901
+        - 902
+        - 903
+        - 904
     csit-dpdk-perf-mrr-weekly-master:
-      start: 73
+      start: 83
       end: "lastCompletedBuild"
+      skip:
+        - 87
+        - 89
+        - 90
 
     # 3n-skx
     csit-vpp-perf-mrr-daily-master-3n-skx:
-      start: 450
+      start: 635  # 550
       end: "lastCompletedBuild"
       skip:
-        - 480
-        - 481
-        - 499
-        - 500
-        - 501
-        - 502
-        - 503
-        - 504
-        - 505
-        - 506
-        - 507
-        - 508
-        - 510
-        - 511
-        - 531
-        - 532
-        - 533
-        - 534
-        - 536
-        - 537
-        - 538
-        - 539
-        - 541 #
-        - 542 #
-        - 544 #
-        - 545
-        - 546
-        - 547
-        - 548
-        - 549
         - 551 #
         - 552 #
         - 554 #
@@ -683,63 +732,100 @@
         - 558 #
         - 560 #
         - 562 #
+        - 565
+        - 568
+        - 569
+        - 570
+        - 582
+        - 584
+        - 585
+        - 586
+        - 588
+        - 600
+        - 601
+        - 603
+        - 604
+        - 612
+        - 633
+        - 634
+        - 641
+        - 642
+        - 643
+        - 644
+        - 645
+        - 646
     csit-dpdk-perf-mrr-weekly-master-3n-skx:
-      start: 38
+      start: 48
       end: "lastCompletedBuild"
+      skip:
+        - 52
+        - 54
+        - 55
+        - 56
 
     # 2n-skx
     csit-vpp-perf-mrr-daily-master-2n-skx:
-      start: 450
+      start: 635  # 551
       end: "lastCompletedBuild"
       skip:
-        - 477
-        - 500
-        - 501
-        - 502
-        - 503
-        - 504
-        - 505
-        - 506
-        - 507
-        - 508
-        - 509
-        - 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
+        - 645
+        - 646
+        - 653
+        - 654
+        - 655
+        - 656
+        - 657
+        - 658
     csit-vpp-perf-mrr-weekly-master-2n-skx:
-      start: 16
+      start: 22
       end: "lastCompletedBuild"
       skip:
         - 21
+        - 29
     csit-dpdk-perf-mrr-weekly-master-2n-skx:
-      start: 37
+      start: 48
       end: "lastCompletedBuild"
       skip:
-        - 39
+        - 52
+        - 54
+        - 55
+        - 56
 
     # 3n-tsh
     csit-vpp-perf-mrr-daily-master-3n-tsh:
-      start: 55
+      start: 80  # 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
+      start: 120  # 36
       end: "lastCompletedBuild"
       skip:
         - 46
@@ -750,10 +836,56 @@
         - 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
+        - 110
+        - 111
+        - 112
+        - 113
+        - 114
+        - 115
+        - 116
+        - 117
+        - 118
+        - 119
+        - 120
+        - 121
+        - 128
+        - 129
+        - 130
+        - 131
+        - 132
+        - 133
 
     # 2n-dnv
     csit-vpp-perf-mrr-daily-master-2n-dnv:
-      start: 41
+      start: 120  # 36
       end: "lastCompletedBuild"
       skip:
         - 46
@@ -761,6 +893,49 @@
         - 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
+        - 109
+        - 110
+        - 111
+        - 112
+        - 113
+        - 114
+        - 115
+        - 116
+        - 117
+        - 118
+        - 119
+        - 120
+        - 127
+        - 128
+        - 129
+        - 130
+        - 131
+        - 132
 
 -
   type: "output"
@@ -2745,7 +2920,7 @@
     - 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-X710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECSW' and 'IPSECINT' 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"
@@ -2753,7 +2928,7 @@
     - 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-X710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECSW' and 'IPSECINT' 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"
@@ -2761,7 +2936,7 @@
     - 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-X710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECSW' and 'IPSECINT' 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"
@@ -2770,7 +2945,7 @@
     - 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-X710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECSW' and 'IPSECTUN' 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"
@@ -2778,7 +2953,7 @@
     - 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-X710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECSW' and 'IPSECTUN' 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"
@@ -2786,7 +2961,7 @@
     - 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-X710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECSW' and 'IPSECTUN' 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"
@@ -3725,7 +3900,7 @@
     - 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 not 'VHOST'"
+      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"
@@ -3733,7 +3908,7 @@
     - 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 not 'VHOST'"
+      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"
@@ -3741,7 +3916,7 @@
     - 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 not 'VHOST'"
+      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"
@@ -3750,7 +3925,7 @@
     - 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 not 'VHOST'"
+      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"
@@ -3758,7 +3933,7 @@
     - 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 not 'VHOST'"
+      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"
@@ -3766,7 +3941,7 @@
     - 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 not 'VHOST'"
+      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"
@@ -4960,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-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: "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-64b-base-scale-1t1c"
-      output-file-name: "ipsecsw-1t1c-x520-3n-tsh"
+    - 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 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-64b-base-scale-2t2c"
-      output-file-name: "ipsecsw-2t2c-x520-3n-tsh"
+    - 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 not 'VHOST'"
+      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-64b-base-scale-4t4c"
-      output-file-name: "ipsecsw-4t4c-x520-3n-tsh"
+    - 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 not 'VHOST'"
+      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"
@@ -5124,7 +5325,7 @@
     - 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 not 'VHOST'"
+      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"
@@ -5132,7 +5333,7 @@
     - 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 not 'VHOST'"
+      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"
@@ -5140,7 +5341,7 @@
     - 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 not 'VHOST'"
+      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"
@@ -5150,7 +5351,7 @@
     - 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 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"
@@ -5158,7 +5359,7 @@
     - 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 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"
@@ -5166,7 +5367,7 @@
     - 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 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"