X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_plots.py;h=5c9698912ff3eee0b88a4d60e2a2a354bc940c15;hb=1629fedabe77aef4f31ca4f3fbf5f66d1ec274dd;hp=08cf1a9c30af7726036800b1b6d43cd63e33841f;hpb=704f231f80444be4b28eb565465c8ad76ab55be6;p=csit.git

diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 08cf1a9c30..5c9698912f 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):
@@ -202,7 +202,13 @@ def plot_hdrh_lat_by_percentile(plot, input_data):
     if plot.get(u"include", None):
         data = input_data.filter_tests_by_name(
             plot,
-            params=[u"latency", u"throughput", u"parent", u"tags", u"type"]
+            params=[u"name", u"latency", u"parent", u"tags", u"type"]
+        )[0][0]
+    elif plot.get(u"filter", None):
+        data = input_data.filter_data(
+            plot,
+            params=[u"name", u"latency", u"parent", u"tags", u"type"],
+            continue_on_error=True
         )[0][0]
     else:
         job = list(plot[u"data"].keys())[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",
@@ -238,18 +256,6 @@ def plot_hdrh_lat_by_percentile(plot, input_data):
 
             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"])
 
@@ -308,8 +314,8 @@ def plot_hdrh_lat_by_percentile(plot, input_data):
                            filename=file_name)
                 # Add link to the file:
                 if file_links and target_links:
-                    with open(file_links, u"a") as fw:
-                        fw.write(
+                    with open(file_links, u"a") as file_handler:
+                        file_handler.write(
                             f"- `{name_link} "
                             f"<{target_links}/{file_name.split(u'/')[-1]}>`_\n"
                         )
@@ -1019,6 +1025,8 @@ def plot_tsa_name(plot, input_data):
             limit = plot[u"limits"][u"nic"][u"xl710"]
         elif u"x553" in test_name:
             limit = plot[u"limits"][u"nic"][u"x553"]
+        elif u"cx556a" in test_name:
+            limit = plot[u"limits"][u"nic"][u"cx556a"]
         else:
             limit = 0
         if limit > nic_limit:
@@ -1048,7 +1056,7 @@ def plot_tsa_name(plot, input_data):
     except ValueError as err:
         logging.error(err)
         return
-    nic_limit /= 1000000.0
+    nic_limit /= 1e6
     traces.append(plgo.Scatter(
         x=x_vals,
         y=[nic_limit, ] * len(x_vals),
@@ -1078,7 +1086,7 @@ def plot_tsa_name(plot, input_data):
     ))
     y_max.append(nic_limit)
 
-    lnk_limit /= 1000000.0
+    lnk_limit /= 1e6
     if lnk_limit < threshold:
         traces.append(plgo.Scatter(
             x=x_vals,
@@ -1109,7 +1117,7 @@ def plot_tsa_name(plot, input_data):
         ))
         y_max.append(lnk_limit)
 
-    pci_limit /= 1000000.0
+    pci_limit /= 1e6
     if (pci_limit < threshold and
             (pci_limit < lnk_limit * 0.95 or lnk_limit > lnk_limit * 1.05)):
         traces.append(plgo.Scatter(
@@ -1324,7 +1332,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