PAL: Merge input data

[csit.git] / resources / tools / presentation / specification.yaml

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 5405c74..cc8de35 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -260,7 +260,7 @@
 -
   type: "table"
   title: "Detailed Test Results - VPP Performance Results"
-  algorithm: "table_details"
+  algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP]}/vpp_performance_results"
   columns:
@@ -276,7 +276,8 @@
   rows: "generated"
   data:
     csit-vpp-perf-1710-all:
-    - 19
+    - 20
+#    - 23
   filter: "all"
   parameters:
   - "name"
@@ -287,7 +288,7 @@
 -
   type: "table"
   title: "Test configuration - VPP Performance Test Configs"
-  algorithm: "table_details"
+  algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,PERF,VPP]}/vpp_test_configuration"
   columns:
@@ -300,7 +301,8 @@
   rows: "generated"
   data:
     csit-vpp-perf-1710-all:
-    - 19
+    - 20
+#    - 23
   filter: "all"
   parameters:
   - "parent"
@@ -310,7 +312,7 @@
 -
   type: "table"
   title: "Test Operational Data - VPP Performance Operational Data"
-  algorithm: "table_details"
+  algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTO,PERF,VPP]}/vpp_test_operational"
   columns:
@@ -323,7 +325,8 @@
   rows: "generated"
   data:
     csit-vpp-perf-1710-all:
-    - 19
+    - 20
+#    - 23
   filter: "all"
   parameters:
   - "parent"
@@ -495,57 +498,63 @@
 -
   type: "file"
   title: "VPP Performance Results"
-  algorithm: "file_test_results"
+  algorithm: "file_merged_test_results"
   output-file-ext: ".rst"
   output-file: "{DIR[DTR,PERF,VPP]}/vpp_performance_results"
   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]}"
   data:
     csit-vpp-perf-1710-all:
-    - 19
+    - 20
+#    - 23
   filter: "all"
   parameters:
   - "name"
   - "doc"
   - "level"
+  - "parent"
   data-start-level: 2  # 0, 1, 2, ...
   chapters-start-level: 2  # 0, 1, 2, ...
 
 -
   type: "file"
   title: "VPP Performance Configuration"
-  algorithm: "file_test_results"
+  algorithm: "file_merged_test_results"
   output-file-ext: ".rst"
   output-file: "{DIR[DTC,PERF,VPP]}/vpp_performance_configuration"
   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]}"
   data:
     csit-vpp-perf-1710-all:
-    - 19
+    - 20
+#    - 23
   filter: "all"
   parameters:
   - "name"
   - "doc"
   - "level"
+  - "parent"
   data-start-level: 2  # 0, 1, 2, ...
   chapters-start-level: 2  # 0, 1, 2, ...
 
 -
   type: "file"
   title: "VPP Performance Operational Data"
-  algorithm: "file_test_results"
+  algorithm: "file_merged_test_results"
   output-file-ext: ".rst"
   output-file: "{DIR[DTO,PERF,VPP]}/vpp_performance_operational_data"
   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]}"
   data:
     csit-vpp-perf-1710-all:
-    - 19
+    - 20
+#    - 23
   filter: "all"
   parameters:
   - "name"
   - "doc"
   - "level"
+  - "parent"
   data-start-level: 2  # 0, 1, 2, ...
   chapters-start-level: 2  # 0, 1, 2, ...
 
@@ -5437,7 +5446,7 @@
     - 13
     - 16
     - 17
-  filter: "'64B' and 'BASE' and 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -5505,7 +5514,7 @@
     - 13
     - 16
     - 17
-  filter: "'64B' and 'BASE' and 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -5573,7 +5582,7 @@
     - 13
     - 16
     - 17
-  filter: "'64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE') and 'PDRDISC' and not 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -5641,7 +5650,7 @@
     - 13
     - 16
     - 17
-  filter: "'64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE') and 'PDRDISC' and not 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -5845,7 +5854,7 @@
     - 13
     - 16
     - 17
-  filter: "'64B' and 'BASE' and 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
@@ -5911,7 +5920,7 @@
     - 13
     - 16
     - 17
-  filter: "'64B' and 'BASE' and 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "latency"
   - "parent"