X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=5719b2396a8d71c224645bc721d91904aec8adcd;hp=0875d9a0454f840b2845fec978866e63bc7223ef;hb=0c0cf8698e0852e87feaff3a312916cce68fc482;hpb=db2fcb13bab0085abaaa704e87e345d43734ac86

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 0875d9a045..5719b2396a 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -604,8 +604,19 @@
         - 70  # SOAK
         - 71  # SOAK
     vpp-soak-vs-ndr-2n-skx:
-      - "vpp-soak-vs-ndr-2n-skx-ref"
-      - "vpp-soak-vs-ndr-2n-skx-cmp"
+      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:
@@ -1648,51 +1659,24 @@
 
 # VPP SOAK vs NDR
 - type: "table"
-  title: "VPP SOAK vs NDR 2n-skx"
+  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"
+    title: "Soak"
     data: "vpp-soak-vs-ndr-2n-skx-cmp"
   data: "vpp-soak-vs-ndr-2n-skx"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  include-tests: "NDR"
   filter: "('NDRPDR' or 'SOAK')"
   parameters:
     - "throughput"
+    - "name"
+    - "parent"
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+################################################################################
 
 # VPP Compare NICs 3n-hsw 1t1c ndr
 - type: "table"
@@ -3031,7 +3015,7 @@
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "parent"
@@ -3050,7 +3034,7 @@
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "parent"
@@ -3107,7 +3091,7 @@
     data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "parent"
   - "name"
@@ -3126,7 +3110,7 @@
     data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "parent"
   - "name"
@@ -3183,7 +3167,7 @@
     data: "data show-run"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "parent"
   - "name"
@@ -3202,7 +3186,7 @@
     data: "data show-run"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "parent"
   - "name"
@@ -4028,7 +4012,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,VPP,3N,SKX]}"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
@@ -4045,7 +4029,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,VPP,2N,SKX]}"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
@@ -4096,7 +4080,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,PERF,VPP,3N,SKX]}"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
@@ -4113,7 +4097,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,PERF,VPP,2N,SKX]}"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
@@ -4164,7 +4148,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTO,PERF,VPP,3N,SKX]}"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
@@ -4181,7 +4165,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTO,PERF,VPP,2N,SKX]}"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
@@ -4578,43 +4562,41 @@
   title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes"
   algorithm: "plot_soak_boxes"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/example-soak-boxes"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-1"
   data: "plot-vpp-soak-2n-skx"
-  filter: "'SOAK'"
+  filter: "('L2BDMACLRN' or 'L2PATCH' or 'L2XCBASE') and not 'VHOST' and not 'MEMIF'"
   parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  - "IP6FWD"
-  - "VHOST"
+    - "throughput"
+    - "parent"
+    - "tags"
+  sort:
+    - "DRV_AVF"
+    - "DRV_AVF"
+    - "DRV_AVF"
+    - "L2PATCH"
+    - "L2BDMACLRN"
+    - "L2XCBASE"
   layout:
     title: "30min Soak Test (PLRsearch)"
     layout: "plot-soak-throughput"
 
-# Soak test - example, not used
+# Soak test - 30min Soak Test (PLRsearch), boxes
 - type: "plot"
-  title: "VPP Throughput: 30min Soak Test (PLRsearch) bars"
-  algorithm: "plot_soak_bars"
+  title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes"
+  algorithm: "plot_soak_boxes"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/example-soak-bars"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-2"
   data: "plot-vpp-soak-2n-skx"
-  filter: "'SOAK'"
+  filter: "'L2BDMACLRN' and ('VHOST' or 'MEMIF') or 'IP4BASE' or 'IP6BASE'"
   parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  - "IP6FWD"
-  - "VHOST"
+    - "throughput"
+    - "parent"
+    - "tags"
+  sort:
+    - "VHOST"
+    - "MEMIF"
+    - "IP4FWD"
+    - "IP6FWD"
   layout:
     title: "30min Soak Test (PLRsearch)"
     layout: "plot-soak-throughput"