From: Tibor Frank <tifrank@cisco.com>
Date: Wed, 27 Jan 2021 09:54:59 +0000 (+0100)
Subject: Report: Fix reconfig graphs
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=refs%2Fchanges%2F48%2F30948%2F8

Report: Fix reconfig graphs

Change-Id: Id8d4930937e502bd8b4b54145437a9e7f668ace5
Signed-off-by: Tibor Frank <tifrank@cisco.com>
---

diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 1f5a1a7451..51b35d15f8 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -488,14 +488,12 @@ def plot_nf_reconf_box_name(plot, input_data):
     df_y = pd.DataFrame(y_vals)
     df_y.head()
     for i, col in enumerate(df_y.columns):
+
         tst_name = re.sub(REGEX_NIC, u"",
-                          col.lower().replace(u'-ndrpdr', u'').
-                          replace(u'2n1l-', u''))
+                          col.lower().replace(u'-reconf', u'').
+                          replace(u'2n1l-', u'').replace(u'2n-', u'').
+                          replace(u'testpmd', u''))
 
-        if u"ipsec" in tst_name:
-            show_name = u'-'.join(tst_name.split(u'-')[2:-1])
-        else:
-            show_name = u'-'.join(tst_name.split(u'-')[3:-2])
         traces.append(plgo.Box(
             x=[str(i + 1) + u'.'] * len(df_y[col]),
             y=df_y[col],
@@ -504,7 +502,7 @@ def plot_nf_reconf_box_name(plot, input_data):
                 f"({nr_of_samples[i]:02d} "
                 f"run{u's' if nr_of_samples[i] > 1 else u''}, "
                 f"packets lost average: {mean(loss[col]):.1f}) "
-                f"{show_name}"
+                f"{u'-'.join(tst_name.split(u'-')[2:])}"
             ),
             hoverinfo=u"y+name"
         ))
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 124a69b7bd..cd50f2ce0f 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -2494,29 +2494,7 @@
 
   builds:
 
-    csit-vpp-perf-report-iterative-2009-3n-hsw:
-      - 18  # rls2005 MRR iter env 5
-      - 9   # rls2005 NDRPDR iter env 5
-      - 10  # rls2005 NDRPDR iter env 5
-      - 11  # rls2005 NDRPDR iter env 5
-      - 12  # rls2005 NDRPDR iter env 5
-      - 13  # rls2005 NDRPDR iter env 5
-      - 14  # rls2005 NDRPDR iter env 5
-      - 15  # rls2005 NDRPDR iter env 5
-      - 16  # rls2005 NDRPDR iter env 5
-      - 17  # rls2005 NDRPDR iter env 5
-      - 19  # rls2005 NDRPDR iter env 5
-      - 23  # rls2009 MRR iter env 5
-      - 21  # rls2009 NDRPDR iter env 5
-      - 22  # rls2009 NDRPDR iter env 5
-      - 24  # rls2009 NDRPDR iter env 5
-      - 25  # rls2009 NDRPDR iter env 5
-      - 26  # rls2009 NDRPDR iter env 5
-      - 27  # rls2009 NDRPDR iter env 5
-      - 28  # rls2009 NDRPDR iter env 5
-      - 29  # rls2009 NDRPDR iter env 5
-      - 30  # rls2009 NDRPDR iter env 5
-      - 31  # rls2009 NDRPDR iter env 5
+
     csit-vpp-perf-report-iterative-2101-3n-hsw:
       - 17  # rls2009 MRR iter env 6
       - 19  # rls2009 NDRPDR iter env 6