From fbd4f04d204c7052a6016fa4b694ffb2bc536955 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Fri, 23 Nov 2018 14:38:57 +0100 Subject: [PATCH] CSIT-1351: Add Denverton results to report - Add tests' configurations - Add tests' operational data Change-Id: Ie435beb5942a6525fe8f3ccbcfabd887ff98ff0a Signed-off-by: Tibor Frank --- .../vpp_mrr_configuration/index.rst | 1 + .../vpp_mrr_configuration_2n_dnv/index.rst | 12 ++ .../vpp_performance_configuration/index.rst | 1 + .../vpp_performance_configuration_2n_dnv/index.rst | 12 ++ .../vpp_performance_operational_data/index.rst | 1 + .../index.rst | 12 ++ resources/tools/presentation/generator_files.py | 14 +++ resources/tools/presentation/specification.yaml | 126 ++++++++++++++++++++- 8 files changed, 177 insertions(+), 2 deletions(-) create mode 100644 docs/report/test_configuration/vpp_mrr_configuration_2n_dnv/index.rst create mode 100644 docs/report/test_configuration/vpp_performance_configuration_2n_dnv/index.rst create mode 100644 docs/report/test_operational_data/vpp_performance_operational_data_2n_dnv/index.rst diff --git a/docs/report/test_configuration/vpp_mrr_configuration/index.rst b/docs/report/test_configuration/vpp_mrr_configuration/index.rst index ca181cee1c..a445752296 100644 --- a/docs/report/test_configuration/vpp_mrr_configuration/index.rst +++ b/docs/report/test_configuration/vpp_mrr_configuration/index.rst @@ -6,3 +6,4 @@ VPP MRR ../vpp_mrr_configuration_3n_hsw/index ../vpp_mrr_configuration_3n_skx/index ../vpp_mrr_configuration_2n_skx/index + ../vpp_mrr_configuration_2n_dnv/index diff --git a/docs/report/test_configuration/vpp_mrr_configuration_2n_dnv/index.rst b/docs/report/test_configuration/vpp_mrr_configuration_2n_dnv/index.rst new file mode 100644 index 0000000000..59a1a81f4e --- /dev/null +++ b/docs/report/test_configuration/vpp_mrr_configuration_2n_dnv/index.rst @@ -0,0 +1,12 @@ +2n-dnv +------ + +.. note:: + + Data sources for reported test configurations: + i) archived FD.io jobs test result `output files + <../../_static/archive/>`_. + +.. toctree:: + + vpp_mrr_configuration_2n_dnv diff --git a/docs/report/test_configuration/vpp_performance_configuration/index.rst b/docs/report/test_configuration/vpp_performance_configuration/index.rst index bd80a88fd1..e2df9d76bd 100644 --- a/docs/report/test_configuration/vpp_performance_configuration/index.rst +++ b/docs/report/test_configuration/vpp_performance_configuration/index.rst @@ -6,3 +6,4 @@ VPP Throughput ../vpp_performance_configuration_3n_hsw/index ../vpp_performance_configuration_3n_skx/index ../vpp_performance_configuration_2n_skx/index + ../vpp_performance_configuration_2n_dnv/index diff --git a/docs/report/test_configuration/vpp_performance_configuration_2n_dnv/index.rst b/docs/report/test_configuration/vpp_performance_configuration_2n_dnv/index.rst new file mode 100644 index 0000000000..b91dc3a114 --- /dev/null +++ b/docs/report/test_configuration/vpp_performance_configuration_2n_dnv/index.rst @@ -0,0 +1,12 @@ +2n-dnv +------ + +.. note:: + + Data sources for reported test configurations: + i) archived FD.io jobs test result `output files + <../../_static/archive/>`_. + +.. toctree:: + + vpp_performance_configuration_2n_dnv diff --git a/docs/report/test_operational_data/vpp_performance_operational_data/index.rst b/docs/report/test_operational_data/vpp_performance_operational_data/index.rst index 99737d3d45..6e21e0c74c 100644 --- a/docs/report/test_operational_data/vpp_performance_operational_data/index.rst +++ b/docs/report/test_operational_data/vpp_performance_operational_data/index.rst @@ -6,3 +6,4 @@ VPP Throughput ../vpp_performance_operational_data_3n_hsw/index ../vpp_performance_operational_data_3n_skx/index ../vpp_performance_operational_data_2n_skx/index + ../vpp_performance_operational_data_2n_dnv/index diff --git a/docs/report/test_operational_data/vpp_performance_operational_data_2n_dnv/index.rst b/docs/report/test_operational_data/vpp_performance_operational_data_2n_dnv/index.rst new file mode 100644 index 0000000000..6896478976 --- /dev/null +++ b/docs/report/test_operational_data/vpp_performance_operational_data_2n_dnv/index.rst @@ -0,0 +1,12 @@ +2n-dnv +------ + +.. note:: + + Data sources for reported test operational data: + i) archived FD.io jobs test result `output files + <../../_static/archive/>`_. + +.. toctree:: + + vpp_performance_operational_data_2n_dnv diff --git a/resources/tools/presentation/generator_files.py b/resources/tools/presentation/generator_files.py index ac3a8dbb83..3c2939e15a 100644 --- a/resources/tools/presentation/generator_files.py +++ b/resources/tools/presentation/generator_files.py @@ -114,7 +114,20 @@ def file_test_results(file_spec, input_data): suite["level"] - file_spec["data-start-level"] - 1) * len(suite["name"]))) + 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: @@ -123,4 +136,5 @@ def file_test_results(file_spec, input_data): RST_INCLUDE_TABLE.format( file_latex=tbl_file, file_html=tbl_file.split("/")[-1])) + logging.info(" Done.") diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml index 2a32b2cae2..7e2aa7e2e9 100644 --- a/resources/tools/presentation/specification.yaml +++ b/resources/tools/presentation/specification.yaml @@ -52,9 +52,11 @@ DIR[DTC,PERF,VPP,3N,HSW]: "{DIR[DTC]}/vpp_performance_configuration_3n_hsw" DIR[DTC,PERF,VPP,3N,SKX]: "{DIR[DTC]}/vpp_performance_configuration_3n_skx" DIR[DTC,PERF,VPP,2N,SKX]: "{DIR[DTC]}/vpp_performance_configuration_2n_skx" + DIR[DTC,PERF,VPP,2N,DNV]: "{DIR[DTC]}/vpp_performance_configuration_2n_dnv" DIR[DTC,MRR,VPP,3N,HSW]: "{DIR[DTC]}/vpp_mrr_configuration_3n_hsw" DIR[DTC,MRR,VPP,3N,SKX]: "{DIR[DTC]}/vpp_mrr_configuration_3n_skx" DIR[DTC,MRR,VPP,2N,SKX]: "{DIR[DTC]}/vpp_mrr_configuration_2n_skx" + DIR[DTC,MRR,VPP,2N,DNV]: "{DIR[DTC]}/vpp_mrr_configuration_2n_dnv" DIR[DTC,FUNC,VPP,UBUNTU]: "{DIR[DTC]}/vpp_functional_configuration_ubuntu" DIR[DTC,FUNC,VPP,CENTOS]: "{DIR[DTC]}/vpp_functional_configuration_centos" DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]: "{DIR[DTC]}/vpp_device_configuration_ubuntu" @@ -64,6 +66,7 @@ DIR[DTO,PERF,VPP,3N,HSW]: "{DIR[DTO]}/vpp_performance_operational_data_3n_hsw" DIR[DTO,PERF,VPP,3N,SKX]: "{DIR[DTO]}/vpp_performance_operational_data_3n_skx" DIR[DTO,PERF,VPP,2N,SKX]: "{DIR[DTO]}/vpp_performance_operational_data_2n_skx" + DIR[DTO,PERF,VPP,2N,DNV]: "{DIR[DTO]}/vpp_performance_operational_data_2n_dnv" # .css patch file to fix tables generated by Sphinx DIR[CSS_PATCH_FILE]: "{DIR[STATIC]}/theme_overrides.css" @@ -72,7 +75,6 @@ urls: URL[JENKINS,CSIT]: "https://jenkins.fd.io/view/csit/job" URL[JENKINS,HC]: "https://jenkins.fd.io/view/hc2vpp/job" - # URL[VIRL,DNV]: "http://10.30.51.28/download/denverton/intel_denverton_vpp_release_1810.tar.gz" URL[VIRL,DNV]: "http://10.30.51.28/download/denverton/1810/robot-plugin.zip" URL[NEXUS]: "https://docs.fd.io/csit" DIR[NEXUS]: "report/_static/archive" @@ -2595,6 +2597,28 @@ - "name" - "vat-history" +# Test configuration - VPP Performance Test Configs 2n-dnv +- + type: "table" + title: "Test configuration - VPP Performance Test Configs 2n-dnv" + algorithm: "table_details" + output-file-ext: ".csv" + output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_test_configuration_2n_dnv" + columns: + - + title: "Name" + data: "data name" + - + title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case" + data: "data vat-history" + rows: "generated" + data: "intel-dnv-vpp" + filter: "'NDRPDR'" + parameters: + - "parent" + - "name" + - "vat-history" + # Test Operational Data - VPP Performance Operational Data 3n-hsw - type: "table" @@ -2661,6 +2685,28 @@ - "name" - "show-run" +# Test Operational Data - VPP Performance Operational Data 2n-dnv +- + type: "table" + title: "Test Operational Data - VPP Performance Operational Data 2n-dnv" + algorithm: "table_details" + output-file-ext: ".csv" + output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_test_operational_2n_dnv" + columns: + - + title: "Name" + data: "data name" + - + title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate" + data: "data show-run" + rows: "generated" + data: "intel-dnv-vpp" + filter: "'NDRPDR'" + parameters: + - "parent" + - "name" + - "show-run" + # Detailed Test Results - VPP MRR Results 3n-hsw - type: "table" @@ -2815,6 +2861,28 @@ - "name" - "vat-history" +# Test configuration - VPP MRR Test Configs 2n-dnv +- + type: "table" + title: "Test configuration - VPP MRR Test Configs 2n-dnv" + algorithm: "table_details" + output-file-ext: ".csv" + output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_test_configuration_2n_dnv" + columns: + - + title: "Name" + data: "data name" + - + title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case" + data: "data vat-history" + rows: "generated" + data: "intel-dnv-vpp" + filter: "'MRR'" + parameters: + - "parent" + - "name" + - "vat-history" + # Detailed Test Results - VPP Functional Results - Ubuntu - type: "table" @@ -3871,6 +3939,24 @@ - "parent" data-start-level: 3 +# VPP Performance Configuration 2n-dnv +- + type: "file" + title: "VPP Performance Configuration 2n-dnv" + algorithm: "file_test_results" + output-file-ext: ".rst" + output-file: "{DIR[DTC,PERF,VPP,2N,DNVvpp_performance_configuration_2n_dnv" + file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |prein| raw:: html\n\n 
\n\n\n.. |preout| raw:: html\n\n
\n\n" + dir-tables: "{DIR[DTC,PERF,VPP,2N,DNV]}" + data: "intel-dnv-vpp" + filter: "'NDRPDR'" + parameters: + - "name" + - "doc" + - "level" + - "parent" + data-start-level: 3 + # VPP Performance Operational Data 3n-hsw - type: "file" @@ -3925,6 +4011,24 @@ - "parent" data-start-level: 3 +# VPP Performance Operational Data 2n-dnv +- + type: "file" + title: "VPP Performance Operational Data 2n-dnv" + algorithm: "file_test_results" + output-file-ext: ".rst" + output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_performance_operational_data_2n_dnv" + file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |prein| raw:: html\n\n 
\n\n\n.. |preout| raw:: html\n\n
\n\n" + dir-tables: "{DIR[DTO,PERF,VPP,2N,DNV]}" + data: "intel-dnv-vpp" + filter: "'NDRPDR'" + parameters: + - "name" + - "doc" + - "level" + - "parent" + data-start-level: 3 + # VPP MRR Results 3n-hsw - type: "file" @@ -4051,6 +4155,24 @@ - "parent" data-start-level: 3 +# VPP MRR Configuration 2n-dnv +- + type: "file" + title: "VPP MRR Configuration 2n-dnv" + algorithm: "file_test_results" + output-file-ext: ".rst" + output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_configuration_2n_dnv" + file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |prein| raw:: html\n\n 
\n\n\n.. |preout| raw:: html\n\n
\n\n" + dir-tables: "{DIR[DTC,MRR,VPP,2N,DNV]}" + data: "intel-dnv-vpp" + filter: "'MRR'" + parameters: + - "name" + - "doc" + - "level" + - "parent" + data-start-level: 3 + # VPP Functional Results - Ubuntu - type: "file" @@ -27139,4 +27261,4 @@ - "tags" layout: title: "vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa" - layout: "plot-throughput-speedup-analysis" \ No newline at end of file + layout: "plot-throughput-speedup-analysis" -- 2.16.6