aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2019-12-10 10:46:21 +0100
committerTibor Frank <tifrank@cisco.com>2019-12-10 10:46:21 +0100
commitf7e953e01896a70bef6da0845935da25cd3122f5 (patch)
treeea95dff3ed4dca302ddd6036761dc931ca5fb56b /resources
parent870829e027772cdad6b69794bce63f0458121f1a (diff)
Trending: Add more NFV tests
+ 10R2C, 6R4C + Tunnels Change-Id: I141fbb9cd9e975790af0e3d4dfa5f22da00fbfd9 Signed-off-by: Tibor Frank <tifrank@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/tools/presentation/generator_cpta.py10
-rw-r--r--resources/tools/presentation/specification_CPTA.yaml341
2 files changed, 210 insertions, 141 deletions
diff --git a/resources/tools/presentation/generator_cpta.py b/resources/tools/presentation/generator_cpta.py
index c9bc44c460..29eed8cf75 100644
--- a/resources/tools/presentation/generator_cpta.py
+++ b/resources/tools/presentation/generator_cpta.py
@@ -556,18 +556,18 @@ def _generate_all_charts(spec, input_data):
anomaly_classifications = dict()
- # Create the header:
+ # Create the table header:
csv_tables = dict()
for job_name in builds_dict:
if csv_tables.get(job_name, None) is None:
csv_tables[job_name] = list()
- header = u"Build Number:," + u",".join(builds_dict[job_name]) + u'\n'
+ header = f"Build Number:,{u','.join(builds_dict[job_name])}\n"
csv_tables[job_name].append(header)
build_dates = [x[0] for x in build_info[job_name].values()]
- header = u"Build Date:," + u",".join(build_dates) + u'\n'
+ header = f"Build Date:,{u','.join(build_dates)}\n"
csv_tables[job_name].append(header)
versions = [x[1] for x in build_info[job_name].values()]
- header = u"Version:," + u",".join(versions) + u'\n'
+ header = f"Version:,{u','.join(versions)}\n"
csv_tables[job_name].append(header)
for chart in spec.cpta[u"plots"]:
@@ -583,7 +583,7 @@ def _generate_all_charts(spec, input_data):
# Write the tables:
for job_name, csv_table in csv_tables.items():
- file_name = spec.cpta[u"output-file"] + u"-" + job_name + u"-trending"
+ file_name = f"{spec.cpta[u'output-file']}/{job_name}-trending"
with open(f"{file_name}.csv", u"w") as file_handler:
file_handler.writelines(csv_table)
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index cb2e6997a4..62c222ecdb 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -1689,211 +1689,280 @@
################################################################################
# NFV
- - title: "VPP 2T1C NF Service Density VNFc 64B MRR Trending 2n-skx"
+ - title: "VPP 2T1C NF Service Density VNFc IMIX MRR Trending 2n-skx"
output-file-name: "2n-skx-xxv710-imix-2t1c-vhost-chains-i40e"
data: "plot-performance-trending-vpp-nfv-2n-skx"
- filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN'"
+ filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN' and not 'VXLAN'"
groups:
- - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
- - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
- - ["4R1C", "4R2C", "4R4C"]
- - ["6R1C", "6R2C"]
- - ["8R1C", "8R2C"]
- - ["10R1C"]
+ - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+ - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+ - ["4R1C", "4R2C", "4R4C", "4R6C"]
+ - ["6R1C", "6R2C", "6R4C"]
+ - ["8R1C", "8R2C"]
+ - ["10R1C", "10R2C"]
group-names:
- - "1 Chain"
- - "2 Chains"
- - "4 Chains"
- - "6 Chains"
- - "8 Chains"
- - "10 Chains"
+ - "1 Chain"
+ - "2 Chains"
+ - "4 Chains"
+ - "6 Chains"
+ - "8 Chains"
+ - "10 Chains"
parameters:
- - "result"
- - "tags"
+ - "result"
+ - "tags"
layout: "plot-cpta"
- - title: "VPP 4T2C NF Service Density VNFc 64B MRR Trending 2n-skx"
+ - title: "VPP 4T2C NF Service Density VNFc IMIX MRR Trending 2n-skx"
output-file-name: "2n-skx-xxv710-imix-4t2c-vhost-chains-i40e"
data: "plot-performance-trending-vpp-nfv-2n-skx"
- filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN'"
+ filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN' and not 'VXLAN'"
groups:
- - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
- - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
- - ["4R1C", "4R2C", "4R4C"]
- - ["6R1C", "6R2C"]
- - ["8R1C", "8R2C"]
- - ["10R1C"]
+ - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+ - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+ - ["4R1C", "4R2C", "4R4C", "4R6C"]
+ - ["6R1C", "6R2C", "6R4C"]
+ - ["8R1C", "8R2C"]
+ - ["10R1C", "10R2C"]
group-names:
- - "1 Chain"
- - "2 Chains"
- - "4 Chains"
- - "6 Chains"
- - "8 Chains"
- - "10 Chains"
+ - "1 Chain"
+ - "2 Chains"
+ - "4 Chains"
+ - "6 Chains"
+ - "8 Chains"
+ - "10 Chains"
parameters:
- - "result"
- - "tags"
+ - "result"
+ - "tags"
layout: "plot-cpta"
- - title: "VPP 8T4C NF Service Density VNFc 64B MRR Trending 2n-skx"
+ - title: "VPP 8T4C NF Service Density VNFc IMIX MRR Trending 2n-skx"
output-file-name: "2n-skx-xxv710-imix-8t4c-vhost-chains-i40e"
data: "plot-performance-trending-vpp-nfv-2n-skx"
- filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN'"
+ filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN' and not 'VXLAN'"
groups:
- - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
- - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
- - ["4R1C", "4R2C", "4R4C"]
- - ["6R1C", "6R2C"]
- - ["8R1C", "8R2C"]
- - ["10R1C"]
+ - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+ - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+ - ["4R1C", "4R2C", "4R4C", "4R6C"]
+ - ["6R1C", "6R2C", "6R4C"]
+ - ["8R1C", "8R2C"]
+ - ["10R1C", "10R2C"]
group-names:
- - "1 Chain"
- - "2 Chains"
- - "4 Chains"
- - "6 Chains"
- - "8 Chains"
- - "10 Chains"
+ - "1 Chain"
+ - "2 Chains"
+ - "4 Chains"
+ - "6 Chains"
+ - "8 Chains"
+ - "10 Chains"
parameters:
- - "result"
- - "tags"
+ - "result"
+ - "tags"
+ layout: "plot-cpta"
+
+ - title: "VPP 2T1C NF Service Density VNFc VXLAN IMIX MRR Trending 2n-skx"
+ output-file-name: "2n-skx-xxv710-imix-2t1c-vhost-chains-vxlan-i40e"
+ data: "plot-performance-trending-vpp-nfv-2n-skx"
+ filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN' and 'VXLAN'"
+ groups:
+ - ["1R1C", ]
+ - ["2R1C", ]
+ - ["4R1C", ]
+ - ["6R1C", ]
+ - ["8R1C", ]
+ - ["10R1C", ]
+ group-names:
+ - "1 Chain"
+ - "2 Chains"
+ - "4 Chains"
+ - "6 Chains"
+ - "8 Chains"
+ - "10 Chains"
+ parameters:
+ - "result"
+ - "tags"
+ layout: "plot-cpta"
+
+ - title: "VPP 4T2C NF Service Density VNFc VXLAN IMIX MRR Trending 2n-skx"
+ output-file-name: "2n-skx-xxv710-imix-4t2c-vhost-chains-vxlan-i40e"
+ data: "plot-performance-trending-vpp-nfv-2n-skx"
+ filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN' and 'VXLAN'"
+ groups:
+ - ["1R1C", ]
+ - ["2R1C", ]
+ - ["4R1C", ]
+ - ["6R1C", ]
+ - ["8R1C", ]
+ - ["10R1C", ]
+ group-names:
+ - "1 Chain"
+ - "2 Chains"
+ - "4 Chains"
+ - "6 Chains"
+ - "8 Chains"
+ - "10 Chains"
+ parameters:
+ - "result"
+ - "tags"
layout: "plot-cpta"
- - title: "VPP 2T1C NF Service Density CNFc 64B MRR Trending 2n-skx"
+ - title: "VPP 8T4C NF Service Density VNFc VXLAN IMIX MRR Trending 2n-skx"
+ output-file-name: "2n-skx-xxv710-imix-8t4c-vhost-chains-vxlan-i40e"
+ data: "plot-performance-trending-vpp-nfv-2n-skx"
+ filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN' and 'VXLAN'"
+ groups:
+ - ["1R1C", ]
+ - ["2R1C", ]
+ - ["4R1C", ]
+ - ["6R1C", ]
+ - ["8R1C", ]
+ - ["10R1C", ]
+ group-names:
+ - "1 Chain"
+ - "2 Chains"
+ - "4 Chains"
+ - "6 Chains"
+ - "8 Chains"
+ - "10 Chains"
+ parameters:
+ - "result"
+ - "tags"
+ layout: "plot-cpta"
+
+ - title: "VPP 2T1C NF Service Density CNFc IMIX MRR Trending 2n-skx"
output-file-name: "2n-skx-xxv710-imix-2t1c-memif-chains-i40e"
data: "plot-performance-trending-vpp-nfv-2n-skx"
filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'CHAIN' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN'"
groups:
- - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
- - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
- - ["4R1C", "4R2C", "4R4C"]
- - ["6R1C", "6R2C"]
- - ["8R1C", "8R2C"]
- - ["10R1C"]
+ - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+ - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+ - ["4R1C", "4R2C", "4R4C", "4R6C"]
+ - ["6R1C", "6R2C", "6R4C"]
+ - ["8R1C", "8R2C"]
+ - ["10R1C", "10R2C"]
group-names:
- - "1 Chain"
- - "2 Chains"
- - "4 Chains"
- - "6 Chains"
- - "8 Chains"
- - "10 Chains"
+ - "1 Chain"
+ - "2 Chains"
+ - "4 Chains"
+ - "6 Chains"
+ - "8 Chains"
+ - "10 Chains"
parameters:
- - "result"
- - "tags"
+ - "result"
+ - "tags"
layout: "plot-cpta"
- - title: "VPP 4T2C NF Service Density CNFc 64B MRR Trending 2n-skx"
+ - title: "VPP 4T2C NF Service Density CNFc IMIX MRR Trending 2n-skx"
output-file-name: "2n-skx-xxv710-imix-4t2c-memif-chains-i40e"
data: "plot-performance-trending-vpp-nfv-2n-skx"
filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'CHAIN' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN'"
groups:
- - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
- - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
- - ["4R1C", "4R2C", "4R4C"]
- - ["6R1C", "6R2C"]
- - ["8R1C", "8R2C"]
- - ["10R1C"]
+ - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+ - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+ - ["4R1C", "4R2C", "4R4C", "4R6C"]
+ - ["6R1C", "6R2C", "6R4C"]
+ - ["8R1C", "8R2C"]
+ - ["10R1C", "10R2C"]
group-names:
- - "1 Chain"
- - "2 Chains"
- - "4 Chains"
- - "6 Chains"
- - "8 Chains"
- - "10 Chains"
+ - "1 Chain"
+ - "2 Chains"
+ - "4 Chains"
+ - "6 Chains"
+ - "8 Chains"
+ - "10 Chains"
parameters:
- - "result"
- - "tags"
+ - "result"
+ - "tags"
layout: "plot-cpta"
- - title: "VPP 8T4C NF Service Density CNFc 64B MRR Trending 2n-skx"
+ - title: "VPP 8T4C NF Service Density CNFc IMIX MRR Trending 2n-skx"
output-file-name: "2n-skx-xxv710-imix-8t4c-memif-chains-i40e"
data: "plot-performance-trending-vpp-nfv-2n-skx"
filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'CHAIN' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN'"
groups:
- - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
- - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
- - ["4R1C", "4R2C", "4R4C"]
- - ["6R1C", "6R2C"]
- - ["8R1C", "8R2C"]
- - ["10R1C"]
+ - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+ - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+ - ["4R1C", "4R2C", "4R4C", "4R6C"]
+ - ["6R1C", "6R2C", "6R4C"]
+ - ["8R1C", "8R2C"]
+ - ["10R1C", "10R2C"]
group-names:
- - "1 Chain"
- - "2 Chains"
- - "4 Chains"
- - "6 Chains"
- - "8 Chains"
- - "10 Chains"
+ - "1 Chain"
+ - "2 Chains"
+ - "4 Chains"
+ - "6 Chains"
+ - "8 Chains"
+ - "10 Chains"
parameters:
- - "result"
- - "tags"
+ - "result"
+ - "tags"
layout: "plot-cpta"
- - title: "VPP 2T1C NF Service Density CNFp 64B MRR Trending 2n-skx"
+ - title: "VPP 2T1C NF Service Density CNFp IMIX MRR Trending 2n-skx"
output-file-name: "2n-skx-xxv710-imix-2t1c-memif-pipelines-i40e"
data: "plot-performance-trending-vpp-nfv-2n-skx"
filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'PIPELINE' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN'"
groups:
- - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
- - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
- - ["4R1C", "4R2C", "4R4C"]
- - ["6R1C", "6R2C"]
- - ["8R1C", "8R2C"]
- - ["10R1C"]
+ - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+ - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+ - ["4R1C", "4R2C", "4R4C", "4R6C"]
+ - ["6R1C", "6R2C", "6R4C"]
+ - ["8R1C", "8R2C"]
+ - ["10R1C", "10R2C"]
group-names:
- - "1 Pipe"
- - "2 Pipes"
- - "4 Pipes"
- - "6 Pipes"
- - "8 Pipes"
- - "10 Pipes"
+ - "1 Pipe"
+ - "2 Pipes"
+ - "4 Pipes"
+ - "6 Pipes"
+ - "8 Pipes"
+ - "10 Pipes"
parameters:
- - "result"
- - "tags"
+ - "result"
+ - "tags"
layout: "plot-cpta"
- - title: "VPP 4T2C NF Service Density CNFp 64B MRR Trending 2n-skx"
+ - title: "VPP 4T2C NF Service Density CNFp IMIX MRR Trending 2n-skx"
output-file-name: "2n-skx-xxv710-imix-4t2c-memif-pipelines-i40e"
data: "plot-performance-trending-vpp-nfv-2n-skx"
filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'PIPELINE' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN'"
groups:
- - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
- - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
- - ["4R1C", "4R2C", "4R4C"]
- - ["6R1C", "6R2C"]
- - ["8R1C", "8R2C"]
- - ["10R1C"]
+ - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+ - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+ - ["4R1C", "4R2C", "4R4C", "4R6C"]
+ - ["6R1C", "6R2C", "6R4C"]
+ - ["8R1C", "8R2C"]
+ - ["10R1C", "10R2C"]
group-names:
- - "1 Pipe"
- - "2 Pipes"
- - "4 Pipes"
- - "6 Pipes"
- - "8 Pipes"
- - "10 Pipes"
+ - "1 Pipe"
+ - "2 Pipes"
+ - "4 Pipes"
+ - "6 Pipes"
+ - "8 Pipes"
+ - "10 Pipes"
parameters:
- "result"
- "tags"
layout: "plot-cpta"
- - title: "VPP 8T4C NF Service Density CNFp 64B MRR Trending 2n-skx"
+ - title: "VPP 8T4C NF Service Density CNFp IMIX MRR Trending 2n-skx"
output-file-name: "2n-skx-xxv710-imix-8t4c-memif-pipelines-i40e"
data: "plot-performance-trending-vpp-nfv-2n-skx"
filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'PIPELINE' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN'"
groups:
- - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
- - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
- - ["4R1C", "4R2C", "4R4C"]
- - ["6R1C", "6R2C"]
- - ["8R1C", "8R2C"]
- - ["10R1C"]
+ - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+ - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+ - ["4R1C", "4R2C", "4R4C", "4R6C"]
+ - ["6R1C", "6R2C", "6R4C"]
+ - ["8R1C", "8R2C"]
+ - ["10R1C", "10R2C"]
group-names:
- - "1 Pipe"
- - "2 Pipes"
- - "4 Pipes"
- - "6 Pipes"
- - "8 Pipes"
- - "10 Pipes"
+ - "1 Pipe"
+ - "2 Pipes"
+ - "4 Pipes"
+ - "6 Pipes"
+ - "8 Pipes"
+ - "10 Pipes"
parameters:
- - "result"
- - "tags"
+ - "result"
+ - "tags"
layout: "plot-cpta"
################################################################################