X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=a579f21d9e7f94153577833d2b5fc8be69bce236;hp=3251d73b5961428d161378701593f8a41ff8bfe3;hb=ad4f18fdb7b46c3c2b95813c1fdbe428295ef61b;hpb=cc7ced86fd14dcafc5e6146a2e30e630429e211c

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 3251d73b59..a579f21d9e 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -132,7 +132,7 @@
     plot-vpp-throughput-lat-tsa-3n-hsw:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
-        - 2   # NDRPDR sel
+        - 12   # NDRPDR sel
 
     plot-vpp-http-server-performance:
       # TODO: Replace with 1904 data
@@ -167,26 +167,42 @@
     plot-dpdk-throughput-latency-3n-hsw:
       # TODO: Add 1904 data
       csit-dpdk-perf-verify-1904-3n-hsw:
-        - 1   # NDRPDR sel
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 5   # NDRPDR sel
 
     # 3n-skx
 
     plot-vpp-throughput-lat-tsa-3n-skx:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-skx:
-        - 4   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-skx:
       # TODO: Add 1904 data
       csit-dpdk-perf-verify-1904-3n-skx:
-        - 1   # NDRPDR sel
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
 
     # 2n-skx
 
     plot-vpp-throughput-lat-tsa-2n-skx:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
-        - 5   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 27  # NDRPDR sel
 
     plot-vpp-soak-2n-skx:
       # TODO: Replace with 1904 data
@@ -195,29 +211,27 @@
         - 45  # SOAK sel
 
     plot-vpp-nfv-2n-skx:
-      # TODO: Replace with 1904 data
-      # csit-vpp-perf-verify-1904-2n-skx:
-      csit-vpp-perf-verify-1901-2n-skx:
-        - 28  # NFV NDRPDR
-        - 29  # NFV NDRPDR
-        - 32  # NFV NDRPDR
-        - 39  # NFV NDRPDR
-        - 46  # NFV NDRPDR
+      # TODO: Add 1904 data
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 9   # NFV NDRPDR
 
     plot-vpp-nfv-2n-skx-mrr:
-      # TODO: Replace with 1904 data
-      # csit-vpp-perf-verify-1904-2n-skx:
-      csit-vpp-perf-verify-1901-2n-skx:
-        - 24  # NFV MRR
-        - 26  # NFV MRR
-        - 27  # NFV MRR
-        - 35  # NFV MRR
-        - 37  # NFV MRR
+      # TODO: Add 1904 data
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 10  # NFV MRR
 
     plot-dpdk-throughput-latency-2n-skx:
       # TODO: Add 1904 data
       csit-dpdk-perf-verify-1904-2n-skx:
-        - 1   # NDRPDR sel
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
 
     # 3rd party
 
@@ -236,17 +250,27 @@
     vpp-nic-comparison-3n-hsw:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
-        - 2   # NDRPDR sel
+        - 12   # NDRPDR sel
 
     vpp-nic-comparison-3n-skx:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-skx:
-        - 4   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
 
     vpp-nic-comparison-2n-skx:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
-        - 5   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 27  # NDRPDR sel
 
     vpp-nic-comparison-3n-hsw-mrr:
       csit-vpp-perf-verify-1904-3n-hsw:
@@ -254,11 +278,11 @@
 
     vpp-nic-comparison-3n-skx-mrr:
       csit-vpp-perf-verify-1904-3n-skx:
-        - 3   # MRR sel
+        - 7   # MRR sel
 
     vpp-nic-comparison-2n-skx-mrr:
       csit-vpp-perf-verify-1904-2n-skx:
-        - 4   # MRR sel
+        - 11  # MRR sel
 
     # Results
 
@@ -295,23 +319,23 @@
 
     vpp-mrr-results-3n-skx:
       csit-vpp-perf-verify-1904-3n-skx:
-        - 3   # MRR sel
+        - 7   # MRR sel
 
     vpp-mrr-results-2n-skx:
       csit-vpp-perf-verify-1904-2n-skx:
-        - 4   # MRR sel
+        - 11  # MRR sel
 
     vpp-func-results-ubuntu:
       csit-vpp-functional-1904-ubuntu1604-virl:
-        - 20
+        - 29
 
     vpp-func-results-centos:
       csit-vpp-functional-1904-centos7-virl:
-        - 19
+        - 32
 
     vpp-device-results-ubuntu:
       csit-vpp-device-1904-ubuntu1804-1n-skx:
-        - 18
+        - 33
 
     # VPP Ligato
     ligato-perf-results-3n-hsw:
@@ -322,22 +346,20 @@
 
     dpdk-perf-results-3n-hsw:
       csit-dpdk-perf-verify-1904-3n-hsw:
-        - 1   # NDRPDR sel
+        - 5   # NDRPDR sel
 
     dpdk-perf-results-3n-skx:
       csit-dpdk-perf-verify-1904-3n-skx:
-        - 1   # NDRPDR sel
+        - 10  # NDRPDR sel
 
     dpdk-perf-results-2n-skx:
       csit-dpdk-perf-verify-1904-2n-skx:
-        - 1   # NDRPDR sel
+        - 9   # NDRPDR sel
 
     # HoneyComb Functional
     hc-func-results:
-      # TODO: Replace with 1904 data
-      # csit-hc2vpp-verify-func-1904-ubuntu1604:
-      csit-hc2vpp-verify-func-1901-ubuntu1604:
-        - 3
+      csit-hc2vpp-verify-func-1904-ubuntu1604:
+        - 1
 
 #    # NSH SFC Functional
 #    nsh-func-results:
@@ -408,7 +430,7 @@
     vpp-performance-changes-3n-hsw-cmp:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
-        - 2   # NDRPDR sel
+        - 12   # NDRPDR sel
     vpp-performance-changes-3n-hsw:
       - "vpp-performance-changes-3n-hsw-h1"
       - "vpp-performance-changes-3n-hsw-ref"
@@ -451,7 +473,11 @@
     vpp-performance-changes-3n-skx-cmp:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-skx:
-        - 4   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
     vpp-performance-changes-3n-skx:
       - "vpp-performance-changes-3n-skx-h1"
       - "vpp-performance-changes-3n-skx-ref"
@@ -484,7 +510,13 @@
     vpp-performance-changes-2n-skx-cmp:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
-        - 5   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 27  # NDRPDR sel
     vpp-performance-changes-2n-skx:
       - "vpp-performance-changes-2n-skx-h1"
       - "vpp-performance-changes-2n-skx-ref"
@@ -515,7 +547,7 @@
         - 32  # MRR sel
     vpp-performance-changes-3n-skx-mrr-cmp:
       csit-vpp-perf-verify-1904-3n-skx:
-        - 3   # MRR sel
+        - 7   # MRR sel
     vpp-performance-changes-3n-skx-mrr:
       - "vpp-performance-changes-3n-skx-mrr-h1"
       - "vpp-performance-changes-3n-skx-mrr-ref"
@@ -532,7 +564,7 @@
         - 22  # MRR sel
     vpp-performance-changes-2n-skx-mrr-cmp:
       csit-vpp-perf-verify-1904-2n-skx:
-        - 4   # MRR sel
+        - 11  # MRR sel
     vpp-performance-changes-2n-skx-mrr:
       - "vpp-performance-changes-2n-skx-mrr-h1"
       - "vpp-performance-changes-2n-skx-mrr-ref"
@@ -565,7 +597,9 @@
     dpdk-performance-changes-3n-hsw-cmp:
       # TODO: Add 1904 data
       csit-dpdk-perf-verify-1904-3n-hsw:
-        - 1   # NDRPDR sel
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 5   # NDRPDR sel
     dpdk-performance-changes-3n-hsw:
       - "dpdk-performance-changes-3n-hsw-h1"
       - "dpdk-performance-changes-3n-hsw-ref"
@@ -598,7 +632,11 @@
     dpdk-performance-changes-3n-skx-cmp:
       # TODO: Add 1904 data
       csit-dpdk-perf-verify-1904-3n-skx:
-        - 1   # NDRPDR sel
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
     dpdk-performance-changes-3n-skx:
       - "dpdk-performance-changes-3n-skx-h1"
       - "dpdk-performance-changes-3n-skx-ref"
@@ -631,7 +669,15 @@
     dpdk-performance-changes-2n-skx-cmp:
       # TODO: Add 1904 data
       csit-dpdk-perf-verify-1904-2n-skx:
-        - 1   # NDRPDR sel
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
     dpdk-performance-changes-2n-skx:
       - "dpdk-performance-changes-2n-skx-h1"
       - "dpdk-performance-changes-2n-skx-ref"
@@ -642,11 +688,15 @@
     vpp-compare-testbeds-ref:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
-        - 2   # NDRPDR sel
+        - 12   # NDRPDR sel
     vpp-compare-testbeds-cmp:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-skx:
-        - 4   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
     vpp-compare-testbeds:
       - "vpp-compare-testbeds-ref"
       - "vpp-compare-testbeds-cmp"
@@ -656,7 +706,7 @@
         - 1   # MRR sel
     vpp-compare-testbeds-mrr-cmp:
       csit-vpp-perf-verify-1904-3n-skx:
-        - 3   # MRR sel
+        - 7   # MRR sel
     vpp-compare-testbeds-mrr:
       - "vpp-compare-testbeds-mrr-ref"
       - "vpp-compare-testbeds-mrr-cmp"
@@ -664,11 +714,17 @@
     dpdk-compare-testbeds-ref:
       # TODO: Add 1904 data
       csit-dpdk-perf-verify-1904-3n-hsw:
-        - 1   # NDRPDR sel
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 5   # NDRPDR sel
     dpdk-compare-testbeds-cmp:
       # TODO: Add 1904 data
       csit-dpdk-perf-verify-1904-3n-skx:
-        - 1   # NDRPDR sel
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
     dpdk-compare-testbeds:
       - "dpdk-compare-testbeds-ref"
       - "dpdk-compare-testbeds-cmp"
@@ -678,21 +734,31 @@
     vpp-compare-topologies-ref:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-skx:
-        - 4   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
     vpp-compare-topologies-cmp:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
-        - 5   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 27  # NDRPDR sel
     vpp-compare-topologies:
       - "vpp-compare-topologies-ref"
       - "vpp-compare-topologies-cmp"
 
     vpp-compare-topologies-mrr-ref:
       csit-vpp-perf-verify-1904-3n-skx:
-        - 3   # MRR sel
+        - 7   # MRR sel
     vpp-compare-topologies-mrr-cmp:
       csit-vpp-perf-verify-1904-2n-skx:
-        - 4   # MRR sel
+        - 11  # MRR sel
     vpp-compare-topologies-mrr:
       - "vpp-compare-topologies-mrr-ref"
       - "vpp-compare-topologies-mrr-cmp"
@@ -700,11 +766,23 @@
     dpdk-compare-topologies-ref:
       # TODO: Add 1904 data
       csit-dpdk-perf-verify-1904-3n-skx:
-        - 1   # NDRPDR sel
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
     dpdk-compare-topologies-cmp:
       # TODO: Add 1904 data
       csit-dpdk-perf-verify-1904-2n-skx:
-        - 1   # NDRPDR sel
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
     dpdk-compare-topologies:
       - "dpdk-compare-topologies-ref"
       - "dpdk-compare-topologies-cmp"
@@ -1174,8 +1252,8 @@
       - 71  # NDRPDR LB
     # TODO: Add 1904 Data
     csit-vpp-perf-verify-1904-3n-hsw:
-      - 1   # MRR sel
-      - 2   # NDRPDR sel
+      - 1   # MRR sel - replace
+      - 12   # NDRPDR sel
 
     csit-vpp-perf-verify-1810-3n-skx:
       - 9   # MRR sel
@@ -1222,8 +1300,12 @@
       - 67  # NDRPDR LB
     # TODO: Add 1904 data
     csit-vpp-perf-verify-1904-3n-skx:
-      - 3   # MRR sel
-      - 4   # NDRPDR sel
+      - 7   # MRR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
 
     csit-vpp-perf-verify-1810-2n-skx:
       - 8   # MRR sel
@@ -1271,8 +1353,16 @@
       - 45  # SOAK
     # TODO: Add 1904 data
     csit-vpp-perf-verify-1904-2n-skx:
-      - 4   # MRR sel
-      - 5   # NDRPDR sel
+      - 11  # MRR sel
+      - 12  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
+      - 18  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 27  # NDRPDR sel
+      - 10  # NFV MRR
+      - 9   # NFV NDRPDR
 
     # TODO: Remove
     csit-ligato-perf-verify-1901-3n-hsw:
@@ -1315,7 +1405,9 @@
       - 23  # NDRPDR sel
     # TODO: Add 1904 data
     csit-dpdk-perf-verify-1904-3n-hsw:
-      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 5   # NDRPDR sel
 
     csit-dpdk-perf-verify-1810-3n-skx:
       - 3   # NDRPDR sel
@@ -1341,7 +1433,11 @@
       - 13  # NDRPDR sel
     # TODO: Add 1904 data
     csit-dpdk-perf-verify-1904-3n-skx:
-      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
 
     csit-dpdk-perf-verify-1810-2n-skx:
       - 3   # NDRPDR sel
@@ -1367,24 +1463,29 @@
       - 21  # NDRPDR sel
     # TODO: Add 1904 data
     csit-dpdk-perf-verify-1904-2n-skx:
-      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
 
     csit-vpp-functional-1904-ubuntu1604-virl:
-      - 20
+      - 33
     csit-vpp-functional-1904-centos7-virl:
-      - 19
+      - 32
     csit-vpp-device-1904-ubuntu1804-1n-skx:
-      - 18
+      - 32
 #    # Not used
 #    csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
 #      - 1
     csit-dmm-functional-1904-ubuntu1604-virl:
       - 1
-    csit-hc2vpp-verify-func-1901-ubuntu1604:
-      - 3
-    # TODO: Add 1904 data
-#    csit-hc2vpp-verify-func-1904-ubuntu1604:
-#      -
+    csit-hc2vpp-verify-func-1904-ubuntu1604:
+      - 1
 
 - type: "output"
   output: "report"