X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_cpta.py;h=5cc56fd9655d994dd95f4154808a5bd2e9388477;hp=7f4c050b290d2bf631543ace0c99784c58680fab;hb=3b5495d0943283e96ce5fa23c0b1f31846ca0f6f;hpb=96734fb1a33eb8dead325461a131f11b36c1bcfc diff --git a/resources/tools/presentation/generator_cpta.py b/resources/tools/presentation/generator_cpta.py index 7f4c050b29..5cc56fd965 100644 --- a/resources/tools/presentation/generator_cpta.py +++ b/resources/tools/presentation/generator_cpta.py @@ -217,9 +217,6 @@ def _generate_trending_traces(in_data, job_name, build_info, else: hover_str = hover_str.replace(u"", u"") if incl_tests == u"pdr-lat": - hover_str = hover_str.replace( - u"throughput [Mpps]", u"latency [s]" - ) hover_str = hover_str.replace(u"", u"{value:.1e}") else: hover_str = hover_str.replace(u"", u"{value:.3f}") @@ -227,7 +224,7 @@ def _generate_trending_traces(in_data, job_name, build_info, hover_str = hover_str.replace(u"[Mpps]", u"[Mcps]").\ replace(u"throughput", u"connection rate") if u"dpdk" in job_name: - hover_text.append(hover_str.format( + hover_str = hover_str.format( date=date, property=u"average" if incl_tests == u"mrr" else u"throughput", value=data_y_mpps[index], @@ -236,9 +233,9 @@ def _generate_trending_traces(in_data, job_name, build_info, test=incl_tests, period=u"weekly", build_nr=str_key, - testbed=build_info[job_name][str_key][2])) + testbed=build_info[job_name][str_key][2]) elif u"vpp" in job_name: - hover_text.append(hover_str.format( + hover_str = hover_str.format( date=date, property=u"average" if incl_tests == u"mrr" else u"throughput", value=data_y_mpps[index], @@ -247,8 +244,12 @@ def _generate_trending_traces(in_data, job_name, build_info, test=incl_tests, period=u"daily" if incl_tests == u"mrr" else u"weekly", build_nr=str_key, - testbed=build_info[job_name][str_key][2])) - + testbed=build_info[job_name][str_key][2]) + if incl_tests == u"pdr-lat": + hover_str = hover_str.replace( + u"throughput [Mpps]", u"latency [s]" + ) + hover_text.append(hover_str) xaxis.append(datetime(int(date[0:4]), int(date[4:6]), int(date[6:8]), int(date[9:11]), int(date[12:])))