CSIT-1350: Add new data to 1810 report

Change-Id: Ia9720501e724f9240eaa41be36e29c8a6ae18ae7
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 70b50286ea9145d2720d8bcb36d522b96a0b0ac2)

3 files changed, 48 insertions, 23 deletions

diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index 88fd74e76c..00e3cb9b21 100644
--- a/resources/tools/presentation/conf.py
+++ b/resources/tools/presentation/conf.py
@@ -45,7 +45,7 @@ source_suffix = ['.rst', '.md']
 master_doc = 'index'
 
 # General information about the project.
-project = u'FD.io CSIT-18.10.w45'
+project = u'FD.io CSIT-18.10.W46'
 copyright = u'2018, FD.io'
 author = u'FD.io CSIT'
 
@@ -104,7 +104,7 @@ rst_epilog = """
 .. _CSIT Testbed Setup: https://git.fd.io/csit/tree/resources/tools/testbed-setup/README.md?h={release}
 .. _K8s configuration files: https://github.com/FDio/csit/tree/{release}/resources/templates/kubernetes
 """.format(release='rls1810',
-           report_version='v1.0',
+           report_version='v1.1',
            prev_release='rls1807',
            srelease='1810',
            csitrelease='18.10',
diff --git a/resources/tools/presentation/run_report.sh b/resources/tools/presentation/run_report.sh
index 9435ce01a6..2792190e3e 100755
--- a/resources/tools/presentation/run_report.sh
+++ b/resources/tools/presentation/run_report.sh
@@ -38,7 +38,7 @@ export PYTHONPATH=`pwd`
 python pal.py \
     --specification specification.yaml \
     --release ${RELEASE} \
-    --version "1.0" \
+    --version "1.1" \
     --logging INFO \
     --force
 
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index f379218916..a795b70593 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -153,6 +153,7 @@
       - 18  # NDRPDR sel
       - 23  # NDRPDR sel
       - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
 
     vpp-compare-testbeds:
       csit-vpp-perf-verify-1810-3n-hsw:
@@ -163,6 +164,7 @@
       - 18  # NDRPDR sel
       - 23  # NDRPDR sel
       - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
       csit-vpp-perf-verify-1810-3n-skx:
       - 24  # NDRPDR full
       - 10  # NDRPDR sel
@@ -215,10 +217,10 @@
 
     vpp-perf-results-3n-hsw:
       csit-vpp-perf-verify-1810-3n-hsw:
-      # TODO: Add data
       - 20  # NDRPDR full
       - 21  # NDRPDR full
       - 22  # NDRPDR full
+      - 27  # NDRPDR full
 
     vpp-perf-results-3n-skx:
       csit-vpp-perf-verify-1810-3n-skx:
@@ -254,6 +256,7 @@
       - 18  # NDRPDR sel
       - 23  # NDRPDR sel
       - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
 
     plot-throughput-speedup-analysis-3n-skx:
       csit-vpp-perf-verify-1810-3n-skx:
@@ -291,6 +294,7 @@
       - 18  # NDRPDR sel
       - 23  # NDRPDR sel
       - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
 
     plot-vpp-throughput-latency-3n-skx:
       csit-vpp-perf-verify-1810-3n-skx:
@@ -347,21 +351,36 @@
 
     # VPP Ligato
     ligato-perf-results-3n-hsw:
-      # TODO: Replace with 1810 data:
-      csit-ligato-perf-1807-all:
-      - 3   # full ?
+      csit-ligato-perf-verify-1810-3n-hsw:
+      - 5   # full
 
     plot-ligato-throughput-speedup-analysis-3n-hsw:
-      # TODO: Replace with 1810 data:
-      csit-ligato-perf-1807-all:
-      - 3   # full ?
-      - 4   # sel
+      csit-ligato-perf-verify-1810-3n-hsw:
+      - 5   # full
+      - 6   # sel
+      - 8   # sel
+      - 9   # sel
+      - 11  # sel
+      - 12  # sel
+      - 13  # sel
+      - 14  # sel
+      - 16  # sel
+      - 17  # sel
+      - 18  # sel
 
     plot-ligato-throughput-latency-3n-hsw:
-      # TODO: Replace with 1810 data:
-      csit-ligato-perf-1807-all:
-      - 3   # full ?
-      - 4   # sel
+      csit-ligato-perf-verify-1810-3n-hsw:
+      - 5   # full
+      - 6   # sel
+      - 8   # sel
+      - 9   # sel
+      - 11  # sel
+      - 12  # sel
+      - 13  # sel
+      - 14  # sel
+      - 16  # sel
+      - 17  # sel
+      - 18  # sel
 
     # DPDK Performance
     dpdk-performance-changes:
@@ -864,12 +883,14 @@
     - 20  # NDRPDR full
     - 21  # NDRPDR full
     - 22  # NDRPDR full
+    - 27  # NDRPDR full
     - 8   # NDRPDR sel
     - 12  # NDRPDR sel
     - 14  # NDRPDR sel
     - 18  # NDRPDR sel
     - 23  # NDRPDR sel
     - 25  # NDRPDR sel
+    - 38  # NDRPDR sel
     - 28  # WRK
     - 29  # WRK
     - 30  # WRK
@@ -975,21 +996,18 @@
     - 20  # mrr - sel
     - 21  # mrr - sel
     - 22  # mrr - sel
-    csit-ligato-perf-1804-all:
-    - 4   # full
-    - 5   # sel
+    csit-ligato-perf-verify-1810-3n-hsw:
+    - 5   # full
     - 6   # sel
-    - 7   # sel
     - 8   # sel
     - 9   # sel
-    - 10  # sel
     - 11  # sel
     - 12  # sel
     - 13  # sel
     - 14  # sel
-    csit-ligato-perf-1807-all:
-    - 3   # full ?
-    - 4   # sel
+    - 16  # sel
+    - 17  # sel
+    - 18  # sel
     csit-dpdk-perf-1804-all:
     - 4
     - 5
@@ -1134,6 +1152,7 @@
       - 18  # NDRPDR sel
       - 23  # NDRPDR sel
       - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1190,6 +1209,7 @@
       - 18  # NDRPDR sel
       - 23  # NDRPDR sel
       - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1246,6 +1266,7 @@
       - 18  # NDRPDR sel
       - 23  # NDRPDR sel
       - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1302,6 +1323,7 @@
       - 18  # NDRPDR sel
       - 23  # NDRPDR sel
       - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1326,6 +1348,7 @@
       - 18  # NDRPDR sel
       - 23  # NDRPDR sel
       - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
@@ -1364,6 +1387,7 @@
       - 18  # NDRPDR sel
       - 23  # NDRPDR sel
       - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
@@ -2366,6 +2390,7 @@
   - "throughput"
 
 # DPDK Comparison Across Testbeds 3n-hsw to 3n-skx mrr
+# NOTE: Not used in 18.10
 -
   type: "table"
   title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx mrr"