X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=9e1ab198aa0f98dabe143fab9523225ed0098fb7;hb=faf579e9471ee8bd4e9c20beb40ed526d276b59c;hp=552d624c47490c262173ea5b15172dfd1ff8e3f8;hpb=d0f1e8778dac3549a1f1e403541de9f3ee88ec8d;p=csit.git

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 552d624c47..9e1ab198aa 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -199,20 +199,20 @@
 
     plot-dpdk-throughput-latency-3n-hsw:
       csit-dpdk-perf-report-iterative-2005-3n-hsw:
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
+        - 30  # NDRPDR iter
+        - 31  # NDRPDR iter
+        - 32  # NDRPDR iter
+        - 33  # NDRPDR iter
+        - 34  # NDRPDR iter
 
     plot-dpdk-hdrh-lat-3n-hsw:
       csit-dpdk-perf-report-iterative-2005-3n-hsw:
-        - 5   # NDRPDR sel
+        - 25  # NDRPDR iter
 
     # 3n-skx
 
@@ -242,20 +242,20 @@
 
     plot-dpdk-throughput-latency-3n-skx:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
+        - 30  # NDRPDR iter
+        - 31  # NDRPDR iter
+        - 32  # NDRPDR iter
+        - 33  # NDRPDR iter
+        - 34  # NDRPDR iter
+        - 35  # NDRPDR iter
+        - 36  # NDRPDR iter
+        - 37  # NDRPDR iter
 
     plot-dpdk-hdrh-lat-3n-skx:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
+        - 28  # NDRPDR iter
 
     # 2n-skx
 
@@ -292,33 +292,31 @@
 
     plot-vpp-nfv-reconf-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 48  # Reconf
-        - 50  # Reconf
-        - 51  # Reconf
-        - 52  # Reconf
-        - 53  # Reconf
-        - 60  # Reconf
-        - 70  # Reconf
-        - 71  # Reconf
-        - 63  # Reconf
-        - 66  # Reconf
+        - 106 # Reconf env 4
+        - 107 # Reconf env 4
+        - 108 # Reconf env 4
+        - 109 # Reconf env 4
+        - 110 # Reconf env 4
+        - 111 # Reconf env 4
+        - 112 # Reconf env 4
+        - 118 # Reconf env 4
 
     plot-dpdk-throughput-latency-2n-skx:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
+        - 20  # NDRPDR iter
+        - 21  # NDRPDR iter
+        - 22  # NDRPDR iter
+        - 23  # NDRPDR iter
+        - 24  # NDRPDR iter
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
 
     plot-dpdk-hdrh-lat-2n-skx:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
-        - 1   # NDRPDR sel
+        - 20  # NDRPDR iter
 
     # 2n-clx
 
@@ -337,11 +335,6 @@
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 70  # NDRPDR sel env 4
 
-#    plot-vpp-http-server-performance:
-#      # csit-vpp-perf-report-iterative-2005-2n-clx:
-#      csit-vpp-perf-verify-2001-2n-clx:
-#        - 80  # TCP
-
     plot-vpp-nfv-2n-clx-ndrpdr:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 7   # NDRPDR sel
@@ -361,16 +354,16 @@
 
     plot-vpp-nfv-reconf-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 42  # Reconf
-        - 45  # Reconf
-        - 46  # Reconf
-        - 47  # Reconf
-        - 48  # Reconf
-        - 52  # Reconf
-        - 53  # Reconf
-        - 54  # Reconf
-        - 55  # Reconf
-        - 56  # Reconf
+        - 81  # Reconf env 4
+        - 82  # Reconf env 4
+        - 83  # Reconf env 4
+        - 84  # Reconf env 4
+        - 85  # Reconf env 4
+        - 86  # Reconf env 4
+        - 87  # Reconf env 4
+        - 88  # Reconf env 4
+        - 89  # Reconf env 4
+        - 90  # Reconf env 4
 
     plot-vpp-soak-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
@@ -379,20 +372,20 @@
 
     plot-dpdk-throughput-latency-2n-clx:
       csit-dpdk-perf-report-iterative-2005-2n-clx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
+        - 20  # NDRPDR iter
+        - 21  # NDRPDR iter
+        - 22  # NDRPDR iter
+        - 23  # NDRPDR iter
+        - 24  # NDRPDR iter
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
 
     plot-dpdk-hdrh-lat-2n-clx:
       csit-dpdk-perf-report-iterative-2005-2n-clx:
-        - 1   # NDRPDR sel
+        - 21  # NDRPDR iter
 
     # 3n-tsh
 
@@ -400,6 +393,7 @@
       csit-vpp-perf-report-iterative-2005-3n-tsh:
         - 23  # NDRPDR sel env 4
         - 25  # NDRPDR sel env 4
+        - 33  # NDRPDR sel env 4
 
     plot-vpp-hdrh-lat-3n-tsh:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
@@ -503,45 +497,42 @@
     # Results
 
     vpp-perf-results-3n-hsw:
-      csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 29  # NDRPDR sel env 4
-#      csit-vpp-perf-report-coverage-2005-3n-hsw:
-#        - 1   # perf-full-3n-dnv-crypto_I
-#        - 7   # perf-full-3n-hsw-crypto_II
-#        - 3   # perf-full-3n-hsw-crypto_III
-#        - 4   # perf-full-3n-dnv-crypto_IV
-#        - 5   # perf-full-3n-hsw-ip4_I
-#        - 6   # perf-full-3n-hsw-ip4_II
-#        - 8   # perf-full-3n-hsw-ip4_III
-#        - 9   # perf-full-3n-hsw-ip4_IV
-#        - 10  # perf-full-3n-hsw-ip4_V
-#        - 26  # perf-full-3n-hsw-ip4_VI
-#        - 18  # perf-full-3n-hsw-ip4_VII
-#        - 27  # perf-full-3n-hsw-ip4_VIII
-#        - 28  # perf-full-3n-hsw-ip4_IX
-#        - 29  # perf-full-3n-hsw-ip6_I
-#        - 35  # perf-full-3n-hsw-ip6_II
-#        - 42  # perf-full-3n-hsw-l2_I
-#        - 33  # perf-full-3n-hsw-l2_II
-#        - 37  # perf-full-3n-hsw-l2_III
-#        - 45  # perf-full-3n-hsw-l2_IV
-#        - 43  # perf-full-3n-hsw-l2_V
-#        - 40  # perf-full-3n-hsw-l2_VI
-#        - 44  # perf-full-3n-hsw-l2_VII
-#        - 51  # perf-full-3n-hsw-l2_VIII
-#        - 50  # perf-full-3n-hsw-l2_IX
-#        - 52  # perf-full-3n-hsw-l2_X
-#        - 53  # perf-full-3n-hsw-l2_XI
-#        - 54  # perf-full-3n-hsw-memif
-#        - 55  # perf-full-3n-hsw-ip4tunnels-I
-#        - 56  # perf-full-3n-hsw-ip4tunnels-II
-#        - 57  # perf-full-3n-hsw-ip4tunnels-III
-#        - 58  # perf-full-3n-hsw-ip6tunnels-I
-#        - 59  # perf-full-3n-hsw-srv6-I
-#        - 60  # perf-full-3n-hsw-srv6-II
-#        - 61  # perf-full-3n-hsw-vhost-I
-#        - 62  # perf-full-3n-hsw-vhost-II
-#        - 63  # perf-full-3n-hsw-vhost-III
+      csit-vpp-perf-report-coverage-2005-3n-hsw:
+        - 74  # crypto-00
+        - 75  # crypto-01
+        - 76  # crypto-02
+        - 77  # crypto-03
+        - 78  # ip4-00
+        - 79  # ip4-01
+        - 80  # ip4-02
+        - 81  # ip4-03
+        - 73  # ip4-04
+        - 82  # ip4-05
+        - 83  # ip4-06
+        - 84  # ip4-07
+        - 85  # ip4-08
+        - 86  # ip4tun-00
+        - 87  # ip4tun-01
+        - 88  # ip4tun-02
+        - 89  # ip6-00
+        - 90  # ip6-01
+        - 91  # ip6tun-00
+        - 92  # l2-00
+        - 93  # l2-01
+        - 94  # l2-02
+        - 95  # l2-03
+        - 96  # l2-04
+        - 97  # l2-05
+        - 98  # l2-06
+        - 99  # l2-07
+        - 100 # l2-08
+        - 101 # l2-09
+        - 102 # l2-10
+        - 103 # memif-00
+        - 104 # srv6-00
+        - 105 # srv6-01
+        - 106 # vhost-00
+        - 107 # vhost-01
 
     vpp-perf-results-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
@@ -678,19 +669,19 @@
 
     dpdk-perf-results-3n-hsw:
       csit-dpdk-perf-report-iterative-2005-3n-hsw:
-        - 5   # NDRPDR sel
+        - 25  # NDRPDR iter
 
     dpdk-perf-results-3n-skx:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
+        - 28  # NDRPDR iter
 
     dpdk-perf-results-2n-skx:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
-        - 1   # NDRPDR sel
+        - 20  # NDRPDR iter
 
     dpdk-perf-results-2n-clx:
       csit-dpdk-perf-report-iterative-2005-2n-clx:
-        - 1   # NDRPDR sel
+        - 21  # NDRPDR iter
 
     dpdk-perf-results-2n-dnv:
       csit-dpdk-perf-report-iterative-2005-2n-dnv:
@@ -1036,6 +1027,7 @@
       csit-vpp-perf-report-iterative-2005-3n-tsh:
         - 23  # NDRPDR sel env 4
         - 25  # NDRPDR sel env 4
+        - 33  # NDRPDR sel env 4
     vpp-performance-changes-3n-tsh-cmp-2001.0-4:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
         - 28  # NDRPDR sel 2001.0-4
@@ -1232,16 +1224,16 @@
         - 24  # NDRPDR sel
     dpdk-performance-changes-3n-hsw-cmp:
       csit-dpdk-perf-report-iterative-2005-3n-hsw:
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
+        - 30  # NDRPDR iter
+        - 31  # NDRPDR iter
+        - 32  # NDRPDR iter
+        - 33  # NDRPDR iter
+        - 34  # NDRPDR iter
 
     dpdk-performance-changes-3n-skx-h1:
       csit-dpdk-perf-verify-1908-3n-skx:
@@ -1279,16 +1271,16 @@
         - 48  # NDRPDR sel x710
     dpdk-performance-changes-3n-skx-cmp:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
+        - 30  # NDRPDR iter
+        - 31  # NDRPDR iter
+        - 32  # NDRPDR iter
+        - 33  # NDRPDR iter
+        - 34  # NDRPDR iter
+        - 35  # NDRPDR iter
+        - 36  # NDRPDR iter
+        - 37  # NDRPDR iter
 
     dpdk-performance-changes-2n-skx-h1:
       csit-dpdk-perf-verify-1908-2n-skx:
@@ -1326,16 +1318,16 @@
         - 54  # NDRPDR sel x710
     dpdk-performance-changes-2n-skx-cmp:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
+        - 20  # NDRPDR iter
+        - 21  # NDRPDR iter
+        - 22  # NDRPDR iter
+        - 23  # NDRPDR iter
+        - 24  # NDRPDR iter
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
 
     dpdk-performance-changes-2n-clx-ref:
       csit-dpdk-perf-verify-2001-2n-clx:
@@ -1361,16 +1353,16 @@
         - 34  # NDRPDR sel
     dpdk-performance-changes-2n-clx-cmp:
       csit-dpdk-perf-report-iterative-2005-2n-clx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
+        - 20  # NDRPDR iter
+        - 21  # NDRPDR iter
+        - 22  # NDRPDR iter
+        - 23  # NDRPDR iter
+        - 24  # NDRPDR iter
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
 
     dpdk-performance-changes-2n-dnv-ref:
       csit-dpdk-perf-verify-2001-2n-dnv:
@@ -1526,53 +1518,53 @@
 
     dpdk-compare-testbeds-ref:
       csit-dpdk-perf-report-iterative-2005-3n-hsw:
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
+        - 30  # NDRPDR iter
+        - 31  # NDRPDR iter
+        - 32  # NDRPDR iter
+        - 33  # NDRPDR iter
+        - 34  # NDRPDR iter
     dpdk-compare-testbeds-cmp:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
+        - 30  # NDRPDR iter
+        - 31  # NDRPDR iter
+        - 32  # NDRPDR iter
+        - 33  # NDRPDR iter
+        - 34  # NDRPDR iter
+        - 35  # NDRPDR iter
+        - 36  # NDRPDR iter
+        - 37  # NDRPDR iter
 
     dpdk-compare-testbeds-skx-clx-ref:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
+        - 20  # NDRPDR iter
+        - 21  # NDRPDR iter
+        - 22  # NDRPDR iter
+        - 23  # NDRPDR iter
+        - 24  # NDRPDR iter
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
     dpdk-compare-testbeds-skx-clx-cmp:
       csit-dpdk-perf-report-iterative-2005-2n-clx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
+        - 20  # NDRPDR iter
+        - 21  # NDRPDR iter
+        - 22  # NDRPDR iter
+        - 23  # NDRPDR iter
+        - 24  # NDRPDR iter
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
 
     # Compare topologies
 
@@ -1602,28 +1594,28 @@
 
     dpdk-compare-topologies-ref:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
+        - 30  # NDRPDR iter
+        - 31  # NDRPDR iter
+        - 32  # NDRPDR iter
+        - 33  # NDRPDR iter
+        - 34  # NDRPDR iter
+        - 35  # NDRPDR iter
+        - 36  # NDRPDR iter
+        - 37  # NDRPDR iter
     dpdk-compare-topologies-cmp:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
+        - 20  # NDRPDR iter
+        - 21  # NDRPDR iter
+        - 22  # NDRPDR iter
+        - 23  # NDRPDR iter
+        - 24  # NDRPDR iter
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
 
   plot-layouts:
 
@@ -2229,42 +2221,41 @@
       - 12  # hoststack
       - 13  # hoststack
     csit-vpp-perf-report-coverage-2005-3n-hsw:
-#      - 1   # perf-full-3n-dnv-crypto_I
-#      - 7   # perf-full-3n-hsw-crypto_II
-#      - 3   # perf-full-3n-hsw-crypto_III
-#      - 4   # perf-full-3n-dnv-crypto_IV
-#      - 5   # perf-full-3n-hsw-ip4_I
-#      - 6   # perf-full-3n-hsw-ip4_II
-#      - 8   # perf-full-3n-hsw-ip4_III
-#      - 9   # perf-full-3n-hsw-ip4_IV
-#      - 10  # perf-full-3n-hsw-ip4_V
-#      - 26  # perf-full-3n-hsw-ip4_VI
-#      - 18  # perf-full-3n-hsw-ip4_VII
-#      - 27  # perf-full-3n-hsw-ip4_VIII
-#      - 28  # perf-full-3n-hsw-ip4_IX
-#      - 29  # perf-full-3n-hsw-ip6_I
-#      - 35  # perf-full-3n-hsw-ip6_II
-#      - 42  # perf-full-3n-hsw-l2_I
-#      - 33  # perf-full-3n-hsw-l2_II
-#      - 37  # perf-full-3n-hsw-l2_III
-#      - 45  # perf-full-3n-hsw-l2_IV
-#      - 43  # perf-full-3n-hsw-l2_V
-#      - 40  # perf-full-3n-hsw-l2_VI
-#      - 44  # perf-full-3n-hsw-l2_VII
-#      - 51  # perf-full-3n-hsw-l2_VIII
-#      - 50  # perf-full-3n-hsw-l2_IX
-#      - 52  # perf-full-3n-hsw-l2_X
-#      - 53  # perf-full-3n-hsw-l2_XI
-#      - 54  # perf-full-3n-hsw-memif
-#      - 55  # perf-full-3n-hsw-ip4tunnels-I
-#      - 56  # perf-full-3n-hsw-ip4tunnels-II
-#      - 57  # perf-full-3n-hsw-ip4tunnels-III
-#      - 58  # perf-full-3n-hsw-ip6tunnels-I
-#      - 59  # perf-full-3n-hsw-srv6-I
-#      - 60  # perf-full-3n-hsw-srv6-II
-#      - 61  # perf-full-3n-hsw-vhost-I
-#      - 62  # perf-full-3n-hsw-vhost-II
-#      - 63  # perf-full-3n-hsw-vhost-III
+      - 74  # crypto-00
+      - 75  # crypto-01
+      - 76  # crypto-02
+      - 77  # crypto-03
+      - 78  # ip4-00
+      - 79  # ip4-01
+      - 80  # ip4-02
+      - 81  # ip4-03
+      - 73  # ip4-04
+      - 82  # ip4-05
+      - 83  # ip4-06
+      - 84  # ip4-07
+      - 85  # ip4-08
+      - 86  # ip4tun-00
+      - 87  # ip4tun-01
+      - 88  # ip4tun-02
+      - 89  # ip6-00
+      - 90  # ip6-01
+      - 91  # ip6tun-00
+      - 92  # l2-00
+      - 93  # l2-01
+      - 94  # l2-02
+      - 95  # l2-03
+      - 96  # l2-04
+      - 97  # l2-05
+      - 98  # l2-06
+      - 99  # l2-07
+      - 100 # l2-08
+      - 101 # l2-09
+      - 102 # l2-10
+      - 103 # memif-00
+      - 104 # srv6-00
+      - 105 # srv6-01
+      - 106 # vhost-00
+      - 107 # vhost-01
 
     csit-vpp-perf-verify-1908_1-3n-skx:
       - 26  # NDRPDR sel - new1908.1
@@ -2393,16 +2384,14 @@
       - 105 # NDRPDR sel 2001.0-4
       - 42  # MRR sel
       - 99  # MRR sel env 4
-      - 48  # Reconf
-      - 50  # Reconf
-      - 51  # Reconf
-      - 52  # Reconf
-      - 53  # Reconf
-      - 60  # Reconf
-      - 70  # Reconf
-      - 71  # Reconf
-      - 63  # Reconf
-      - 66  # Reconf
+      - 106 # Reconf env 4
+      - 107 # Reconf env 4
+      - 108 # Reconf env 4
+      - 109 # Reconf env 4
+      - 110 # Reconf env 4
+      - 111 # Reconf env 4
+      - 112 # Reconf env 4
+      - 118 # Reconf env 4
       - 49  # Soak
       - 54  # Soak
       - 78  # nf-density-sel
@@ -2471,16 +2460,16 @@
       - 80  # NDRPDR sel 2001.0-4
       - 12  # MRR
       - 72  # MRR env 4
-      - 42  # Reconf
-      - 45  # Reconf
-      - 46  # Reconf
-      - 47  # Reconf
-      - 48  # Reconf
-      - 52  # Reconf
-      - 53  # Reconf
-      - 54  # Reconf
-      - 55  # Reconf
-      - 56  # Reconf
+      - 81  # Reconf env 4
+      - 82  # Reconf env 4
+      - 83  # Reconf env 4
+      - 84  # Reconf env 4
+      - 85  # Reconf env 4
+      - 86  # Reconf env 4
+      - 87  # Reconf env 4
+      - 88  # Reconf env 4
+      - 89  # Reconf env 4
+      - 90  # Reconf env 4
       - 44  # Soak
       - 49  # Soak
       - 57  # 2n-clx nfv-density-00
@@ -2538,6 +2527,7 @@
       - 21  # NDRPDR sel
       - 23  # NDRPDR sel env 4
       - 25  # NDRPDR sel env 4
+      - 33  # NDRPDR sel env 4
       - 28  # NDRPDR sel 2001.0-4
       - 29  # NDRPDR sel 2001.0-4
       - 31  # NDRPDR sel 2001.0-4
@@ -2668,16 +2658,16 @@
       - 23  # NDRPDR sel
       - 24  # NDRPDR sel
     csit-dpdk-perf-report-iterative-2005-3n-hsw:
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
+      - 25  # NDRPDR iter
+      - 26  # NDRPDR iter
+      - 27  # NDRPDR iter
+      - 28  # NDRPDR iter
+      - 29  # NDRPDR iter
+      - 30  # NDRPDR iter
+      - 31  # NDRPDR iter
+      - 32  # NDRPDR iter
+      - 33  # NDRPDR iter
+      - 34  # NDRPDR iter
 
     csit-dpdk-perf-verify-1908-3n-skx:
       - 3   # NDRPDR sel
@@ -2712,16 +2702,16 @@
       - 47  # NDRPDR sel x710
       - 48  # NDRPDR sel x710
     csit-dpdk-perf-report-iterative-2005-3n-skx:
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
+      - 28  # NDRPDR iter
+      - 29  # NDRPDR iter
+      - 30  # NDRPDR iter
+      - 31  # NDRPDR iter
+      - 32  # NDRPDR iter
+      - 33  # NDRPDR iter
+      - 34  # NDRPDR iter
+      - 35  # NDRPDR iter
+      - 36  # NDRPDR iter
+      - 37  # NDRPDR iter
 
     csit-dpdk-perf-verify-1908-2n-skx:
       - 2   # NDRPDR sel
@@ -2756,16 +2746,16 @@
       - 51  # NDRPDR sel x710
       - 54  # NDRPDR sel x710
     csit-dpdk-perf-report-iterative-2005-2n-skx:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
+      - 20  # NDRPDR iter
+      - 21  # NDRPDR iter
+      - 22  # NDRPDR iter
+      - 23  # NDRPDR iter
+      - 24  # NDRPDR iter
+      - 25  # NDRPDR iter
+      - 26  # NDRPDR iter
+      - 27  # NDRPDR iter
+      - 28  # NDRPDR iter
+      - 29  # NDRPDR iter
 
     csit-dpdk-perf-verify-2001-2n-clx:
       - 15  # NDRPDR sel
@@ -2789,16 +2779,16 @@
       - 33  # NDRPDR sel
       - 34  # NDRPDR sel
     csit-dpdk-perf-report-iterative-2005-2n-clx:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
+      - 20  # NDRPDR iter
+      - 21  # NDRPDR iter
+      - 22  # NDRPDR iter
+      - 23  # NDRPDR iter
+      - 24  # NDRPDR iter
+      - 25  # NDRPDR iter
+      - 26  # NDRPDR iter
+      - 27  # NDRPDR iter
+      - 28  # NDRPDR iter
+      - 29  # NDRPDR iter
 
     csit-dpdk-perf-verify-2001-2n-dnv:
       - 9   # NDRPDR sel
@@ -3260,11 +3250,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-hsw-1t1c-pdr-rca1.yaml"
+      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-3n-hsw-1t1c-pdr-rca2.yaml"
+      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-hsw with xl710.'
@@ -3293,11 +3283,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-hsw-2t2c-pdr-rca1.yaml"
+      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-3n-hsw-2t2c-pdr-rca2.yaml"
+      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-hsw with xl710.'
@@ -3326,11 +3316,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-hsw-1t1c-ndr-rca2.yaml"
+      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-3n-hsw-1t1c-ndr-rca3.yaml"
+      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-hsw with xl710.'
@@ -3338,8 +3328,6 @@
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
     - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-#    - 'RCA1:                 Root cause analysis reference for 2001.0-4 vs 2001.0-2.'
-#    - 'RCA2:                 Root cause analysis reference for 2005.0-4 vs 2001.0-4.'
 
 # VPP Performance Changes 3n-hsw 2t2c ndr
 - type: "table"
@@ -3361,11 +3349,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-hsw-2t2c-ndr-rca1.yaml"
+      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-3n-hsw-2t2c-ndr-rca2.yaml"
+      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-hsw with xl710.'
@@ -3396,15 +3384,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 4
       compare: 5
-      rca-file: "rca/rca-2005-3n-hsw-1t1c-pdr-rca1.yaml"
+      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-hsw-1t1c-pdr-rca2.yaml"
+      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 5
-      rca-file: "rca/rca-2005-3n-hsw-1t1c-pdr-rca3.yaml"
+      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-hsw with xl710.'
@@ -3436,15 +3424,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 4
       compare: 5
-      rca-file: "rca/rca-2005-3n-hsw-2t2c-pdr-rca1.yaml"
+      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-hsw-2t2c-pdr-rca2.yaml"
+      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 5
-      rca-file: "rca/rca-2005-3n-hsw-2t2c-pdr-rca3.yaml"
+      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-hsw with xl710.'
@@ -3476,15 +3464,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 4
       compare: 5
-      rca-file: "rca/rca-2005-3n-hsw-1t1c-ndr-rca1.yaml"
+      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-hsw-1t1c-ndr-rca2.yaml"
+      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 5
-      rca-file: "rca/rca-2005-3n-hsw-1t1c-ndr-rca3.yaml"
+      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-hsw with xl710.'
@@ -3516,15 +3504,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 4
       compare: 5
-      rca-file: "rca/rca-2005-3n-hsw-2t2c-ndr-rca1.yaml"
+      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-hsw-2t2c-ndr-rca2.yaml"
+      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 5
-      rca-file: "rca/rca-2005-3n-hsw-2t2c-ndr-rca3.yaml"
+      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-hsw with xl710.'
@@ -3554,11 +3542,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-skx-2t1c-pdr-rca1.yaml"
+      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-3n-skx-2t1c-pdr-rca2.yaml"
+      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
@@ -3587,11 +3575,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-skx-4t2c-pdr-rca1.yaml"
+      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-3n-skx-4t2c-pdr-rca2.yaml"
+      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
@@ -3620,11 +3608,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-skx-2t1c-ndr-rca1.yaml"
+      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-3n-skx-2t1c-ndr-rca2.yaml"
+      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
@@ -3653,11 +3641,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-skx-4t2c-ndr-rca1.yaml"
+      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-3n-skx-4t2c-ndr-rca2.yaml"
+      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
@@ -3688,15 +3676,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 4
       compare: 5
-      rca-file: "rca/rca-2005-3n-skx-2t1c-pdr-rca1.yaml"
+      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-skx-2t1c-pdr-rca2.yaml"
+      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 5
-      rca-file: "rca/rca-2005-3n-skx-2t1c-pdr-rca3.yaml"
+      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
@@ -3728,15 +3716,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 4
       compare: 5
-      rca-file: "rca/rca-2005-3n-skx-4t2c-pdr-rca1.yaml"
+      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-skx-4t2c-pdr-rca2.yaml"
+      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 5
-      rca-file: "rca/rca-2005-3n-skx-4t2c-pdr-rca3.yaml"
+      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
@@ -3768,15 +3756,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 4
       compare: 5
-      rca-file: "rca/rca-2005-3n-skx-2t1c-ndr-rca1.yaml"
+      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-skx-2t1c-ndr-rca2.yaml"
+      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 5
-      rca-file: "rca/rca-2005-3n-skx-2t1c-ndr-rca3.yaml"
+      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
@@ -3808,15 +3796,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 4
       compare: 5
-      rca-file: "rca/rca-2005-3n-skx-4t2c-ndr-rca1.yaml"
+      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-skx-4t2c-ndr-rca2.yaml"
+      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 5
-      rca-file: "rca/rca-2005-3n-skx-4t2c-ndr-rca3.yaml"
+      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
@@ -3846,11 +3834,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-2n-skx-2t1c-pdr-rca1.yaml"
+      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-2n-skx-2t1c-pdr-rca2.yaml"
+      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
@@ -3879,11 +3867,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-2n-skx-4t2c-pdr-rca1.yaml"
+      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-2n-skx-4t2c-pdr-rca2.yaml"
+      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
@@ -3912,11 +3900,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-2n-skx-2t1c-ndr-rca1.yaml"
+      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-2n-skx-2t1c-ndr-rca2.yaml"
+      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
@@ -3945,11 +3933,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-2n-skx-4t2c-ndr-rca1.yaml"
+      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-2n-skx-4t2c-ndr-rca2.yaml"
+      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
@@ -3980,15 +3968,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 4
       compare: 5
-      rca-file: "rca/rca-2005-2n-skx-2t1c-pdr-rca1.yaml"
+      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-2n-skx-2t1c-pdr-rca2.yaml"
+      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 5
-      rca-file: "rca/rca-2005-2n-skx-2t1c-pdr-rca3.yaml"
+      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca3.yaml"
 
   legend:
     - ''
@@ -4021,15 +4009,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 4
       compare: 5
-      rca-file: "rca/rca-2005-2n-skx-4t2c-pdr-rca1.yaml"
+      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-2n-skx-4t2c-pdr-rca2.yaml"
+      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 5
-      rca-file: "rca/rca-2005-2n-skx-4t2c-pdr-rca3.yaml"
+      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
@@ -4061,15 +4049,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 4
       compare: 5
-      rca-file: "rca/rca-2005-2n-skx-2t1c-ndr-rca1.yaml"
+      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-2n-skx-2t1c-ndr-rca2.yaml"
+      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 5
-      rca-file: "rca/rca-2005-2n-skx-2t1c-ndr-rca3.yaml"
+      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
@@ -4101,15 +4089,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 4
       compare: 5
-      rca-file: "rca/rca-2005-2n-skx-4t2c-ndr-rca1.yaml"
+      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-2n-skx-4t2c-ndr-rca2.yaml"
+      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 5
-      rca-file: "rca/rca-2005-2n-skx-4t2c-ndr-rca3.yaml"
+      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
@@ -4137,11 +4125,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 1
       compare: 2
-      rca-file: "rca/rca-2005-2n-clx-2t1c-pdr-rca1.yaml"
+      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-2n-clx-2t1c-pdr-rca2.yaml"
+      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
@@ -4168,11 +4156,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 1
       compare: 2
-      rca-file: "rca/rca-2005-2n-clx-4t2c-pdr-rca1.yaml"
+      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-2n-clx-4t2c-pdr-rca2.yaml"
+      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
@@ -4199,11 +4187,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 1
       compare: 2
-      rca-file: "rca/rca-2005-2n-clx-2t1c-ndr-rca1.yaml"
+      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-2n-clx-2t1c-ndr-rca2.yaml"
+      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with xxv710.'
@@ -4230,11 +4218,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 1
       compare: 2
-      rca-file: "rca/rca-2005-2n-clx-4t2c-ndr-rca1.yaml"
+      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-2n-clx-4t2c-ndr-rca2.yaml"
+      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with xxv710.'
@@ -4263,15 +4251,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-2n-clx-2t1c-pdr-rca1.yaml"
+      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 1
       compare: 2
-      rca-file: "rca/rca-2005-2n-clx-2t1c-pdr-rca2.yaml"
+      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 2
       compare: 4
-      rca-file: "rca/rca-2005-2n-clx-2t1c-pdr-rca3.yaml"
+      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
@@ -4301,15 +4289,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-2n-clx-4t2c-pdr-rca1.yaml"
+      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 1
       compare: 2
-      rca-file: "rca/rca-2005-2n-clx-4t2c-pdr-rca2.yaml"
+      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 2
       compare: 4
-      rca-file: "rca/rca-2005-2n-clx-4t2c-pdr-rca3.yaml"
+      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
@@ -4339,15 +4327,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-2n-clx-2t1c-ndr-rca1.yaml"
+      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 1
       compare: 2
-      rca-file: "rca/rca-2005-2n-clx-2t1c-ndr-rca2.yaml"
+      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 2
       compare: 4
-      rca-file: "rca/rca-2005-2n-clx-2t1c-ndr-rca3.yaml"
+      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with xxv710.'
@@ -4377,15 +4365,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-2n-clx-4t2c-ndr-rca1.yaml"
+      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 1
       compare: 2
-      rca-file: "rca/rca-2005-2n-clx-4t2c-ndr-rca2.yaml"
+      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 2
       compare: 4
-      rca-file: "rca/rca-2005-2n-clx-4t2c-ndr-rca3.yaml"
+      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with xxv710.'
@@ -4711,11 +4699,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-tsh-1t1c-pdr-rca1.yaml"
+      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-3n-tsh-1t1c-pdr-rca2.yaml"
+      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
@@ -4744,11 +4732,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-tsh-2t2c-pdr-rca1.yaml"
+      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-3n-tsh-2t2c-pdr-rca2.yaml"
+      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
@@ -4777,11 +4765,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-tsh-1t1c-ndr-rca1.yaml"
+      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-3n-tsh-1t1c-ndr-rca2.yaml"
+      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-tsh with x520.'
@@ -4810,11 +4798,11 @@
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-tsh-2t2c-ndr-rca1.yaml"
+      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-3n-tsh-2t2c-ndr-rca2.yaml"
+      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-tsh with x520.'
@@ -4845,15 +4833,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 4
       compare: 5
-      rca-file: "rca/rca-2005-3n-tsh-1t1c-pdr-rca1.yaml"
+      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-tsh-1t1c-pdr-rca2.yaml"
+      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 5
-      rca-file: "rca/rca-2005-3n-tsh-1t1c-pdr-rca3.yaml"
+      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
@@ -4885,15 +4873,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 4
       compare: 5
-      rca-file: "rca/rca-2005-3n-tsh-2t2c-pdr-rca1.yaml"
+      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-tsh-2t2c-pdr-rca2.yaml"
+      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 5
-      rca-file: "rca/rca-2005-3n-tsh-2t2c-pdr-rca3.yaml"
+      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
@@ -4925,15 +4913,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 4
       compare: 5
-      rca-file: "rca/rca-2005-3n-tsh-1t1c-ndr-rca1.yaml"
+      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-tsh-1t1c-ndr-rca2.yaml"
+      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 5
-      rca-file: "rca/rca-2005-3n-tsh-1t1c-ndr-rca3.yaml"
+      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-tsh with x520.'
@@ -4965,15 +4953,15 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 4
       compare: 5
-      rca-file: "rca/rca-2005-3n-tsh-2t2c-ndr-rca1.yaml"
+      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca1.yaml"
     - title: "2001.0-4 vs 2001.0-2"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-tsh-2t2c-ndr-rca2.yaml"
+      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca2.yaml"
     - title: "2005.0-4 vs 2001.0-4"
       reference: 3
       compare: 5
-      rca-file: "rca/rca-2005-3n-tsh-2t2c-ndr-rca3.yaml"
+      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca3.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-tsh with x520.'
@@ -5355,11 +5343,11 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-3n-hsw-1t1c-mrr-rca1.yaml"
+      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-2"
       reference: 2
       compare: 4
-      rca-file: "rca/rca-2005-3n-hsw-1t1c-mrr-rca2.yaml"
+      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-hsw with xl710.'
@@ -5388,11 +5376,11 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-3n-hsw-2t2c-mrr-rca1.yaml"
+      rca-file: "rca/rca-3n-hsw-2t2c-mrr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-2"
       reference: 2
       compare: 4
-      rca-file: "rca/rca-2005-3n-hsw-2t2c-mrr-rca2.yaml"
+      rca-file: "rca/rca-3n-hsw-2t2c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-hsw with xl710.'
@@ -5421,11 +5409,11 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-3n-hsw-4t4c-mrr-rca1.yaml"
+      rca-file: "rca/rca-3n-hsw-4t4c-mrr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-2"
       reference: 2
       compare: 4
-      rca-file: "rca/rca-2005-3n-hsw-4t4c-mrr-rca2.yaml"
+      rca-file: "rca/rca-3n-hsw-4t4c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-hsw with xl710.'
@@ -5452,11 +5440,11 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-skx-2t1c-mrr-rca1.yaml"
+      rca-file: "rca/rca-3n-skx-2t1c-mrr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-2"
       reference: 1
       compare: 3
-      rca-file: "rca/rca-2005-3n-skx-2t1c-mrr-rca2.yaml"
+      rca-file: "rca/rca-3n-skx-2t1c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
@@ -5483,11 +5471,11 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-skx-4t2c-mrr-rca1.yaml"
+      rca-file: "rca/rca-3n-skx-4t2c-mrr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-2"
       reference: 1
       compare: 3
-      rca-file: "rca/rca-2005-3n-skx-4t2c-mrr-rca2.yaml"
+      rca-file: "rca/rca-3n-skx-4t2c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
@@ -5514,11 +5502,11 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-3n-skx-8t4c-mrr-rca1.yaml"
+      rca-file: "rca/rca-3n-skx-8t4c-mrr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-2"
       reference: 1
       compare: 3
-      rca-file: "rca/rca-2005-3n-skx-8t4c-mrr-rca2.yaml"
+      rca-file: "rca/rca-3n-skx-8t4c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
@@ -5545,11 +5533,11 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-2n-skx-2t1c-mrr-rca1.yaml"
+      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-2"
       reference: 1
       compare: 3
-      rca-file: "rca/rca-2005-2n-skx-2t1c-mrr-rca2.yaml"
+      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
@@ -5576,11 +5564,11 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-2n-skx-4t2c-mrr-rca1.yaml"
+      rca-file: "rca/rca-2n-skx-4t2c-mrr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-2"
       reference: 1
       compare: 3
-      rca-file: "rca/rca-2005-2n-skx-4t2c-mrr-rca2.yaml"
+      rca-file: "rca/rca-2n-skx-4t2c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
@@ -5607,11 +5595,11 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-2n-skx-8t4c-mrr-rca1.yaml"
+      rca-file: "rca/rca-2n-skx-8t4c-mrr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-2"
       reference: 1
       compare: 3
-      rca-file: "rca/rca-2005-2n-skx-8t4c-mrr-rca2.yaml"
+      rca-file: "rca/rca-2n-skx-8t4c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
@@ -5638,11 +5626,11 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-2n-clx-2t1c-mrr-rca1.yaml"
+      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-2"
       reference: 1
       compare: 3
-      rca-file: "rca/rca-2005-2n-clx-2t1c-mrr-rca2.yaml"
+      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
@@ -5669,11 +5657,11 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-2n-clx-4t2c-mrr-rca1.yaml"
+      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-2"
       reference: 1
       compare: 3
-      rca-file: "rca/rca-2005-2n-clx-4t2c-mrr-rca2.yaml"
+      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
@@ -5700,11 +5688,11 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2005-2n-clx-8t4c-mrr-rca1.yaml"
+      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-2"
       reference: 1
       compare: 3
-      rca-file: "rca/rca-2005-2n-clx-8t4c-mrr-rca2.yaml"
+      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
@@ -5946,11 +5934,11 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-3n-tsh-1t1c-mrr-rca1.yaml"
+      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-2"
       reference: 2
       compare: 4
-      rca-file: "rca/rca-2005-3n-tsh-1t1c-mrr-rca2.yaml"
+      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
@@ -5979,11 +5967,11 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-3n-tsh-2t2c-mrr-rca1.yaml"
+      rca-file: "rca/rca-3n-tsh-2t2c-mrr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-2"
       reference: 2
       compare: 4
-      rca-file: "rca/rca-2005-3n-tsh-2t2c-mrr-rca2.yaml"
+      rca-file: "rca/rca-3n-tsh-2t2c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
@@ -6012,11 +6000,11 @@
     - title: "2005.0-4 vs 2005.0-3"
       reference: 3
       compare: 4
-      rca-file: "rca/rca-2005-3n-tsh-4t4c-mrr-rca1.yaml"
+      rca-file: "rca/rca-3n-tsh-4t4c-mrr-rca1.yaml"
     - title: "2005.0-4 vs 2001.0-2"
       reference: 2
       compare: 4
-      rca-file: "rca/rca-2005-3n-tsh-4t4c-mrr-rca2.yaml"
+      rca-file: "rca/rca-3n-tsh-4t4c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
@@ -8137,47 +8125,6 @@
     title: "3n-hsw-xl710-1280b-1t1c-eth-ip4udpquic-vppecho"
     layout: "plot-hoststack"
 
-## Plots VPP HTTP Server Performance
-#- type: "plot"
-#  title: "VPP HTTP Server Performance"
-#  algorithm: "plot_http_server_perf_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/http-server-performance-cps"
-#  data:
-#    "plot-vpp-http-server-performance"
-#  filter: "'HTTP' and 'TCP_CPS' and not '8T4C'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  traces:
-#    hoverinfo: "y+name"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "VPP HTTP Server Performance"
-#    layout:
-#      "plot-cps"
-#
-#- type: "plot"
-#  title: "VPP HTTP Server Performance"
-#  algorithm: "plot_http_server_perf_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/http-server-performance-rps"
-#  data:
-#    "plot-vpp-http-server-performance"
-#  filter: "'HTTP' and 'TCP_RPS' and not '8T4C'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  traces:
-#    hoverinfo: "y+name"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "VPP HTTP Server Performance"
-#    layout:
-#      "plot-rps"
-
 ################################################################################
 
 # Soak Test (PLRsearch), boxes - 2n-clx