X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=9abdf08a1f73db13aa3ab969bda6457cec40ad6d;hp=35a9d30c4c22789277d2df984e6414eb126babcd;hb=80950e65bd14f6425127f7073b960a1fb2c3c4f7;hpb=b286895595c5d7a674e3accd2fb03810d1cd9827

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 35a9d30c4c..9abdf08a1f 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -130,7 +130,6 @@
     # 3n-hsw
 
     plot-vpp-throughput-lat-tsa-3n-hsw:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
@@ -141,6 +140,7 @@
         - 25  # NDRPDR sel
         - 26  # NDRPDR sel
         - 29  # NDRPDR sel
+        - 30  # NDRPDR sel
 
 #    plot-vpp-http-server-performance:
 #      # TODO: Replace with 1904 data
@@ -228,25 +228,26 @@
         - 31  # NDRPDR sel
         - 32  # NDRPDR sel
 
-#    plot-vpp-soak-2n-skx:
-#      # TODO: Replace with 1904 data
-#      # csit-vpp-perf-verify-1904-2n-skx:
-#      csit-vpp-perf-verify-1901-2n-skx:
-#        - 45  # SOAK sel
+    plot-vpp-soak-2n-skx:
+      # TODO: Add 1904 data
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 70  # SOAK
+        - 71  # SOAK
 
     plot-vpp-nfv-2n-skx-ndrpdr-64b:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
         - 56  # NFV NDRPDR 64b
         - 59  # NFV NDRPDR 64b
         - 60  # NFV NDRPDR 64b
         - 65  # NFV NDRPDR 64b
+        - 68  # NFV NDRPDR 64b
 
     plot-vpp-nfv-2n-skx-ndrpdr-imix:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
-        - 61  # NFV NDRPDR IMIX
-        - 63  # NFV NDRPDR IMIX
+        - 66  # NFV NDRPDR IMIX
+        - 67  # NFV NDRPDR IMIX
+        - 69  # NFV NDRPDR IMIX
 
     plot-vpp-nfv-2n-skx-mrr-64b:
       csit-vpp-perf-verify-1904-2n-skx:
@@ -292,7 +293,6 @@
     # NIC Comparisons
 
     vpp-nic-comparison-3n-hsw:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
@@ -303,6 +303,7 @@
         - 25  # NDRPDR sel
         - 26  # NDRPDR sel
         - 29  # NDRPDR sel
+        - 30  # NDRPDR sel
 
     vpp-nic-comparison-3n-skx:
       csit-vpp-perf-verify-1904-3n-skx:
@@ -350,10 +351,11 @@
         - 12  # NDRPDR sel
 
     vpp-perf-results-3n-skx:
-      # TODO: Add FULL 1904 data
       csit-vpp-perf-verify-1904-3n-skx:
         - 26  # NDRPDR full
         - 27  # NDRPDR full
+        - 30  # NDRPDR full
+        - 31  # NDRPDR full
 
     vpp-perf-results-2n-skx:
       csit-vpp-perf-verify-1904-2n-skx:
@@ -477,7 +479,6 @@
         - 70  # NDRPDR LB
         - 71  # NDRPDR LB
     vpp-performance-changes-3n-hsw-cmp:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
@@ -488,6 +489,7 @@
         - 25  # NDRPDR sel
         - 26  # NDRPDR sel
         - 29  # NDRPDR sel
+        - 30  # NDRPDR sel
     vpp-performance-changes-3n-hsw:
       - "vpp-performance-changes-3n-hsw-h1"
       - "vpp-performance-changes-3n-hsw-ref"
@@ -759,7 +761,6 @@
     # Compare testbeds
 
     vpp-compare-testbeds-ref:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
@@ -770,6 +771,7 @@
         - 25  # NDRPDR sel
         - 26  # NDRPDR sel
         - 29  # NDRPDR sel
+        - 30  # NDRPDR sel
     vpp-compare-testbeds-cmp:
       csit-vpp-perf-verify-1904-3n-skx:
         - 8   # NDRPDR sel
@@ -1359,6 +1361,7 @@
       - 25  # NDRPDR sel
       - 26  # NDRPDR sel
       - 29  # NDRPDR sel
+      - 30  # NDRPDR sel
 
     csit-vpp-perf-verify-1810-3n-skx:
       - 9   # MRR sel
@@ -1401,6 +1404,8 @@
       - 7   # MRR sel
       - 26  # NDRPDR full
       - 27  # NDRPDR full
+      - 30  # NDRPDR full
+      - 31  # NDRPDR full
       - 8   # NDRPDR sel
       - 9   # NDRPDR sel
       - 10  # NDRPDR sel
@@ -1439,7 +1444,6 @@
       - 40  # NDRPDR sel
       - 42  # NDRPDR sel
       - 43  # NDRPDR sel
-#      - 45  # SOAK
     # TODO: Add 1904 data
     csit-vpp-perf-verify-1904-2n-skx:
       - 11  # MRR sel
@@ -1471,8 +1475,12 @@
       - 59  # NFV NDRPDR 64b
       - 60  # NFV NDRPDR 64b
       - 65  # NFV NDRPDR 64b
-      - 61  # NFV NDRPDR IMIX
-      - 63  # NFV NDRPDR IMIX
+      - 68  # NFV NDRPDR 64b
+      - 66  # NFV NDRPDR IMIX
+      - 67  # NFV NDRPDR IMIX
+      - 69  # NFV NDRPDR IMIX
+      - 70  # SOAK
+      - 71  # SOAK
 
 #    csit-ligato-perf-verify-1901-3n-hsw:
 #      - 10  # NDRPDR full
@@ -1611,8 +1619,8 @@
   format:
     html:
     - full
-    pdf:
-    - minimal
+#    pdf:
+#    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
@@ -4497,51 +4505,51 @@
 ###                                P L O T S                                 ###
 ################################################################################
 
-## Soak test - 30min Soak Test (PLRsearch), boxes
-#- type: "plot"
-#  title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes"
-#  algorithm: "plot_soak_boxes"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/example-soak-boxes"
-#  data: "plot-vpp-soak-2n-skx"
-#  filter: "'SOAK'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
+# Soak test - 30min Soak Test (PLRsearch), boxes
+- type: "plot"
+  title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes"
+  algorithm: "plot_soak_boxes"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/example-soak-boxes"
+  data: "plot-vpp-soak-2n-skx"
+  filter: "'SOAK'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
 #  sort:
 #  - "L2PATCH"
-##  - "L2XCBASE"
-##  - "L2BDMACLRN"
-##  - "IP4FWD"
-##  - "IP6FWD"
-#  - "VHOST"
-#  layout:
-#    title: "30min Soak Test (PLRsearch)"
-#    layout: "plot-soak-throughput"
-#
-## Soak test - example, not used
-#- type: "plot"
-#  title: "VPP Throughput: 30min Soak Test (PLRsearch) bars"
-#  algorithm: "plot_soak_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/example-soak-bars"
-#  data: "plot-vpp-soak-2n-skx"
-#  filter: "'SOAK'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  - "IP6FWD"
+  - "VHOST"
+  layout:
+    title: "30min Soak Test (PLRsearch)"
+    layout: "plot-soak-throughput"
+
+# Soak test - example, not used
+- type: "plot"
+  title: "VPP Throughput: 30min Soak Test (PLRsearch) bars"
+  algorithm: "plot_soak_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/example-soak-bars"
+  data: "plot-vpp-soak-2n-skx"
+  filter: "'SOAK'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
 #  sort:
 #  - "L2PATCH"
-##  - "L2XCBASE"
-##  - "L2BDMACLRN"
-##  - "IP4FWD"
-##  - "IP6FWD"
-#  - "VHOST"
-#  layout:
-#    title: "30min Soak Test (PLRsearch)"
-#    layout: "plot-soak-throughput"
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  - "IP6FWD"
+  - "VHOST"
+  layout:
+    title: "30min Soak Test (PLRsearch)"
+    layout: "plot-soak-throughput"
 
 ################################################################################
 # Plots - NF Density - VSC - MRR 64b