From: Tibor Frank Date: Mon, 25 Jun 2018 10:48:43 +0000 (+0200) Subject: CSIT-1124: Support multi-sample tests X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=4b0df8e7baea755e2e1a1c27a7707fb0a3f28b6e CSIT-1124: Support multi-sample tests + Store parsed MRR results as AvgStdevMetadata + Modify tables and plots to use AvgStdevMetadata Change-Id: I29bb1e492a664544e63a180055f66bb0eecfb957 Signed-off-by: Tibor Frank --- diff --git a/docs/cpta/trending/container_memif.rst b/docs/cpta/trending/container_memif.rst index 097349d3a7..ebf891e9ff 100644 --- a/docs/cpta/trending/container_memif.rst +++ b/docs/cpta/trending/container_memif.rst @@ -17,6 +17,9 @@ x520-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -34,6 +37,9 @@ x520-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -51,6 +57,9 @@ x520-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -71,6 +80,9 @@ x710-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -88,6 +100,9 @@ x710-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -105,6 +120,9 @@ x710-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -125,6 +143,9 @@ xl710-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -142,6 +163,9 @@ xl710-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -159,6 +183,9 @@ xl710-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -179,6 +206,9 @@ x520-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -196,6 +226,9 @@ x520-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -213,6 +246,9 @@ x520-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -233,6 +269,9 @@ x710-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -250,6 +289,9 @@ x710-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -267,6 +309,9 @@ x710-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -287,6 +332,9 @@ xl710-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -304,6 +352,9 @@ xl710-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -321,6 +372,9 @@ xl710-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



diff --git a/docs/cpta/trending/dpdk.rst b/docs/cpta/trending/dpdk.rst index 0d726187cf..215a485b8c 100644 --- a/docs/cpta/trending/dpdk.rst +++ b/docs/cpta/trending/dpdk.rst @@ -17,6 +17,9 @@ x520-64b .. raw:: html + Links to builds: + dpdk-ref, + csit-ref



@@ -34,6 +37,9 @@ x520-64b .. raw:: html + Links to builds: + dpdk-ref, + csit-ref



@@ -51,6 +57,9 @@ x520-64b .. raw:: html + Links to builds: + dpdk-ref, + csit-ref



@@ -71,6 +80,9 @@ x710-64b .. raw:: html + Links to builds: + dpdk-ref, + csit-ref



@@ -88,6 +100,9 @@ x710-64b .. raw:: html + Links to builds: + dpdk-ref, + csit-ref



@@ -105,6 +120,9 @@ x710-64b .. raw:: html + Links to builds: + dpdk-ref, + csit-ref



@@ -125,6 +143,9 @@ xl710-64b .. raw:: html + Links to builds: + dpdk-ref, + csit-ref



@@ -142,6 +163,9 @@ xl710-64b .. raw:: html + Links to builds: + dpdk-ref, + csit-ref



@@ -159,6 +183,9 @@ xl710-64b .. raw:: html + Links to builds: + dpdk-ref, + csit-ref



@@ -179,6 +206,9 @@ x520-imix .. raw:: html + Links to builds: + dpdk-ref, + csit-ref



@@ -196,6 +226,9 @@ x520-imix .. raw:: html + Links to builds: + dpdk-ref, + csit-ref



@@ -213,6 +246,9 @@ x520-imix .. raw:: html + Links to builds: + dpdk-ref, + csit-ref



@@ -233,6 +269,9 @@ x710-imix .. raw:: html + Links to builds: + dpdk-ref, + csit-ref



@@ -250,6 +289,9 @@ x710-imix .. raw:: html + Links to builds: + dpdk-ref, + csit-ref



@@ -267,6 +309,9 @@ x710-imix .. raw:: html + Links to builds: + dpdk-ref, + csit-ref



@@ -287,6 +332,9 @@ xl710-imix .. raw:: html + Links to builds: + dpdk-ref, + csit-ref



@@ -304,6 +352,9 @@ xl710-imix .. raw:: html + Links to builds: + dpdk-ref, + csit-ref



@@ -321,6 +372,9 @@ xl710-imix .. raw:: html + Links to builds: + dpdk-ref, + csit-ref



diff --git a/docs/cpta/trending/ip4.rst b/docs/cpta/trending/ip4.rst index 61d4841a70..2608d68d09 100644 --- a/docs/cpta/trending/ip4.rst +++ b/docs/cpta/trending/ip4.rst @@ -17,6 +17,9 @@ x520-64b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -34,6 +37,9 @@ x520-64b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -51,6 +57,9 @@ x520-64b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -71,6 +80,9 @@ x520-64b-features .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -88,6 +100,9 @@ x520-64b-features .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -105,6 +120,9 @@ x520-64b-features .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -125,6 +143,9 @@ x710-64b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -142,6 +163,9 @@ x710-64b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -159,6 +183,9 @@ x710-64b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -179,6 +206,9 @@ x710-64b-features .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -196,6 +226,9 @@ x710-64b-features .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -213,6 +246,9 @@ x710-64b-features .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -233,6 +269,9 @@ xl710-64b-base-scale-features .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -250,6 +289,9 @@ xl710-64b-base-scale-features .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -267,6 +309,9 @@ xl710-64b-base-scale-features .. raw:: html + Links to builds: + vpp-ref, + csit-ref



diff --git a/docs/cpta/trending/ip4_tunnels.rst b/docs/cpta/trending/ip4_tunnels.rst index 746499283f..5917f9f798 100644 --- a/docs/cpta/trending/ip4_tunnels.rst +++ b/docs/cpta/trending/ip4_tunnels.rst @@ -17,6 +17,9 @@ x520-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -34,6 +37,9 @@ x520-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -51,6 +57,9 @@ x520-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -71,6 +80,9 @@ x710-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -88,6 +100,9 @@ x710-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -105,6 +120,9 @@ x710-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



diff --git a/docs/cpta/trending/ip6.rst b/docs/cpta/trending/ip6.rst index 9122c1e465..69816626e4 100644 --- a/docs/cpta/trending/ip6.rst +++ b/docs/cpta/trending/ip6.rst @@ -17,6 +17,9 @@ x520-78b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -34,6 +37,9 @@ x520-78b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -51,6 +57,9 @@ x520-78b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -71,6 +80,9 @@ x710-78b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -88,6 +100,9 @@ x710-78b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -105,6 +120,9 @@ x710-78b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -125,6 +143,9 @@ xl710-78b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -142,6 +163,9 @@ xl710-78b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -159,6 +183,9 @@ xl710-78b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



diff --git a/docs/cpta/trending/ipsec.rst b/docs/cpta/trending/ipsec.rst index 6b54d3e519..d05bc0f605 100644 --- a/docs/cpta/trending/ipsec.rst +++ b/docs/cpta/trending/ipsec.rst @@ -17,6 +17,9 @@ xl710-64b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -34,6 +37,9 @@ xl710-64b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -51,6 +57,9 @@ xl710-64b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



diff --git a/docs/cpta/trending/l2.rst b/docs/cpta/trending/l2.rst index 05781537a8..b771444e3e 100644 --- a/docs/cpta/trending/l2.rst +++ b/docs/cpta/trending/l2.rst @@ -17,6 +17,9 @@ x520-64b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -34,6 +37,9 @@ x520-64b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -51,6 +57,9 @@ x520-64b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -71,6 +80,9 @@ x520-64b-features .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -88,6 +100,9 @@ x520-64b-features .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -105,6 +120,9 @@ x520-64b-features .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -125,6 +143,9 @@ x710-64b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -142,6 +163,9 @@ x710-64b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -159,6 +183,9 @@ x710-64b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -179,6 +206,9 @@ x710-64b-features .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -196,6 +226,9 @@ x710-64b-features .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -213,6 +246,9 @@ x710-64b-features .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -233,6 +269,9 @@ xl710-64b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -250,6 +289,9 @@ xl710-64b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -267,6 +309,9 @@ xl710-64b-base-scale .. raw:: html + Links to builds: + vpp-ref, + csit-ref



diff --git a/docs/cpta/trending/link_bonding.rst b/docs/cpta/trending/link_bonding.rst index e28b27768a..fc4731f15a 100644 --- a/docs/cpta/trending/link_bonding.rst +++ b/docs/cpta/trending/link_bonding.rst @@ -17,6 +17,9 @@ x520-64b .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -34,6 +37,9 @@ x520-64b .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -51,6 +57,9 @@ x520-64b .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -72,6 +81,9 @@ x520-imix .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -89,6 +101,9 @@ x520-imix .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -106,6 +121,9 @@ x520-imix .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -126,6 +144,9 @@ x710-64b .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -143,6 +164,9 @@ x710-64b .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -160,6 +184,9 @@ x710-64b .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -181,6 +208,9 @@ x710-imix .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -198,6 +228,9 @@ x710-imix .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -215,6 +248,9 @@ x710-imix .. raw:: html + Links to builds: + vpp-ref, + csit-ref



diff --git a/docs/cpta/trending/srv6.rst b/docs/cpta/trending/srv6.rst index e53d08eb93..938f7e86bd 100644 --- a/docs/cpta/trending/srv6.rst +++ b/docs/cpta/trending/srv6.rst @@ -17,6 +17,9 @@ x520-78b .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -34,6 +37,10 @@ x520-78b .. raw:: html + + Links to builds: + vpp-ref, + csit-ref



@@ -51,6 +58,9 @@ x520-78b .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -72,6 +82,9 @@ x520-imix .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -89,6 +102,9 @@ x520-imix .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -106,6 +122,9 @@ x520-imix .. raw:: html + Links to builds: + vpp-ref, + csit-ref



diff --git a/docs/cpta/trending/vm_vhost_ip4.rst b/docs/cpta/trending/vm_vhost_ip4.rst index f13d6554af..30b97bc731 100644 --- a/docs/cpta/trending/vm_vhost_ip4.rst +++ b/docs/cpta/trending/vm_vhost_ip4.rst @@ -17,6 +17,9 @@ x520-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -34,6 +37,9 @@ x520-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -51,6 +57,9 @@ x520-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -71,6 +80,9 @@ x710-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -88,6 +100,9 @@ x710-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -105,6 +120,9 @@ x710-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -125,6 +143,9 @@ x520-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -142,6 +163,9 @@ x520-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -159,6 +183,9 @@ x520-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -179,6 +206,9 @@ x710-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -196,6 +226,9 @@ x710-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -213,6 +246,9 @@ x710-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



diff --git a/docs/cpta/trending/vm_vhost_l2.rst b/docs/cpta/trending/vm_vhost_l2.rst index 4926928142..3ff316061c 100644 --- a/docs/cpta/trending/vm_vhost_l2.rst +++ b/docs/cpta/trending/vm_vhost_l2.rst @@ -17,6 +17,9 @@ x520-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -34,6 +37,9 @@ x520-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -51,6 +57,9 @@ x520-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -71,6 +80,9 @@ x710-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -88,6 +100,9 @@ x710-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -105,6 +120,9 @@ x710-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -125,6 +143,9 @@ xl710-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -142,6 +163,9 @@ xl710-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -159,6 +183,9 @@ xl710-64b-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -179,6 +206,9 @@ x520-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -196,6 +226,9 @@ x520-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -213,6 +246,9 @@ x520-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -233,6 +269,9 @@ x710-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -250,6 +289,9 @@ x710-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -267,6 +309,9 @@ x710-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -287,6 +332,9 @@ xl710-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -304,6 +352,9 @@ xl710-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



@@ -321,6 +372,9 @@ xl710-imix-base .. raw:: html + Links to builds: + vpp-ref, + csit-ref



diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py index d4ac06d09f..f96fab0f88 100644 --- a/resources/tools/presentation/generator_CPTA.py +++ b/resources/tools/presentation/generator_CPTA.py @@ -22,7 +22,6 @@ import prettytable import plotly.offline as ploff import plotly.graph_objs as plgo import plotly.exceptions as plerr -import pandas as pd from collections import OrderedDict from datetime import datetime @@ -116,23 +115,40 @@ def _generate_trending_traces(in_data, job_name, build_info, hover_text = list() xaxis = list() for idx in data_x: + date = build_info[job_name][str(idx)][0] + hover_str = ("date: {0}
" + "value: {1:,}
" + "{2}-ref: {3}
" + "csit-ref: mrr-{4}-build-{5}") if "dpdk" in job_name: - hover_text.append("dpdk-ref: {0}
csit-ref: mrr-weekly-build-{1}". - format(build_info[job_name][str(idx)][1]. - rsplit('~', 1)[0], idx)) + hover_text.append(hover_str.format( + date, + int(in_data[idx].avg), + "dpdk", + build_info[job_name][str(idx)][1]. + rsplit('~', 1)[0], + "weekly", + idx)) elif "vpp" in job_name: - hover_text.append("vpp-ref: {0}
csit-ref: mrr-daily-build-{1}". - format(build_info[job_name][str(idx)][1]. - rsplit('~', 1)[0], idx)) - date = build_info[job_name][str(idx)][0] + hover_text.append(hover_str.format( + date, + int(in_data[idx].avg), + "vpp", + build_info[job_name][str(idx)][1]. + rsplit('~', 1)[0], + "daily", + idx)) + xaxis.append(datetime(int(date[0:4]), int(date[4:6]), int(date[6:8]), int(date[9:11]), int(date[12:]))) - data_pd = pd.Series(data_y, index=xaxis) + data_pd = OrderedDict() + for key, value in zip(xaxis, data_y): + data_pd[key] = value anomaly_classification, avgs = classify_anomalies(data_pd) - anomalies = pd.Series() + anomalies = OrderedDict() anomalies_colors = list() anomalies_avgs = list() anomaly_color = { @@ -141,11 +157,10 @@ def _generate_trending_traces(in_data, job_name, build_info, "progression": 1.0 } if anomaly_classification: - for idx, item in enumerate(data_pd.items()): + for idx, (key, value) in enumerate(data_pd.iteritems()): if anomaly_classification[idx] in \ ("outlier", "regression", "progression"): - anomalies = anomalies.append(pd.Series([item[1], ], - index=[item[0], ])) + anomalies[key] = value anomalies_colors.append( anomaly_color[anomaly_classification[idx]]) anomalies_avgs.append(avgs[idx]) @@ -155,7 +170,7 @@ def _generate_trending_traces(in_data, job_name, build_info, trace_samples = plgo.Scatter( x=xaxis, - y=data_y, + y=[y.avg for y in data_y], mode='markers', line={ "width": 1 @@ -169,7 +184,7 @@ def _generate_trending_traces(in_data, job_name, build_info, "symbol": "circle", }, text=hover_text, - hoverinfo="x+y+text+name" + hoverinfo="text" ) traces = [trace_samples, ] @@ -185,7 +200,9 @@ def _generate_trending_traces(in_data, job_name, build_info, }, showlegend=False, legendgroup=name, - name='{name}-trend'.format(name=name) + name='{name}'.format(name=name), + text=["trend: {0:,}".format(int(avg)) for avg in avgs], + hoverinfo="text+name" ) traces.append(trace_trend) @@ -280,7 +297,7 @@ def _generate_all_charts(spec, input_data): chart_data[test_name] = OrderedDict() try: chart_data[test_name][int(index)] = \ - test["result"]["throughput"] + test["result"]["receive-rate"] except (KeyError, TypeError): pass @@ -289,6 +306,8 @@ def _generate_all_charts(spec, input_data): tst_lst = list() for bld in builds_dict[job_name]: itm = tst_data.get(int(bld), '') + if not isinstance(itm, str): + itm = itm.avg tst_lst.append(str(itm)) csv_tbl.append("{0},".format(tst_name) + ",".join(tst_lst) + '\n') # Generate traces: diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index 40eda7b8d9..d42c734b95 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -17,7 +17,6 @@ import logging import csv -import pandas as pd from string import replace from collections import OrderedDict @@ -185,6 +184,8 @@ def table_performance_improvements(table, input_data): """Generate the table(s) with algorithm: table_performance_improvements specified in the specification file. + # FIXME: Not used now. + :param table: Table to generate. :param input_data: Data to process. :type table: pandas.Series @@ -611,7 +612,7 @@ def table_performance_comparison_mrr(table, input_data): "cmp-data": list()} try: tbl_dict[tst_name]["ref-data"].\ - append(tst_data["result"]["throughput"]) + append(tst_data["result"]["receive-rate"].avg) except TypeError: pass # No data in output.xml for this test @@ -620,7 +621,7 @@ def table_performance_comparison_mrr(table, input_data): for tst_name, tst_data in data[job][str(build)].iteritems(): try: tbl_dict[tst_name]["cmp-data"].\ - append(tst_data["result"]["throughput"]) + append(tst_data["result"]["receive-rate"].avg) except KeyError: pass except TypeError: @@ -723,21 +724,21 @@ def table_performance_trending_dashboard(table, input_data): "data": OrderedDict()} try: tbl_dict[tst_name]["data"][str(build)] = \ - tst_data["result"]["throughput"] + tst_data["result"]["receive-rate"] except (TypeError, KeyError): pass # No data in output.xml for this test tbl_lst = list() for tst_name in tbl_dict.keys(): - if len(tbl_dict[tst_name]["data"]) < 2: + data_t = tbl_dict[tst_name]["data"] + if len(data_t) < 2: continue - data_t = pd.Series(tbl_dict[tst_name]["data"]) - classification_lst, avgs = classify_anomalies(data_t) - win_size = min(data_t.size, table["window"]) - long_win_size = min(data_t.size, table["long-trend-window"]) + win_size = min(len(data_t), table["window"]) + long_win_size = min(len(data_t), table["long-trend-window"]) + try: max_long_avg = max( [x for x in avgs[-long_win_size:-win_size] diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py index cf13237774..91c7747752 100644 --- a/resources/tools/presentation/input_data_parser.py +++ b/resources/tools/presentation/input_data_parser.py @@ -16,6 +16,7 @@ - extract data from output.xml files generated by Jenkins jobs and store in pandas' Series, - provide access to the data. +- filter the data using tags, """ import multiprocessing @@ -29,6 +30,7 @@ from robot import errors from collections import OrderedDict from string import replace from os import remove +from jumpavg.AvgStdevMetadataFactory import AvgStdevMetadataFactory from input_data_files import download_and_unzip_data_file from utils import Worker @@ -42,18 +44,21 @@ class ExecutionChecker(ResultVisitor): Performance tests: { - "metadata": { # Optional - "version": "VPP version", + "metadata": { + "generated": "Timestamp", + "version": "SUT version", "job": "Jenkins job name", "build": "Information about the build" }, "suites": { - "Suite name 1": { + "Suite long name 1": { + "name": Suite name, "doc": "Suite 1 documentation", "parent": "Suite 1 parent", "level": "Level of the suite in the suite hierarchy" } - "Suite name N": { + "Suite long name N": { + "name": Suite name, "doc": "Suite N documentation", "parent": "Suite 2 parent", "level": "Level of the suite in the suite hierarchy" @@ -66,12 +71,12 @@ class ExecutionChecker(ResultVisitor): "doc": "Test documentation" "msg": "Test message" "tags": ["tag 1", "tag 2", "tag n"], - "type": "PDR" | "NDR", - "throughput": { + "type": "PDR" | "NDR" | "TCP" | "MRR" | "BMRR", + "throughput": { # Only type: "PDR" | "NDR" "value": int, "unit": "pps" | "bps" | "percentage" }, - "latency": { + "latency": { # Only type: "PDR" | "NDR" "direction1": { "100": { "min": int, @@ -107,9 +112,15 @@ class ExecutionChecker(ResultVisitor): } } }, - "lossTolerance": "lossTolerance", # Only for PDR - "vat-history": "DUT1 and DUT2 VAT History" + "result": { # Only type: "TCP" + "value": int, + "unit": "cps" | "rps" }, + "result": { # Only type: "MRR" | "BMRR" + "receive-rate": AvgStdevMetadata, + }, + "lossTolerance": "lossTolerance", # Only type: "PDR" + "vat-history": "DUT1 and DUT2 VAT History" "show-run": "Show Run" }, "ID" { @@ -118,8 +129,8 @@ class ExecutionChecker(ResultVisitor): } } - Functional tests: + Functional tests: { "metadata": { # Optional @@ -162,7 +173,7 @@ class ExecutionChecker(ResultVisitor): REGEX_RATE = re.compile(r'^[\D\d]*FINAL_RATE:\s(\d+\.\d+)\s(\w+)') REGEX_LAT_NDR = re.compile(r'^[\D\d]*' - r'LAT_\d+%NDR:\s\[\'(-?\d+\/-?\d+/-?\d+)\',' + r'LAT_\d+%NDR:\s\[\'(-?\d+/-?\d+/-?\d+)\',' r'\s\'(-?\d+/-?\d+/-?\d+)\'\]\s\n' r'LAT_\d+%NDR:\s\[\'(-?\d+/-?\d+/-?\d+)\',' r'\s\'(-?\d+/-?\d+/-?\d+)\'\]\s\n' @@ -186,6 +197,8 @@ class ExecutionChecker(ResultVisitor): REGEX_MRR = re.compile(r'MaxReceivedRate_Results\s\[pkts/(\d*)sec\]:\s' r'tx\s(\d*),\srx\s(\d*)') + REGEX_BMRR = re.compile(r'Maximum Receive Rate Results \[(.*)\]') + def __init__(self, metadata): """Initialisation. @@ -467,7 +480,8 @@ class ExecutionChecker(ResultVisitor): test_result["status"] = test.status if test.status == "PASS" and ("NDRPDRDISC" in tags or "TCP" in tags or - "MRR" in tags): + "MRR" in tags or + "BMRR" in tags): if "NDRDISC" in tags: test_type = "NDR" elif "PDRDISC" in tags: @@ -476,6 +490,8 @@ class ExecutionChecker(ResultVisitor): test_type = "TCP" elif "MRR" in tags: test_type = "MRR" + elif "FRMOBL" in tags or "BMRR" in tags: + test_type = "BMRR" else: return @@ -509,15 +525,20 @@ class ExecutionChecker(ResultVisitor): test_result["result"]["value"] = int(groups.group(2)) test_result["result"]["unit"] = groups.group(1) - elif test_type in ("MRR", ): - groups = re.search(self.REGEX_MRR, test.message) + elif test_type in ("MRR", "BMRR"): test_result["result"] = dict() - test_result["result"]["duration"] = int(groups.group(1)) - test_result["result"]["tx"] = int(groups.group(2)) - test_result["result"]["rx"] = int(groups.group(3)) - test_result["result"]["throughput"] = int( - test_result["result"]["rx"] / - test_result["result"]["duration"]) + groups = re.search(self.REGEX_BMRR, test.message) + if groups is not None: + items_str = groups.group(1) + items_float = [float(item.strip()) for item + in items_str.split(",")] + test_result["result"]["receive-rate"] = \ + AvgStdevMetadataFactory.from_data(items_float) + else: + groups = re.search(self.REGEX_MRR, test.message) + test_result["result"]["receive-rate"] = \ + AvgStdevMetadataFactory.from_data([ + float(groups.group(3)) / float(groups.group(1)), ]) self._test_ID = test.longname.lower() self._data["tests"][self._test_ID] = test_result @@ -728,12 +749,11 @@ class InputData(object): - job name - build number - metadata - - job - - build - - vpp version + (as described in ExecutionChecker documentation) - suites + (as described in ExecutionChecker documentation) - tests - - ID: test data (as described in ExecutionChecker documentation) + (as described in ExecutionChecker documentation) """ def __init__(self, spec): @@ -1026,13 +1046,13 @@ class InputData(object): - job 1 - build 1 - - test (suite) 1 ID: + - test (or suite) 1 ID: - param 1 - param 2 ... - param n ... - - test (suite) n ID: + - test (or suite) n ID: ... ... - build n diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml index 7ee0c0c710..35b61cfcce 100644 --- a/resources/tools/presentation/specification_CPTA.yaml +++ b/resources/tools/presentation/specification_CPTA.yaml @@ -83,7 +83,7 @@ plot-layouts: - plot-cpta-vpp: + plot-cpta: title: "" autosize: False showlegend: True @@ -103,7 +103,7 @@ linewidth: 1 showgrid: True xaxis: - title: 'csit-vpp-perf-mrr-daily-master-build/vpp-build' + title: 'Date [MMDD]' type: "date" autorange: True fixedrange: False @@ -136,88 +136,17 @@ step: "month" stepmode: "backward" - step: "all" - # rangeslider: {} margin: r: 20 - # b: 200 + b: 5 t: 5 l: 70 legend: orientation: "h" - # y: -0.5 xanchor: "center" traceorder: "normal" # "grouped" does not work: bug https://github.com/plotly/plotly.js/issues/1913 tracegroupgap: 20 bordercolor: "rgb(238, 238, 238)" - # borderwidth: 1 - hoverlabel: - namelength: -1 - - plot-cpta-dpdk: - title: "" - autosize: False - showlegend: True - width: 1100 - height: 800 - yaxis: - showticklabels: True - tickformat: ".4s" - title: "Throughput [pps]" - hoverformat: ".4s" - range: [] - gridcolor: "rgb(238, 238, 238)" - linecolor: "rgb(238, 238, 238)" - showline: True - zeroline: False - tickcolor: "rgb(238, 238, 238)" - linewidth: 1 - showgrid: True - xaxis: - title: 'csit-dpdk-perf-mrr-weekly-master/dpdk-build' - type: "date" - autorange: True - fixedrange: False - showgrid: True - gridcolor: "rgb(238, 238, 238)" - showline: True - linecolor: "rgb(238, 238, 238)" - zeroline: False - linewidth: 1 - showticklabels: True - tickcolor: "rgb(238, 238, 238)" - autotick: True - tickformat: "%m%d" - rangeselector: - buttons: - - count: 14 - label: "2w" - step: "day" - stepmode: "backward" - - count: 1 - label: "1m" - step: "month" - stepmode: "backward" - - count: 2 - label: "2m" - step: "month" - stepmode: "backward" - - count: 3 - label: "3m" - step: "month" - stepmode: "backward" - - step: "all" - margin: - r: 20 - # b: 200 - t: 5 - l: 70 - legend: - orientation: "h" - # y: -0.5 - xanchor: "center" - traceorder: "normal" - tracegroupgap: 20 - bordercolor: "rgb(238, 238, 238)" hoverlabel: namelength: -1 @@ -386,7 +315,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C L2 64B Packet Throughput - Trending" output-file-name: "l2-2t2c-x520" @@ -394,7 +323,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C L2 64B Packet Throughput - Trending" output-file-name: "l2-4t4c-x520" @@ -402,7 +331,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 1T1C L2 64B Packet Throughput - Trending" output-file-name: "l2-feature-1t1c-x520" @@ -410,7 +339,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C L2 64B Packet Throughput - Trending" output-file-name: "l2-feature-2t2c-x520" @@ -418,7 +347,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C L2 64B Packet Throughput - Trending" output-file-name: "l2-feature-4t4c-x520" @@ -426,7 +355,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # L2 - xl710 @@ -436,7 +365,7 @@ filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C L2 64B Packet Throughput - Trending" output-file-name: "l2-2t2c-xl710" @@ -444,7 +373,7 @@ filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C L2 64B Packet Throughput - Trending" output-file-name: "l2-4t4c-xl710" @@ -452,7 +381,7 @@ filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # L2 - x710 @@ -462,7 +391,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C L2 64B Packet Throughput - Trending" output-file-name: "l2-2t2c-x710" @@ -470,7 +399,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C L2 64B Packet Throughput - Trending" output-file-name: "l2-4t4c-x710" @@ -478,7 +407,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 1T1C L2 64B Packet Throughput - Trending" output-file-name: "l2-feature-1t1c-x710" @@ -486,7 +415,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C L2 64B Packet Throughput - Trending" output-file-name: "l2-feature-2t2c-x710" @@ -494,7 +423,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C L2 64B Packet Throughput - Trending" output-file-name: "l2-feature-4t4c-x710" @@ -502,7 +431,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # IPv4 - x520 @@ -512,7 +441,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending" output-file-name: "ip4-2t2c-x520" @@ -520,7 +449,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending" output-file-name: "ip4-4t4c-x520" @@ -528,7 +457,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending" output-file-name: "ip4-feature-1t1c-x520" @@ -536,7 +465,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending" output-file-name: "ip4-feature-2t2c-x520" @@ -544,7 +473,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending" output-file-name: "ip4-feature-4t4c-x520" @@ -552,7 +481,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # IPv4 - xl710 @@ -562,7 +491,7 @@ filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending" output-file-name: "ip4-2t2c-xl710" @@ -570,7 +499,7 @@ filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending" output-file-name: "ip4-4t4c-xl710" @@ -578,7 +507,7 @@ filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # IPv4 - x710 @@ -588,7 +517,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending" output-file-name: "ip4-2t2c-x710" @@ -596,7 +525,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending" output-file-name: "ip4-4t4c-x710" @@ -604,7 +533,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending" output-file-name: "ip4-feature-1t1c-x710" @@ -612,7 +541,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending" output-file-name: "ip4-feature-2t2c-x710" @@ -620,7 +549,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending" output-file-name: "ip4-feature-4t4c-x710" @@ -628,7 +557,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # IPv4 Tunnels - x520 @@ -638,7 +567,7 @@ filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C IPv4 Tunnels 64B Packet Throughput - Trending" output-file-name: "ip4-tunnels-2t2c-x520" @@ -646,7 +575,7 @@ filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C IPv4 Tunnels 64B Packet Throughput - Trending" output-file-name: "ip4-tunnels-4t4c-x520" @@ -654,7 +583,7 @@ filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # IPv4 Tunnels - x710 @@ -664,7 +593,7 @@ filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C IPv4 Tunnels 64B Packet Throughput - Trending" output-file-name: "ip4-tunnels-2t2c-x710" @@ -672,7 +601,7 @@ filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C IPv4 Tunnels 64B Packet Throughput - Trending" output-file-name: "ip4-tunnels-4t4c-x710" @@ -680,7 +609,7 @@ filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # IPv6 - x520 @@ -690,7 +619,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C IPv6 78B Packet Throughput - Trending" output-file-name: "ip6-2t2c-x520" @@ -698,7 +627,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C IPv6 78B Packet Throughput - Trending" output-file-name: "ip6-4t4c-x520" @@ -706,7 +635,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # IPv6 - xl710 @@ -716,7 +645,7 @@ filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C IPv6 78B Packet Throughput - Trending" output-file-name: "ip6-2t2c-xl710" @@ -724,7 +653,7 @@ filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C IPv6 78B Packet Throughput - Trending" output-file-name: "ip6-4t4c-xl710" @@ -732,7 +661,7 @@ filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # IPv6 - x710 @@ -742,7 +671,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C IPv6 78B Packet Throughput - Trending" output-file-name: "ip6-2t2c-x710" @@ -750,7 +679,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C IPv6 78B Packet Throughput - Trending" output-file-name: "ip6-4t4c-x710" @@ -758,7 +687,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # Container memif - x520, 64B @@ -768,7 +697,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - Trending" output-file-name: "container-memif-l2-2t2c-x520" @@ -776,7 +705,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - Trending" output-file-name: "container-memif-l2-4t4c-x520" @@ -784,7 +713,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # Container memif - x520, IMIX @@ -794,7 +723,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - Trending" output-file-name: "container-memif-imix-l2-2t2c-x520" @@ -802,7 +731,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - Trending" output-file-name: "container-memif-imix-l2-4t4c-x520" @@ -810,7 +739,7 @@ filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # Container memif - xl710, 64B @@ -820,7 +749,7 @@ filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - Trending" output-file-name: "container-memif-l2-2t2c-xl710" @@ -828,7 +757,7 @@ filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - Trending" output-file-name: "container-memif-l2-4t4c-xl710" @@ -836,7 +765,7 @@ filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # Container memif - xl710, IMIX @@ -846,7 +775,7 @@ filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - Trending" output-file-name: "container-memif-imix-l2-2t2c-xl710" @@ -854,7 +783,7 @@ filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - Trending" output-file-name: "container-memif-imix-l2-4t4c-xl710" @@ -862,7 +791,7 @@ filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # Container memif - x710, 64B @@ -872,7 +801,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - Trending" output-file-name: "container-memif-l2-2t2c-x710" @@ -880,7 +809,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - Trending" output-file-name: "container-memif-l2-4t4c-x710" @@ -888,7 +817,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # Container memif - x520, IMIX @@ -898,7 +827,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - Trending" output-file-name: "container-memif-imix-l2-2t2c-x710" @@ -906,7 +835,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - Trending" output-file-name: "container-memif-imix-l2-4t4c-x710" @@ -914,7 +843,7 @@ filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # VM vhost - x520, ethip4, 64B @@ -924,7 +853,7 @@ filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C VM vhost ethip4 64B Packet Throughput - Trending" output-file-name: "vm-vhost-ethip4-2t2c-x520" @@ -932,7 +861,7 @@ filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C VM vhost ethip4 64B Packet Throughput - Trending" output-file-name: "vm-vhost-ethip4-4t4c-x520" @@ -940,7 +869,7 @@ filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # VM vhost - x520, ethip4, IMIX @@ -950,7 +879,7 @@ filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C VM vhost ethip4 IMIX Packet Throughput - Trending" output-file-name: "vm-vhost-imix-ethip4-2t2c-x520" @@ -958,7 +887,7 @@ filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C VM vhost ethip4 IMIX Packet Throughput - Trending" output-file-name: "vm-vhost-imix-ethip4-4t4c-x520" @@ -966,7 +895,7 @@ filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # VM vhost - x520, eth, 64B @@ -977,7 +906,7 @@ parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - Trending" output-file-name: "vm-vhost-eth-2t2c-x520" @@ -985,7 +914,7 @@ filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - Trending" output-file-name: "vm-vhost-eth-4t4c-x520" @@ -993,7 +922,7 @@ filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # VM vhost - x520, eth, IMIX @@ -1004,7 +933,7 @@ parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - Trending" output-file-name: "vm-vhost-imix-eth-2t2c-x520" @@ -1012,7 +941,7 @@ filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - Trending" output-file-name: "vm-vhost-imix-eth-4t4c-x520" @@ -1020,7 +949,7 @@ filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # VM vhost - xl710, eth, 64B @@ -1031,7 +960,7 @@ parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - Trending" output-file-name: "vm-vhost-eth-2t2c-xl710" @@ -1039,7 +968,7 @@ filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - Trending" output-file-name: "vm-vhost-eth-4t4c-xl710" @@ -1047,7 +976,7 @@ filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # VM vhost - xl710, eth, IMIX @@ -1058,7 +987,7 @@ parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - Trending" output-file-name: "vm-vhost-imix-eth-2t2c-xl710" @@ -1066,7 +995,7 @@ filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - Trending" output-file-name: "vm-vhost-imix-eth-4t4c-xl710" @@ -1074,7 +1003,7 @@ filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # VM vhost - x710, ethip4, 64B @@ -1084,7 +1013,7 @@ filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C VM vhost ethip4 64B Packet Throughput - Trending" output-file-name: "vm-vhost-ethip4-2t2c-x710" @@ -1092,7 +1021,7 @@ filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C VM vhost ethip4 64B Packet Throughput - Trending" output-file-name: "vm-vhost-ethip4-4t4c-x710" @@ -1100,7 +1029,7 @@ filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # VM vhost - x710, ethip4, IMIX @@ -1110,7 +1039,7 @@ filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C VM vhost ethip4 IMIX Packet Throughput - Trending" output-file-name: "vm-vhost-imix-ethip4-2t2c-x710" @@ -1118,7 +1047,7 @@ filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C VM vhost ethip4 IMIX Packet Throughput - Trending" output-file-name: "vm-vhost-imix-ethip4-4t4c-x710" @@ -1126,7 +1055,7 @@ filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # VM vhost - x710, eth, 64B @@ -1137,7 +1066,7 @@ parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - Trending" output-file-name: "vm-vhost-eth-2t2c-x710" @@ -1145,7 +1074,7 @@ filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - Trending" output-file-name: "vm-vhost-eth-4t4c-x710" @@ -1153,7 +1082,7 @@ filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # VM vhost - x710, eth, IMIX @@ -1164,7 +1093,7 @@ parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - Trending" output-file-name: "vm-vhost-imix-eth-2t2c-x710" @@ -1172,7 +1101,7 @@ filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - Trending" output-file-name: "vm-vhost-imix-eth-4t4c-x710" @@ -1180,7 +1109,7 @@ filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # IPSec @@ -1190,7 +1119,7 @@ filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C IPSec 64B Packet Throughput - Trending" output-file-name: "ipsec-2t2c-xl710" @@ -1198,7 +1127,7 @@ filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C IPSec 64B Packet Throughput - Trending" output-file-name: "ipsec-4t4c-xl710" @@ -1206,7 +1135,7 @@ filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # SRv6 - x520 @@ -1216,7 +1145,7 @@ filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '1T1C' and 'SRv6'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C SRv6 78B MRR Trending" output-file-name: "srv6-78b-2t2c-x520" @@ -1224,7 +1153,7 @@ filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '2T2C' and 'SRv6'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C SRv6 78B MRR Trending" output-file-name: "srv6-78b-4t4c-x520" @@ -1232,7 +1161,7 @@ filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '4T4C' and 'SRv6'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 1T1C SRv6 IMIX MRR Trending" output-file-name: "srv6-imix-1t1c-x520" @@ -1240,7 +1169,7 @@ filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'SRv6'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C SRv6 IMIX MRR Trending" output-file-name: "srv6-imix-2t2c-x520" @@ -1248,7 +1177,7 @@ filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'SRv6'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C SRv6 IMIX MRR Trending" output-file-name: "srv6-imix-4t4c-x520" @@ -1256,7 +1185,7 @@ filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'SRv6'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # Link Bonding - x520 @@ -1266,7 +1195,7 @@ filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C Link Bonding 64B MRR Trending" output-file-name: "lb-64b-2t2c-x520" @@ -1274,7 +1203,7 @@ filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C Link Bonding 64B MRR Trending" output-file-name: "lb-64b-4t4c-x520" @@ -1282,7 +1211,7 @@ filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 1T1C Link Bonding IMIX MRR Trending" output-file-name: "lb-imix-1t1c-x520" @@ -1290,7 +1219,7 @@ filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C Link Bonding IMIX MRR Trending" output-file-name: "lb-imix-2t2c-x520" @@ -1298,7 +1227,7 @@ filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C Link Bonding IMIX MRR Trending" output-file-name: "lb-imix-4t4c-x520" @@ -1306,7 +1235,7 @@ filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # Link Bonding - x710 @@ -1316,7 +1245,7 @@ filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C Link Bonding 64B MRR Trending" output-file-name: "lb-64b-2t2c-x710" @@ -1324,7 +1253,7 @@ filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C Link Bonding 64B MRR Trending" output-file-name: "lb-64b-4t4c-x710" @@ -1332,7 +1261,7 @@ filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 1T1C Link Bonding IMIX MRR Trending" output-file-name: "lb-imix-1t1c-x710" @@ -1340,7 +1269,7 @@ filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 2T2C Link Bonding IMIX MRR Trending" output-file-name: "lb-imix-2t2c-x710" @@ -1348,7 +1277,7 @@ filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" - title: "VPP 4T4C Link Bonding IMIX MRR Trending" output-file-name: "lb-imix-4t4c-x710" @@ -1356,7 +1285,7 @@ filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'LBOND'" parameters: - "result" - layout: "plot-cpta-vpp" + layout: "plot-cpta" # DPDK - x520 - 64B @@ -1366,7 +1295,7 @@ filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'DPDK'" parameters: - "result" - layout: "plot-cpta-dpdk" + layout: "plot-cpta" - title: "DPDK 2T2C 64B MRR Trending" output-file-name: "dpdk-64b-2t2c-x520" @@ -1374,7 +1303,7 @@ filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'DPDK'" parameters: - "result" - layout: "plot-cpta-dpdk" + layout: "plot-cpta" - title: "DPDK 4T4C 64B MRR Trending" output-file-name: "dpdk-64b-4t4c-x520" @@ -1382,7 +1311,7 @@ filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'DPDK'" parameters: - "result" - layout: "plot-cpta-dpdk" + layout: "plot-cpta" # DPDK - x710 - 64B @@ -1392,7 +1321,7 @@ filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'DPDK'" parameters: - "result" - layout: "plot-cpta-dpdk" + layout: "plot-cpta" - title: "DPDK 2T2C 64B MRR Trending" output-file-name: "dpdk-64b-2t2c-x710" @@ -1400,7 +1329,7 @@ filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'DPDK'" parameters: - "result" - layout: "plot-cpta-dpdk" + layout: "plot-cpta" - title: "DPDK 4T4C 64B MRR Trending" output-file-name: "dpdk-64b-4t4c-x710" @@ -1408,7 +1337,7 @@ filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'DPDK'" parameters: - "result" - layout: "plot-cpta-dpdk" + layout: "plot-cpta" # DPDK - xl710 - 64B @@ -1418,7 +1347,7 @@ filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'DPDK'" parameters: - "result" - layout: "plot-cpta-dpdk" + layout: "plot-cpta" - title: "DPDK 2T2C 64B MRR Trending" output-file-name: "dpdk-64b-2t2c-xl710" @@ -1426,7 +1355,7 @@ filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'DPDK'" parameters: - "result" - layout: "plot-cpta-dpdk" + layout: "plot-cpta" - title: "DPDK 4T4C 64B MRR Trending" output-file-name: "dpdk-64b-4t4c-xl710" @@ -1434,7 +1363,7 @@ filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'DPDK'" parameters: - "result" - layout: "plot-cpta-dpdk" + layout: "plot-cpta" # DPDK - x520 - IMIX @@ -1444,7 +1373,7 @@ filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'" parameters: - "result" - layout: "plot-cpta-dpdk" + layout: "plot-cpta" - title: "DPDK 2T2C IMIX MRR Trending" output-file-name: "dpdk-imix-2t2c-x520" @@ -1452,7 +1381,7 @@ filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'" parameters: - "result" - layout: "plot-cpta-dpdk" + layout: "plot-cpta" - title: "DPDK 4T4C IMIX MRR Trending" output-file-name: "dpdk-imix-4t4c-x520" @@ -1460,7 +1389,7 @@ filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'" parameters: - "result" - layout: "plot-cpta-dpdk" + layout: "plot-cpta" # DPDK - x710 - IMIX @@ -1470,7 +1399,7 @@ filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'" parameters: - "result" - layout: "plot-cpta-dpdk" + layout: "plot-cpta" - title: "DPDK 2T2C IMIX MRR Trending" output-file-name: "dpdk-imix-2t2c-x710" @@ -1478,7 +1407,7 @@ filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'" parameters: - "result" - layout: "plot-cpta-dpdk" + layout: "plot-cpta" - title: "DPDK 4T4C IMIX MRR Trending" output-file-name: "dpdk-imix-4t4c-x710" @@ -1486,7 +1415,7 @@ filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'" parameters: - "result" - layout: "plot-cpta-dpdk" + layout: "plot-cpta" # DPDK - xl710 - IMIX @@ -1496,7 +1425,7 @@ filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'" parameters: - "result" - layout: "plot-cpta-dpdk" + layout: "plot-cpta" - title: "DPDK 2T2C IMIX MRR Trending" output-file-name: "dpdk-imix-2t2c-xl710" @@ -1504,7 +1433,7 @@ filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'" parameters: - "result" - layout: "plot-cpta-dpdk" + layout: "plot-cpta" - title: "DPDK 4T4C IMIX MRR Trending" output-file-name: "dpdk-imix-4t4c-xl710" @@ -1512,4 +1441,4 @@ filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'" parameters: - "result" - layout: "plot-cpta-dpdk" + layout: "plot-cpta" diff --git a/resources/tools/presentation/utils.py b/resources/tools/presentation/utils.py index a2aa0dc071..2cc85c24d1 100644 --- a/resources/tools/presentation/utils.py +++ b/resources/tools/presentation/utils.py @@ -217,13 +217,13 @@ def classify_anomalies(data): the first value of changed average as a regression, or a progression. :param data: Full data set with unavailable samples replaced by nan. - :type data: pandas.Series + :type data: OrderedDict :returns: Classification and trend values :rtype: 2-tuple, list of strings and list of floats """ # Nan mean something went wrong. # Use 0.0 to cause that being reported as a severe regression. - bare_data = [0.0 if np.isnan(sample) else sample + bare_data = [0.0 if np.isnan(sample.avg) else sample for _, sample in data.iteritems()] # TODO: Put analogous iterator into jumpavg library. groups = BitCountingClassifier().classify(bare_data) @@ -234,9 +234,9 @@ def classify_anomalies(data): values_left = 0 avg = 0.0 for _, sample in data.iteritems(): - if np.isnan(sample): + if np.isnan(sample.avg): classification.append("outlier") - avgs.append(sample) + avgs.append(sample.avg) continue if values_left < 1 or active_group is None: values_left = 0