X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=inline;f=resources%2Ftools%2Fpresentation%2Fgenerator_plots.py;h=b6a393968d331bb3562e564bec984f492a11dd6c;hb=refs%2Fchanges%2F02%2F24902%2F4;hp=285e7ab51ddca4d098ed14c5e8fd45ca832939b9;hpb=c1335b81c08aeeb5d45af39d45ce02dc1a7d4235;p=csit.git

diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 285e7ab51d..b6a393968d 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -40,7 +40,7 @@ COLORS = [u"SkyBlue", u"Olive", u"Purple", u"Coral", u"Indigo", u"Pink",
           u"LightGreen", u"LightSeaGreen", u"LightSkyBlue", u"Maroon",
           u"MediumSeaGreen", u"SeaGreen", u"LightSlateGrey"]
 
-REGEX_NIC = re.compile(r'(\d*ge\dp\d\D*\d*)-')
+REGEX_NIC = re.compile(r'(\d*ge\dp\d\D*\d*[a-z]*)-')
 
 
 def generate_plots(spec, data):
@@ -204,6 +204,12 @@ def plot_hdrh_lat_by_percentile(plot, input_data):
             plot,
             params=[u"latency", u"throughput", u"parent", u"tags", u"type"]
         )[0][0]
+    elif plot.get(u"filter", None):
+        data = input_data.filter_data(
+            plot,
+            params=[u"latency", u"throughput", u"parent", u"tags", u"type"],
+            continue_on_error=True
+        )
     else:
         job = list(plot[u"data"].keys())[0]
         build = str(plot[u"data"][job][0])
@@ -213,6 +219,18 @@ def plot_hdrh_lat_by_percentile(plot, input_data):
         logging.error(u"No data.")
         return
 
+    desc = {
+        u"LAT0": u"No-load.",
+        u"PDR10": u"Low-load, 10% PDR.",
+        u"PDR50": u"Mid-load, 50% PDR.",
+        u"PDR90": u"High-load, 90% PDR.",
+        u"PDR": u"Full-load, 100% PDR.",
+        u"NDR10": u"Low-load, 10% NDR.",
+        u"NDR50": u"Mid-load, 50% NDR.",
+        u"NDR90": u"High-load, 90% NDR.",
+        u"NDR": u"Full-load, 100% NDR."
+    }
+
     graphs = [
         u"LAT0",
         u"PDR10",
@@ -232,24 +250,12 @@ def plot_hdrh_lat_by_percentile(plot, input_data):
                           replace(u'-ndrpdr', u'').replace(u'2n1l-', u''))
             try:
                 nic = re.search(REGEX_NIC, test[u"parent"]).group(1)
-            except IndexError:
+            except (IndexError, AttributeError, KeyError, ValueError):
                 nic = u""
-            name_link = f"{nic}-{test[u'name']}"
+            name_link = f"{nic}-{test[u'name']}".replace(u'-ndrpdr', u'')
 
             logging.info(f"    Generating the graph: {name_link}")
 
-            desc = {
-                u"LAT0": u"No-load.",
-                u"PDR10": u"Low-load, 10% PDR.",
-                u"PDR50": u"Mid-load, 50% PDR.",
-                u"PDR90": u"High-load, 90% PDR.",
-                u"PDR": u"Full-load, 100% PDR.",
-                u"NDR10": u"Low-load, 10% NDR.",
-                u"NDR50": u"Mid-load, 50% NDR.",
-                u"NDR90": u"High-load, 90% NDR.",
-                u"NDR": u"Full-load, 100% NDR."
-            }
-
             fig = plgo.Figure()
             layout = deepcopy(plot[u"layout"])