From b5e2d94901060f29dddbc3cc1c3dcf47499dd158 Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Thu, 13 Feb 2020 13:55:07 +0100
Subject: [PATCH] Report: Fixes

Change-Id: Iceb9f454b21034c0e7912692eeac402e793fef06
Signed-off-by: Tibor Frank <tifrank@cisco.com>
---
 resources/tools/presentation/generator_files.py | 3 ++-
 resources/tools/presentation/generator_plots.py | 2 +-
 resources/tools/presentation/specification.yaml | 8 ++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/resources/tools/presentation/generator_files.py b/resources/tools/presentation/generator_files.py
index d847d6a6da..4c39e6f648 100644
--- a/resources/tools/presentation/generator_files.py
+++ b/resources/tools/presentation/generator_files.py
@@ -129,7 +129,8 @@ def file_test_results(file_spec, input_data):
             if not (u"-ndrpdr" in suite[u"name"] or
                     u"-mrr" in suite[u"name"] or
                     u"-func" in suite[u"name"] or
-                    u"-device" in suite[u"name"]):
+                    u"-device" in suite[u"name"] or
+                    u"-dev" in suite[u"name"]):
                 file_handler.write(f"\n{suite[u'name']}\n{title_line}\n")
 
             if _tests_in_suite(suite[u"name"], tests):
diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 5d8654a77d..2fb4159a1f 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -1330,7 +1330,7 @@ def plot_nf_heatmap(plot, input_data):
     regex_cn = re.compile(r'^(\d*)R(\d*)C$')
     regex_test_name = re.compile(r'^.*-(\d+ch|\d+pl)-'
                                  r'(\d+mif|\d+vh)-'
-                                 r'(\d+vm\d+t|\d+dcr\d+t).*$')
+                                 r'(\d+vm\d+t|\d+dcr\d+t|\d+dcr\d+c).*$')
     vals = dict()
 
     # Transform the data
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 4a941e01b3..f4110133a0 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -557,8 +557,6 @@
 
     vpp-perf-results-3n-dnv:
       csit-vpp-perf-verify-2001-3n-dnv:
-        - 13  # NDRPDR full
-        - 15  # NDRPDR full
         - 19  # NDRPDR full
         - 20  # NDRPDR full
         - 21  # NDRPDR full
@@ -2122,8 +2120,6 @@
       - 17  # NDRPDR sel
       - 18  # NDRPDR sel
       - 11  # MRR sel
-      - 13  # NDRPDR full
-      - 15  # NDRPDR full
       - 19  # NDRPDR full
       - 20  # NDRPDR full
       - 21  # NDRPDR full
@@ -5822,7 +5818,7 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 2
+  data-start-level: 3
 
 # VPP Device Configuration - Ubuntu
 - type: "file"
@@ -5839,7 +5835,7 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 2
+  data-start-level: 3
 
 # DPDK Performance Results 3n-hsw
 - type: "file"
-- 
2.16.6