aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2018-03-23 09:32:01 +0100
committerTibor Frank <tifrank@cisco.com>2018-03-23 10:06:34 +0100
commita09211590e3de1cb45c1ad1e0aae6fd84bf15c14 (patch)
tree71072f071d88b5e92bd283926165311b165d0bbf /resources
parent87cfc7560cc1f78a70140112a298297e2c5496b6 (diff)
CSIT-949: Data models
Change-Id: I07d0b122632c15fa07a5871dc268d654f410ef4f Signed-off-by: Tibor Frank <tifrank@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/tools/presentation/generator_CPTA.py7
-rw-r--r--resources/tools/presentation/generator_report.py6
-rw-r--r--resources/tools/presentation/specification_CPTA.yaml110
3 files changed, 115 insertions, 8 deletions
diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py
index c1b14f1f55..09d2e444ae 100644
--- a/resources/tools/presentation/generator_CPTA.py
+++ b/resources/tools/presentation/generator_CPTA.py
@@ -18,6 +18,7 @@ import datetime
import logging
import plotly.offline as ploff
import plotly.graph_objs as plgo
+import plotly.exceptions as plerr
import numpy as np
import pandas as pd
@@ -29,6 +30,7 @@ from utils import find_outliers, archive_input_data, execute_command
HTML_BUILDER = 'sphinx-build -v -c conf_cpta -a ' \
'-b html -E ' \
'-t html ' \
+ '-D version="Generated on {date}" ' \
'{working_dir} ' \
'{build_dir}/'
@@ -341,7 +343,10 @@ def _generate_chart(traces, layout, file_name):
# Create plot
logging.info(" Writing the file '{0}' ...".format(file_name))
plpl = plgo.Figure(data=traces, layout=layout)
- ploff.plot(plpl, show_link=False, auto_open=False, filename=file_name)
+ try:
+ ploff.plot(plpl, show_link=False, auto_open=False, filename=file_name)
+ except plerr.PlotlyEmptyDataError:
+ logging.warning(" No data for the plot. Skipped.")
def _generate_all_charts(spec, input_data):
diff --git a/resources/tools/presentation/generator_report.py b/resources/tools/presentation/generator_report.py
index 55ac76bd1d..6819f350b6 100644
--- a/resources/tools/presentation/generator_report.py
+++ b/resources/tools/presentation/generator_report.py
@@ -14,16 +14,12 @@
"""Report generation.
"""
-import subprocess
import logging
import datetime
-from os import makedirs, environ
-from os.path import isdir
-from shutil import copy, Error, make_archive
+from shutil import make_archive
from utils import get_files, execute_command, archive_input_data
-from errors import PresentationError
# .css file for the html format of the report
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 3ca8fd2641..61e4e0e530 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -500,9 +500,74 @@
# IPv6
- title: "VPP 1T1C IPv6 78B Packet Throughput - {period} Trending"
- output-file-name: "ip6"
+ output-file-name: "ip6-1t1c-x520"
data: "plot-performance-trending"
- filter: "'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+ 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'"
+ parameters:
+ - "result"
+ - "name"
+ periods:
+ - 1
+ - 5
+ - 30
+ layout: "plot-cpta"
+
+ - title: "VPP 2T2C IPv6 78B Packet Throughput - {period} Trending"
+ output-file-name: "ip6-2t2c-x520"
+ data: "plot-performance-trending"
+ 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'"
+ parameters:
+ - "result"
+ - "name"
+ periods:
+ - 1
+ - 5
+ - 30
+ layout: "plot-cpta"
+
+ - title: "VPP 4T4C IPv6 78B Packet Throughput - {period} Trending"
+ output-file-name: "ip6-4t4c-x520"
+ data: "plot-performance-trending"
+ 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'"
+ parameters:
+ - "result"
+ - "name"
+ periods:
+ - 1
+ - 5
+ - 30
+ layout: "plot-cpta"
+
+ - title: "VPP 1T1C IPv6 78B Packet Throughput - {period} Trending"
+ output-file-name: "ip6-1t1c-xl710"
+ data: "plot-performance-trending"
+ 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"
+ - "name"
+ periods:
+ - 1
+ - 5
+ - 30
+ layout: "plot-cpta"
+
+ - title: "VPP 2T2C IPv6 78B Packet Throughput - {period} Trending"
+ output-file-name: "ip6-2t2c-xl710"
+ data: "plot-performance-trending"
+ 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"
+ - "name"
+ periods:
+ - 1
+ - 5
+ - 30
+ layout: "plot-cpta"
+
+ - title: "VPP 4T4C IPv6 78B Packet Throughput - {period} Trending"
+ output-file-name: "ip6-4t4c-xl710"
+ data: "plot-performance-trending"
+ 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"
- "name"
@@ -712,3 +777,44 @@
- 5
- 30
layout: "plot-cpta"
+
+# IPSec
+
+ - title: "VPP 1T1C IPSec 64B Packet Throughput - {period} Trending"
+ output-file-name: "ipsec-1t1c-x520"
+ data: "plot-performance-trending"
+ filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
+ parameters:
+ - "result"
+ - "name"
+ periods:
+ - 1
+ - 5
+ - 30
+ layout: "plot-cpta"
+
+ - title: "VPP 2T2C IPSec 64B Packet Throughput - {period} Trending"
+ output-file-name: "ipsec-2t2c-x520"
+ data: "plot-performance-trending"
+ filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
+ parameters:
+ - "result"
+ - "name"
+ periods:
+ - 1
+ - 5
+ - 30
+ layout: "plot-cpta"
+
+ - title: "VPP 4T4C IPSec 64B Packet Throughput - {period} Trending"
+ output-file-name: "ipsec-4t4c-x520"
+ data: "plot-performance-trending"
+ filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
+ parameters:
+ - "result"
+ - "name"
+ periods:
+ - 1
+ - 5
+ - 30
+ layout: "plot-cpta"