From d3467a74642fc11c81533414d552a757094a8a3c Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Mon, 23 Mar 2020 14:05:58 +0100 Subject: [PATCH] Report: Add data Change-Id: I72cf83bfae9f07691157d2baee436e4021cd87dc Signed-off-by: Tibor Frank --- resources/tools/presentation/generator_tables.py | 40 +++++++++++++++++++----- resources/tools/presentation/specification.yaml | 6 ++++ 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index bdd6e22cf7..5cd3553074 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -822,8 +822,14 @@ def table_perf_comparison(table, input_data): delta, d_stdev = relative_change_stdev( data_r_mean, data_c_mean, data_r_stdev, data_c_stdev ) - item.append(round(delta)) - item.append(round(d_stdev)) + try: + item.append(round(delta)) + except ValueError: + item.append(delta) + try: + item.append(round(d_stdev)) + except ValueError: + item.append(d_stdev) if (len(item) == len(header)) and (item[-4] != u"Not tested"): tbl_lst.append(item) @@ -1115,8 +1121,14 @@ def table_perf_comparison_nic(table, input_data): delta, d_stdev = relative_change_stdev( data_r_mean, data_c_mean, data_r_stdev, data_c_stdev ) - item.append(round(delta)) - item.append(round(d_stdev)) + try: + item.append(round(delta)) + except ValueError: + item.append(delta) + try: + item.append(round(d_stdev)) + except ValueError: + item.append(d_stdev) if (len(item) == len(header)) and (item[-4] != u"Not tested"): tbl_lst.append(item) @@ -1253,8 +1265,14 @@ def table_nics_comparison(table, input_data): delta, d_stdev = relative_change_stdev( data_r_mean, data_c_mean, data_r_stdev, data_c_stdev ) - item.append(round(delta)) - item.append(round(d_stdev)) + try: + item.append(round(delta)) + except ValueError: + item.append(delta) + try: + item.append(round(d_stdev)) + except ValueError: + item.append(d_stdev) tbl_lst.append(item) # Sort the table according to the relative change @@ -1387,8 +1405,14 @@ def table_soak_vs_ndr(table, input_data): if data_r_mean and data_c_mean: delta, d_stdev = relative_change_stdev( data_r_mean, data_c_mean, data_r_stdev, data_c_stdev) - item.append(round(delta)) - item.append(round(d_stdev)) + try: + item.append(round(delta)) + except ValueError: + item.append(delta) + try: + item.append(round(d_stdev)) + except ValueError: + item.append(d_stdev) tbl_lst.append(item) # Sort the table according to the relative change diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml index ceb8c0a206..418d842746 100644 --- a/resources/tools/presentation/specification.yaml +++ b/resources/tools/presentation/specification.yaml @@ -283,6 +283,7 @@ - 56 # NDRPDR sel addition - 57 # NDRPDR sel addition - 58 # NDRPDR sel addition + - 61 # NDRPDR sel addition plot-vpp-hdrh-lat-3n-skx: csit-vpp-perf-verify-2001-3n-skx: @@ -618,6 +619,7 @@ - 56 # NDRPDR sel addition - 57 # NDRPDR sel addition - 58 # NDRPDR sel addition + - 61 # NDRPDR sel addition vpp-nic-comparison-2n-skx: csit-vpp-perf-verify-2001-2n-skx: @@ -900,6 +902,7 @@ - 56 # NDRPDR sel addition - 57 # NDRPDR sel addition - 58 # NDRPDR sel addition + - 61 # NDRPDR sel addition vpp-performance-changes-3n-skx: - "vpp-performance-changes-3n-skx-h1" - "vpp-performance-changes-3n-skx-ref" @@ -1406,6 +1409,7 @@ - 56 # NDRPDR sel addition - 57 # NDRPDR sel addition - 58 # NDRPDR sel addition + - 61 # NDRPDR sel addition vpp-compare-testbeds: - "vpp-compare-testbeds-ref" - "vpp-compare-testbeds-cmp" @@ -1622,6 +1626,7 @@ - 56 # NDRPDR sel addition - 57 # NDRPDR sel addition - 58 # NDRPDR sel addition + - 61 # NDRPDR sel addition vpp-compare-topologies-cmp: # TODO: Add the data csit-vpp-perf-verify-2001-2n-skx: @@ -2501,6 +2506,7 @@ - 56 # NDRPDR sel addition - 57 # NDRPDR sel addition - 58 # NDRPDR sel addition + - 61 # NDRPDR sel addition - 50 # MRR sel - 53 # MRR sel addition -- 2.16.6