X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=1ab1ea78afe94a5b4a9f3d9917149fa1cae7a944;hp=5d3342138d77c704b4004941113821b51d222818;hb=c1356fb4855e23d6c939c14045a63483eba01628;hpb=36b2dffd55dee362d96aae98d563a0c2b475573e

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 5d3342138d..1ab1ea78af 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -228,11 +228,11 @@
         - 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:
       csit-vpp-perf-verify-1904-2n-skx:
@@ -587,6 +587,37 @@
       - "vpp-performance-changes-2n-skx-ref"
       - "vpp-performance-changes-2n-skx-cmp"
 
+    vpp-soak-vs-ndr-2n-skx-ref:
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 27  # NDRPDR sel
+        - 30  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
+    vpp-soak-vs-ndr-2n-skx-cmp:
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 70  # SOAK
+        - 71  # SOAK
+    vpp-soak-vs-ndr-2n-skx:
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 27  # NDRPDR sel
+        - 30  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
+        - 70  # SOAK
+        - 71  # SOAK
+
     vpp-performance-changes-3n-hsw-mrr-h1:
       csit-vpp-perf-verify-1810-3n-hsw:
         - 9   # MRR sel
@@ -1444,7 +1475,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
@@ -1480,6 +1510,8 @@
       - 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
@@ -1618,12 +1650,60 @@
   format:
     html:
     - full
-    pdf:
-    - minimal
+#    pdf:
+#    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
 ################################################################################
+
+# VPP SOAK vs NDR
+- type: "table"
+  title: "VPP SOAK vs NDR 2n-skx"
+  algorithm: "table_soak_vs_ndr"
+  output-file: "{DIR[STATIC,VPP]}/soak-vs-ndr-2n-skx"
+  reference:
+    title: "NDR"
+    data: "vpp-soak-vs-ndr-2n-skx-ref"
+  compare:
+    title: "SOAK"
+    data: "vpp-soak-vs-ndr-2n-skx-cmp"
+  data: "vpp-soak-vs-ndr-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "('NDRPDR' or 'SOAK')"
+  parameters:
+    - "throughput"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 # VPP Compare NICs 3n-hsw 1t1c ndr
 - type: "table"
@@ -4504,51 +4584,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