aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2018-11-21 10:27:46 +0100
committerTibor Frank <tifrank@cisco.com>2018-11-21 10:40:09 +0100
commit803610d9ca0c1afd345db4d2858d4aa93a5233ed (patch)
treefb313ae1cb22f2944e2b3c0125613c652f3dfc95
parent97e1c56a90e84c6acd8743922e6b1c4899c61117 (diff)
CSIT-1351: Add Denverton results to report
Change-Id: I4c2ae4ca8ababcae07861ad253dd080b25f16279 Signed-off-by: Tibor Frank <tifrank@cisco.com>
-rw-r--r--docs/report/detailed_test_results/vpp_mrr_results_2n_dnv/index.rst3
-rw-r--r--docs/report/detailed_test_results/vpp_performance_results_2n_dnv/index.rst3
-rw-r--r--docs/report/introduction/report_history.rst5
-rw-r--r--docs/report/vpp_performance_tests/http_server_performance/index.rst2
-rw-r--r--resources/tools/presentation/generator_files.py22
-rw-r--r--resources/tools/presentation/input_data_files.py5
-rw-r--r--resources/tools/presentation/pal.py78
-rw-r--r--resources/tools/presentation/specification.yaml2
8 files changed, 68 insertions, 52 deletions
diff --git a/docs/report/detailed_test_results/vpp_mrr_results_2n_dnv/index.rst b/docs/report/detailed_test_results/vpp_mrr_results_2n_dnv/index.rst
index 25d0e45bed..1a0452a393 100644
--- a/docs/report/detailed_test_results/vpp_mrr_results_2n_dnv/index.rst
+++ b/docs/report/detailed_test_results/vpp_mrr_results_2n_dnv/index.rst
@@ -1,3 +1,6 @@
+
+.. _vpp_mrr_results_2n_dnv:
+
2n-dnv
------
diff --git a/docs/report/detailed_test_results/vpp_performance_results_2n_dnv/index.rst b/docs/report/detailed_test_results/vpp_performance_results_2n_dnv/index.rst
index 2a23979568..8d250bcd4b 100644
--- a/docs/report/detailed_test_results/vpp_performance_results_2n_dnv/index.rst
+++ b/docs/report/detailed_test_results/vpp_performance_results_2n_dnv/index.rst
@@ -1,3 +1,6 @@
+
+.. _vpp_performance_results_2n_dnv:
+
2n-dnv
------
diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst
index 7c1ecae9e2..e0c79036ab 100644
--- a/docs/report/introduction/report_history.rst
+++ b/docs/report/introduction/report_history.rst
@@ -25,6 +25,11 @@ Document History
| | a. VPP: :ref:`vpp_compare_topologies_3n-Skx_vs_2n-Skx` |
| | b. DPDK: :ref:`dpdk_compare_topologies_3n-Skx_vs_2n-Skx` |
| | |
+| | 8. Added results for Denverton: |
+| | |
+| | a. Packet throughput :ref:`vpp_performance_results_2n_dnv` |
+| | b. MRR :ref:`vpp_mrr_results_2n_dnv` |
+| | |
+---------+--------------------------------------------------------------------+
| .w46 | 1. dot1q KVM VMs vhost-user tests added to |
| | :ref:`KVM_VMs_vhost`. |
diff --git a/docs/report/vpp_performance_tests/http_server_performance/index.rst b/docs/report/vpp_performance_tests/http_server_performance/index.rst
index 58f4f44ef1..215de025ae 100644
--- a/docs/report/vpp_performance_tests/http_server_performance/index.rst
+++ b/docs/report/vpp_performance_tests/http_server_performance/index.rst
@@ -28,7 +28,7 @@
</script>
-HTTP and TCP-IP
+HTTP and TCP/IP
===============
Performance graphs are generated by multiple executions of the same
diff --git a/resources/tools/presentation/generator_files.py b/resources/tools/presentation/generator_files.py
index ef7ebea968..1247924cdf 100644
--- a/resources/tools/presentation/generator_files.py
+++ b/resources/tools/presentation/generator_files.py
@@ -108,13 +108,23 @@ def file_test_results(file_spec, input_data):
for suite_longname, suite in suites.iteritems():
if len(suite_longname.split(".")) <= file_spec["data-start-level"]:
continue
- file_handler.write("\n{0}\n{1}\n".format(
- suite["name"], get_rst_title_char(
- suite["level"] - file_spec["data-start-level"] - 1) *
- len(suite["name"])))
- file_handler.write("\n{0}\n".format(
- suite["doc"].replace('|br|', '\n\n -')))
+
+ if not ("-ndrpdr" in suite["name"] or
+ "-mrr" in suite["name"] or
+ "-func" in suite["name"] or
+ "-device" in suite["name"]):
+ file_handler.write("\n{0}\n{1}\n".format(
+ suite["name"], get_rst_title_char(
+ suite["level"] - file_spec["data-start-level"] - 1) *
+ len(suite["name"])))
+
if _tests_in_suite(suite["name"], tests):
+ file_handler.write("\n{0}\n{1}\n".format(
+ suite["name"], get_rst_title_char(
+ suite["level"] - file_spec["data-start-level"] - 1) *
+ len(suite["name"])))
+ file_handler.write("\n{0}\n".format(
+ suite["doc"].replace('|br|', '\n\n -')))
for tbl_file in table_lst:
if suite["name"] in tbl_file:
file_handler.write(
diff --git a/resources/tools/presentation/input_data_files.py b/resources/tools/presentation/input_data_files.py
index d90f113edb..a1ab2432a6 100644
--- a/resources/tools/presentation/input_data_files.py
+++ b/resources/tools/presentation/input_data_files.py
@@ -16,7 +16,6 @@ Download all data.
"""
import re
-import logging
from os import rename, mkdir
from os.path import join
@@ -182,13 +181,9 @@ def download_and_unzip_data_file(spec, job, build, pid, log):
format(job=job, sep=SEPARATOR, build=build["build"],
name=file_name))
- logging.info(new_name)
-
# Download the file from the defined source (Jenkins, logs.fd.io):
success = _download_file(url, new_name, log)
- logging.info("{}: {}".format(url, success))
-
if success and new_name.endswith(".zip"):
if not is_zipfile(new_name):
success = False
diff --git a/resources/tools/presentation/pal.py b/resources/tools/presentation/pal.py
index 211f24d4d8..72493cb0d3 100644
--- a/resources/tools/presentation/pal.py
+++ b/resources/tools/presentation/pal.py
@@ -94,45 +94,45 @@ def main():
return 1
ret_code = 1
- # try:
- env = Environment(spec.environment, args.force)
- env.set_environment()
-
- prepare_static_content(spec)
-
- data = InputData(spec)
- data.download_and_parse_data(repeat=2)
-
- generate_tables(spec, data)
- generate_plots(spec, data)
- generate_files(spec, data)
-
- if spec.output["output"] == "report":
- generate_report(args.release, spec, args.version)
- logging.info("Successfully finished.")
- elif spec.output["output"] == "CPTA":
- sys.stdout.write(generate_cpta(spec, data))
- alert = Alerting(spec)
- alert.generate_alerts()
- logging.info("Successfully finished.")
- ret_code = 0
-
- # except AlertingError as err:
- # logging.critical("Finished with an alerting error.")
- # logging.critical(repr(err))
- # except PresentationError as err:
- # logging.critical("Finished with an PAL error.")
- # logging.critical(repr(err))
- # except (KeyError, ValueError) as err:
- # logging.critical("Finished with an error.")
- # logging.critical(repr(err))
- # except Exception as err:
- # logging.critical("Finished with an unexpected error.")
- # logging.critical(repr(err))
- # finally:
- # if spec is not None:
- # clean_environment(spec.environment)
- # return ret_code
+ try:
+ env = Environment(spec.environment, args.force)
+ env.set_environment()
+
+ prepare_static_content(spec)
+
+ data = InputData(spec)
+ data.download_and_parse_data(repeat=2)
+
+ generate_tables(spec, data)
+ generate_plots(spec, data)
+ generate_files(spec, data)
+
+ if spec.output["output"] == "report":
+ generate_report(args.release, spec, args.version)
+ logging.info("Successfully finished.")
+ elif spec.output["output"] == "CPTA":
+ sys.stdout.write(generate_cpta(spec, data))
+ alert = Alerting(spec)
+ alert.generate_alerts()
+ logging.info("Successfully finished.")
+ ret_code = 0
+
+ except AlertingError as err:
+ logging.critical("Finished with an alerting error.")
+ logging.critical(repr(err))
+ except PresentationError as err:
+ logging.critical("Finished with an PAL error.")
+ logging.critical(repr(err))
+ except (KeyError, ValueError) as err:
+ logging.critical("Finished with an error.")
+ logging.critical(repr(err))
+ except Exception as err:
+ logging.critical("Finished with an unexpected error.")
+ logging.critical(repr(err))
+ finally:
+ if spec is not None:
+ clean_environment(spec.environment)
+ return ret_code
if __name__ == '__main__':
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index fc245838a0..95139a1939 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -2511,7 +2511,7 @@
-
type: "table"
title: "Detailed Test Results - VPP Performance Results 2n-dnv"
- algorithm: "table_merged_details"
+ algorithm: "table_details"
output-file-ext: ".csv"
output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
columns: