X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_plots.py;h=cc9d880398aedc69dc5f2a60b4df561b8fcda10e;hb=1da277a02f0a34833a62c0e944ead81930fcc50d;hp=2d723145bf998f5112cd9bb0360ba3b432dd9ce0;hpb=92a8cc02adf1b8c152685c46a9f0d9413b518115;p=csit.git diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py index 2d723145bf..cc9d880398 100644 --- a/resources/tools/presentation/generator_plots.py +++ b/resources/tools/presentation/generator_plots.py @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2023 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -795,7 +795,10 @@ def plot_perf_box_name(plot, input_data): try: val_max = max(df_y[col]) if val_max: - y_max.append(int(val_max / 1e6)) + if test_type in (u"VSAP_CPS", u"VSAP_RPS"): + y_max.append(int(val_max)) + else: + y_max.append(int(val_max / 1e6)) except (ValueError, TypeError) as err: logging.error(repr(err)) continue @@ -912,8 +915,8 @@ def plot_ndrpdr_box_name(plot, input_data): ), hoverinfo=u"y+name" ) - box_points = plot.get(u"boxpoints", None) - if box_points and box_points in \ + box_points = plot.get(u"boxpoints", u"all") + if box_points in \ (u"all", u"outliers", u"suspectedoutliers", False): kwargs[u"boxpoints"] = box_points kwargs[u"jitter"] = 0.3 @@ -1021,9 +1024,8 @@ def plot_mrr_box_name(plot, input_data): name=data_names[idx], hoverinfo=u"y+name" ) - box_points = plot.get(u"boxpoints", None) - if box_points and box_points in \ - (u"all", u"outliers", u"suspectedoutliers", False): + box_points = plot.get(u"boxpoints", u"all") + if box_points in (u"all", u"outliers", u"suspectedoutliers", False): kwargs[u"boxpoints"] = box_points kwargs["jitter"] = 0.3 traces.append(plgo.Box(**kwargs)) @@ -1216,6 +1218,10 @@ def plot_tsa_name(plot, input_data): limit = plot[u"limits"][u"nic"][u"cx556a"] elif u"e810cq" in test_name: limit = plot[u"limits"][u"nic"][u"e810cq"] + elif u"e810xxv" in test_name: + limit = plot[u"limits"][u"nic"][u"e810xxv"] + elif u"e822cq" in test_name: + limit = plot[u"limits"][u"nic"][u"e822cq"] else: limit = 0 if limit > nic_limit: