X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_plots.py;h=e7a50fc0491b39386e5ae16974f2c6f55168ced4;hb=c26ab619b300e6bf38c447c0600a5739ca46e27b;hp=d2cc9c0c5e3be51415954f19236c520907e0b6fa;hpb=b41156890e8871e8f9cd1f57cca7a6fe9ef3f3fa;p=csit.git

diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index d2cc9c0c5e..e7a50fc049 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -104,7 +104,7 @@ def plot_lat_hdrh_percentile(plot, input_data):
 
     # Prepare the data for the plot
     directions = [u"W-E", u"E-W"]
-    for test in data[0][0]:
+    for color, test in enumerate(data[0][0]):
         try:
             if test[u"type"] in (u"NDRPDR",):
                 if u"-pdr" in plot_title.lower():
@@ -144,8 +144,13 @@ def plot_lat_hdrh_percentile(plot, input_data):
                             plgo.Scatter(
                                 x=xaxis,
                                 y=yaxis,
-                                name=f"{name} ({directions[idx]})",
+                                name=name,
                                 mode=u"lines",
+                                legendgroup=name,
+                                showlegend=bool(idx),
+                                line=dict(
+                                    color=COLORS[color]
+                                ),
                                 hovertext=hovertext,
                                 hoverinfo=u"text"
                             )
@@ -217,7 +222,8 @@ def plot_lat_hdrh_bar_name(plot, input_data):
                     continue
                 name = re.sub(REGEX_NIC, u"", test[u"parent"].
                               replace(u'-ndrpdr', u'').
-                              replace(u'2n1l-', u''))
+                              replace(u'2n1l-', u'').
+                              replace(u'avf-', u''))
                 histograms = list()
                 for idx_col, direction in enumerate(
                         (u"direction1", u"direction2", )):
@@ -410,7 +416,7 @@ def plot_nf_reconf_box_name(plot, input_data):
     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''))
+                          replace(u'2n1l-', u'').replace(u'avf-', u''))
 
         traces.append(plgo.Box(
             x=[str(i + 1) + u'.'] * len(df_y[col]),
@@ -513,7 +519,7 @@ def plot_perf_box_name(plot, input_data):
     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''))
+                          replace(u'2n1l-', u'').replace(u'avf-', u''))
         traces.append(
             plgo.Box(
                 x=[str(i + 1) + u'.'] * len(df_y[col]),
@@ -633,7 +639,7 @@ def plot_lat_err_bars_name(plot, input_data):
     nr_of_samples = list()
     for key, val in y_tmp_vals.items():
         name = re.sub(REGEX_NIC, u"", key.replace(u'-ndrpdr', u'').
-                      replace(u'2n1l-', u''))
+                      replace(u'2n1l-', u'').replace(u'avf-', u''))
         x_vals.append(name)  # dir 1
         y_vals.append(mean(val[1]) if val[1] else None)
         y_mins.append(mean(val[0]) if val[0] else None)
@@ -812,7 +818,8 @@ def plot_tsa_name(plot, input_data):
                 name = re.sub(
                     REGEX_NIC,
                     u"",
-                    test_name.replace(u'-ndrpdr', u'').replace(u'2n1l-', u'')
+                    test_name.replace(u'-ndrpdr', u'').replace(u'2n1l-', u'').
+                        replace(u'avf-', u'')
                 )
                 vals[name] = OrderedDict()
                 y_val_1 = test_vals[u"1"][0] / 1000000.0