X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_plots.py;h=42f450e68838835597a00fba4d35c60baabe522d;hp=30e2710d872c2f8c45d8229b99c9975516216b73;hb=7bcbdcb30d2eea8fe7e1fb60696e39abef897920;hpb=b61bb756579eaa22c35f54d3b2f8d0dffc682bbe

diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 30e2710d87..42f450e688 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -372,14 +372,6 @@ def plot_perf_box_name(plot, input_data):
     # Prepare the data for the plot
     plot_title = plot.get(u"title", u"").lower()
 
-    if u"-pdr" in plot_title:
-        ttype = u"PDR"
-    elif u"-ndr" in plot_title:
-        ttype = u"NDR"
-    else:
-        raise RuntimeError(u"Wrong title. No information about test type. Add"
-                           u"'-ndr' or '-pdr' to the test title.")
-
     if u"-gbps" in plot_title:
         value = u"gbps"
         multiplier = 1e6
@@ -394,8 +386,18 @@ def plot_perf_box_name(plot, input_data):
                 if y_vals.get(test[u"parent"], None) is None:
                     y_vals[test[u"parent"]] = list()
                 try:
-                    if test[u"type"] in (u"NDRPDR", ):
-                        test_type = u"NDRPDR"
+                    if test[u"type"] in (u"NDRPDR", u"CPS"):
+                        test_type = test[u"type"]
+
+                        if u"-pdr" in plot_title:
+                            ttype = u"PDR"
+                        elif u"-ndr" in plot_title:
+                            ttype = u"NDR"
+                        else:
+                            raise RuntimeError(
+                                u"Wrong title. No information about test type. "
+                                u"Add '-ndr' or '-pdr' to the test title."
+                            )
 
                         y_vals[test[u"parent"]].append(
                             test[value][ttype][u"LOWER"] * multiplier
@@ -475,7 +477,7 @@ def plot_perf_box_name(plot, input_data):
         # Create plot
         layout = deepcopy(plot[u"layout"])
         if layout.get(u"title", None):
-            if test_type in (u"HOSTSTACK", ):
+            if test_type in (u"HOSTSTACK", u"CPS"):
                 layout[u"title"] = f"<b>Bandwidth:</b> {layout[u'title']}"
             else:
                 layout[u"title"] = f"<b>Throughput:</b> {layout[u'title']}"
@@ -584,7 +586,7 @@ def plot_tsa_name(plot, input_data):
     y_max = list()
     nic_limit = 0
     lnk_limit = 0
-    pci_limit = plot[u"limits"][u"pci"][u"pci-g3-x8"]
+    pci_limit = 0
     for test_name, test_vals in y_vals.items():
         try:
             if test_vals[u"1"][1]:
@@ -668,49 +670,53 @@ def plot_tsa_name(plot, input_data):
         if limit > lnk_limit:
             lnk_limit = limit
 
+        if u"cx556a" in test_name:
+            limit = plot[u"limits"][u"pci"][u"pci-g3-x8"]
+        else:
+            limit = plot[u"limits"][u"pci"][u"pci-g3-x16"]
+        if limit > pci_limit:
+            pci_limit = limit
+
     traces = list()
     annotations = list()
     x_vals = [1, 2, 4]
 
     # Limits:
     if u"-gbps" not in plot_title:
-        try:
-            threshold = 1.1 * max(y_max)  # 10%
-        except ValueError as err:
-            logging.error(err)
-            return
         nic_limit /= 1e6
-        traces.append(plgo.Scatter(
-            x=x_vals,
-            y=[nic_limit, ] * len(x_vals),
-            name=f"NIC: {nic_limit:.2f}Mpps",
-            showlegend=False,
-            mode=u"lines",
-            line=dict(
-                dash=u"dot",
-                color=COLORS[-1],
-                width=1),
-            hoverinfo=u"none"
-        ))
-        annotations.append(dict(
-            x=1,
-            y=nic_limit,
-            xref=u"x",
-            yref=u"y",
-            xanchor=u"left",
-            yanchor=u"bottom",
-            text=f"NIC: {nic_limit:.2f}Mpps",
-            font=dict(
-                size=14,
-                color=COLORS[-1],
-            ),
-            align=u"left",
-            showarrow=False
-        ))
-        y_max.append(nic_limit)
-
         lnk_limit /= 1e6
-        if lnk_limit < threshold:
+        pci_limit /= 1e6
+        min_limit = min((nic_limit, lnk_limit, pci_limit))
+        if nic_limit == min_limit:
+            traces.append(plgo.Scatter(
+                x=x_vals,
+                y=[nic_limit, ] * len(x_vals),
+                name=f"NIC: {nic_limit:.2f}Mpps",
+                showlegend=False,
+                mode=u"lines",
+                line=dict(
+                    dash=u"dot",
+                    color=COLORS[-1],
+                    width=1),
+                hoverinfo=u"none"
+            ))
+            annotations.append(dict(
+                x=1,
+                y=nic_limit,
+                xref=u"x",
+                yref=u"y",
+                xanchor=u"left",
+                yanchor=u"bottom",
+                text=f"NIC: {nic_limit:.2f}Mpps",
+                font=dict(
+                    size=14,
+                    color=COLORS[-1],
+                ),
+                align=u"left",
+                showarrow=False
+            ))
+            y_max.append(nic_limit)
+        elif lnk_limit == min_limit:
             traces.append(plgo.Scatter(
                 x=x_vals,
                 y=[lnk_limit, ] * len(x_vals),
@@ -719,7 +725,7 @@ def plot_tsa_name(plot, input_data):
                 mode=u"lines",
                 line=dict(
                     dash=u"dot",
-                    color=COLORS[-2],
+                    color=COLORS[-1],
                     width=1),
                 hoverinfo=u"none"
             ))
@@ -733,16 +739,13 @@ def plot_tsa_name(plot, input_data):
                 text=f"Link: {lnk_limit:.2f}Mpps",
                 font=dict(
                     size=14,
-                    color=COLORS[-2],
+                    color=COLORS[-1],
                 ),
                 align=u"left",
                 showarrow=False
             ))
             y_max.append(lnk_limit)
-
-        pci_limit /= 1e6
-        if (pci_limit < threshold and
-                (pci_limit < lnk_limit * 0.95 or lnk_limit > lnk_limit * 1.05)):
+        elif pci_limit == min_limit:
             traces.append(plgo.Scatter(
                 x=x_vals,
                 y=[pci_limit, ] * len(x_vals),
@@ -751,7 +754,7 @@ def plot_tsa_name(plot, input_data):
                 mode=u"lines",
                 line=dict(
                     dash=u"dot",
-                    color=COLORS[-3],
+                    color=COLORS[-1],
                     width=1),
                 hoverinfo=u"none"
             ))
@@ -765,7 +768,7 @@ def plot_tsa_name(plot, input_data):
                 text=f"PCIe: {pci_limit:.2f}Mpps",
                 font=dict(
                     size=14,
-                    color=COLORS[-3],
+                    color=COLORS[-1],
                 ),
                 align=u"left",
                 showarrow=False