From 7d7ec5e661abec4dda2546843addf1a71580e97e Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Wed, 27 Jan 2021 07:03:01 +0100 Subject: Report: Improve reconf graphs Change-Id: Ic935c946123c4dcc9daa608c523767b9aca36ef3 Signed-off-by: Tibor Frank --- resources/tools/presentation/generator_plots.py | 8 ++++++-- resources/tools/presentation/specification.yaml | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py index db130fa9b7..1f5a1a7451 100644 --- a/resources/tools/presentation/generator_plots.py +++ b/resources/tools/presentation/generator_plots.py @@ -492,15 +492,19 @@ def plot_nf_reconf_box_name(plot, input_data): col.lower().replace(u'-ndrpdr', u''). replace(u'2n1l-', u'')) + if u"ipsec" in tst_name: + show_name = u'-'.join(tst_name.split(u'-')[2:-1]) + else: + show_name = u'-'.join(tst_name.split(u'-')[3:-2]) traces.append(plgo.Box( x=[str(i + 1) + u'.'] * len(df_y[col]), - y=[y if y else None for y in df_y[col]], + y=df_y[col], name=( f"{i + 1}. " f"({nr_of_samples[i]:02d} " f"run{u's' if nr_of_samples[i] > 1 else u''}, " f"packets lost average: {mean(loss[col]):.1f}) " - f"{u'-'.join(tst_name.split(u'-')[3:-2])}" + f"{show_name}" ), hoverinfo=u"y+name" )) diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml index 81ac8d2dc6..124a69b7bd 100644 --- a/resources/tools/presentation/specification.yaml +++ b/resources/tools/presentation/specification.yaml @@ -12657,7 +12657,7 @@ - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr" - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr" layout: - title: "2n-skx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr + title: "2n-skx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr" layout: "plot-throughput" - type: "plot" @@ -19355,7 +19355,7 @@ - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr" - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr" layout: - title: "2n-clx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr + title: "2n-clx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr" layout: "plot-throughput" - type: "plot" @@ -21851,7 +21851,7 @@ - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr" - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr" layout: - title: "2n-zn2-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr + title: "2n-zn2-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr" layout: "plot-throughput" - type: "plot" -- cgit 1.2.3-korg