From 3532ea7e201971b463e6d72ae799a7871c5b3c9f Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Wed, 23 Jan 2019 09:49:39 +0100
Subject: Report: Add CSC and VSC data

Change-Id: Ia2ebe3d0b96d0012361082d1f45b5c3853db3640
Signed-off-by: Tibor Frank <tifrank@cisco.com>
---
 resources/tools/presentation/generator_plots.py |  2 +-
 resources/tools/presentation/specification.yaml | 58 ++++++++++++++++++-------
 2 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index dd6c50d1d8..7cdcb62e1f 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -1096,7 +1096,7 @@ def plot_service_density_heatmap(plot, input_data):
     :type input_data: InputData
     """
 
-    REGEX_CN = re.compile(r'^(\d*)C(\d*)N$')
+    REGEX_CN = re.compile(r'^(\d*)R(\d*)C$')
 
     txt_chains = list()
     txt_nodes = list()
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 3b76065d36..96e8dc3c2d 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -492,13 +492,16 @@
       csit-vpp-perf-verify-master-2n-skx:
       - 207  # SOAK sel
 
-    plot-vpp-service-density-2n-skx:
+    plot-vpp-vsc-2n-skx:
       csit-vpp-perf-verify-master-2n-skx:
-      - 215
-      - 216
-      - 219
-      - 221
-      - 222
+      - 234
+
+     plot-vpp-csc-2n-skx:
+      csit-vpp-perf-verify-master-2n-skx:
+      - 226
+      - 231
+      - 233
+
     plot-vpp-throughput-latency-3n-skx:
       csit-vpp-perf-verify-1810-3n-skx:
       - 24  # NDRPDR full
@@ -1319,11 +1322,10 @@
     - 27  # NDRPDR sel
     csit-vpp-perf-verify-master-2n-skx:
     - 207  # SOAK sel
-    - 215  # SD
-    - 216  # SD
-    - 219  # SD
-    - 221  # SD
-    - 222  # SD
+    - 234  # VSC
+    - 226  # CSC
+    - 231  # CSC
+    - 233  # CSC
     csit-vpp-perf-check-1804:
     - 5   # mrr - full
     - 6   # mrr - sel
@@ -5345,20 +5347,44 @@
 # Heatmap - example
 -
   type: "plot"
-  title: "Service Density: l2sw-2n-skx-x710-64b-2t1c-base-sd-mrr"
+  title: "Service Density: l2sw-2n-skx-x710-64b-2t1c-base-vsc-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base-sd-mrr"
-  data: "plot-vpp-service-density-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base-vsc-mrr"
+  data: "plot-vpp-vsc-2n-skx"
   filter: "'NIC_Intel-X710' and
-           'SERVICE_DENSITY' and
+           'NF_DENSITY' and
+           'VM' and
+           'CHAIN' and
+           '64B' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  layout:
+    title: "<b>Network Service Density Matrix: Packet Throughput View</b>"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Service Density: l2sw-2n-skx-x710-64b-2t1c-base-csc-mrr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base-csc-mrr"
+  data: "plot-vpp-csc-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
            '64B' and
            '2T1C' and
            'MRR'"
   parameters:
   - "result"
   - "name"
-  - "parent"
   - "tags"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   layout:
-- 
cgit 1.2.3-korg