diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/tools/presentation/conf.py | 4 | ||||
| -rw-r--r-- | resources/tools/presentation/specification.yaml | 271 |
2 files changed, 166 insertions, 109 deletions
diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py index 5544c29f80..25d5b714a4 100644 --- a/resources/tools/presentation/conf.py +++ b/resources/tools/presentation/conf.py @@ -45,7 +45,7 @@ source_suffix = ['.rst', '.md'] master_doc = 'index' # General information about the project. -project = u'FD.io CSIT rls1807 Report' +project = u'FD.io CSIT-18.07' copyright = u'2018, FD.io' author = u'FD.io CSIT' @@ -61,6 +61,7 @@ author = u'FD.io CSIT' rst_epilog = """ .. |release-1| replace:: {prev_release} .. |srelease| replace:: {srelease} +.. |csit-release| replace:: CSIT-{csitrelease} .. |vpp-release| replace:: VPP-{vpprelease} release .. |vpp-release-1| replace:: VPP-{vpp_prev_release} release .. |dpdk-release| replace:: DPDK {dpdkrelease} @@ -97,6 +98,7 @@ rst_epilog = """ """.format(release='rls1807', prev_release='rls1804', srelease='1807', + csitrelease='18.07', vpprelease='18.07', vpp_prev_release='18.04', dpdkrelease='18.05', diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml index 35490e27b9..1f9ea61816 100644 --- a/resources/tools/presentation/specification.yaml +++ b/resources/tools/presentation/specification.yaml @@ -37,8 +37,6 @@ DIR[DTR,MRR,VPP,3N,SKX]: "{DIR[DTR]}/vpp_mrr_results_3n_skx" DIR[DTR,MRR,VPP,2N,SKX]: "{DIR[DTR]}/vpp_mrr_results_2n_skx" DIR[DTR,PERF,COT,3N,HSW]: "{DIR[DTR]}/cot_performance_results_3n_hsw" - DIR[DTR,PERF,COT,3N,SKX]: "{DIR[DTR]}/cot_performance_results_3n_skx" - DIR[DTR,PERF,COT,2N,SKX]: "{DIR[DTR]}/cot_performance_results_2n_skx" DIR[DTR,FUNC,VPP,UBUNTU]: "{DIR[DTR]}/vpp_functional_results_ubuntu" DIR[DTR,FUNC,VPP,CENTOS]: "{DIR[DTR]}/vpp_functional_results_centos" DIR[DTR,FUNC,HC]: "{DIR[DTR]}/honeycomb_functional_results" @@ -58,7 +56,9 @@ # Detailed tests operational data DIR[DTO]: "{DIR[WORKING,SRC]}/test_operational_data" - DIR[DTO,PERF,VPP]: "{DIR[DTO]}/vpp_performance_operational_data" + 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" # .css patch file to fix tables generated by Sphinx DIR[CSS_PATCH_FILE]: "{DIR[STATIC]}/theme_overrides.css" @@ -1286,10 +1286,10 @@ - type: "table" - title: "Test Operational Data - VPP Performance Operational Data" + title: "Test Operational Data - VPP Performance Operational Data 3n-hsw" algorithm: "table_merged_details" output-file-ext: ".csv" - output-file: "{DIR[DTO,PERF,VPP]}/vpp_test_operational" + output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_test_operational_3n_hsw" columns: - title: "Name" @@ -1298,8 +1298,49 @@ title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate" data: "data show-run" rows: "generated" - data: - "vpp-perf-results-3n-hsw" + data: "vpp-perf-results-3n-hsw" + filter: "not 'NDRCHK' and not 'PDRCHK'" + parameters: + - "parent" + - "name" + - "show-run" + +- + type: "table" + title: "Test Operational Data - VPP Performance Operational Data 3n-skx" + algorithm: "table_merged_details" + output-file-ext: ".csv" + output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}/vpp_test_operational_3n_skx" + 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: "vpp-perf-results-3n-skx" + filter: "not 'NDRCHK' and not 'PDRCHK'" + parameters: + - "parent" + - "name" + - "show-run" + +- + type: "table" + title: "Test Operational Data - VPP Performance Operational Data 2n-skx" + algorithm: "table_merged_details" + output-file-ext: ".csv" + output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}/vpp_test_operational_2n_skx" + 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: "vpp-perf-results-2n-skx" filter: "not 'NDRCHK' and not 'PDRCHK'" parameters: - "parent" @@ -1564,56 +1605,6 @@ - type: "table" - title: "Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-skx" - algorithm: "table_details" - output-file-ext: ".csv" - output-file: "{DIR[DTR,PERF,COT,3N,SKX]}/cot_performance_results_3n_skx" - columns: - - - title: "Name" - data: "data name" - - - title: "Documentation" - data: "data doc" - - - title: "Status" - data: "data msg" - rows: "generated" - data: "ligato-perf-results-3n-skx" - filter: "all" - parameters: - - "name" - - "parent" - - "doc" - - "msg" - -- - type: "table" - title: "Detailed Test Results - Container Orchestrated Topologies Performance Results 2n-skx" - algorithm: "table_details" - output-file-ext: ".csv" - output-file: "{DIR[DTR,PERF,COT,2N,SKX]}/cot_performance_results_2n_skx" - columns: - - - title: "Name" - data: "data name" - - - title: "Documentation" - data: "data doc" - - - title: "Status" - data: "data msg" - rows: "generated" - data: "ligato-perf-results-2n-skx" - filter: "all" - parameters: - - "name" - - "parent" - - "doc" - - "msg" - -- - type: "table" title: "Detailed Test Results - DPDK Performance Results 3n-hsw" algorithm: "table_details" output-file-ext: ".csv" @@ -1784,14 +1775,13 @@ - type: "file" - title: "VPP Performance Configuration" + title: "VPP Performance Configuration 3n-hsw" algorithm: "file_test_results" output-file-ext: ".rst" - output-file: "{DIR[DTC,PERF,VPP]}/vpp_performance_configuration" + output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_performance_configuration_3n_hsw" file-header: "\n.. |br| raw:: html\n\n <br />\n\n\n.. |prein| raw:: html\n\n <pre>\n\n\n.. |preout| raw:: html\n\n </pre>\n\n" - dir-tables: "{DIR[DTC,PERF,VPP]}" - data: - "vpp-perf-results-3n-hsw" + dir-tables: "{DIR[DTC,PERF,VPP,3N,HSW]}" + data: "vpp-perf-results-3n-hsw" filter: "not 'NDRCHK' and not 'PDRCHK'" parameters: - "name" @@ -1802,14 +1792,81 @@ - type: "file" - title: "VPP Performance Operational Data" + title: "VPP Performance Configuration 3n-skx" algorithm: "file_test_results" output-file-ext: ".rst" - output-file: "{DIR[DTO,PERF,VPP]}/vpp_performance_operational_data" + output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/vpp_performance_configuration_3n_skx" file-header: "\n.. |br| raw:: html\n\n <br />\n\n\n.. |prein| raw:: html\n\n <pre>\n\n\n.. |preout| raw:: html\n\n </pre>\n\n" - dir-tables: "{DIR[DTO,PERF,VPP]}" - data: - "vpp-perf-results-3n-hsw" + dir-tables: "{DIR[DTC,PERF,VPP,3N,SKX]}" + data: "vpp-perf-results-3n-skx" + filter: "not 'NDRCHK' and not 'PDRCHK'" + parameters: + - "name" + - "doc" + - "level" + - "parent" + data-start-level: 3 + +- + type: "file" + title: "VPP Performance Configuration 2n-skx" + algorithm: "file_test_results" + output-file-ext: ".rst" + output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_performance_configuration_2n_skx" + file-header: "\n.. |br| raw:: html\n\n <br />\n\n\n.. |prein| raw:: html\n\n <pre>\n\n\n.. |preout| raw:: html\n\n </pre>\n\n" + dir-tables: "{DIR[DTC,PERF,VPP,2N,SKX]}" + data: "vpp-perf-results-2n-skx" + filter: "not 'NDRCHK' and not 'PDRCHK'" + parameters: + - "name" + - "doc" + - "level" + - "parent" + data-start-level: 3 + +- + type: "file" + title: "VPP Performance Operational Data 3n-hsw" + algorithm: "file_test_results" + output-file-ext: ".rst" + output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_performance_operational_data_3n_hsw" + file-header: "\n.. |br| raw:: html\n\n <br />\n\n\n.. |prein| raw:: html\n\n <pre>\n\n\n.. |preout| raw:: html\n\n </pre>\n\n" + dir-tables: "{DIR[DTO,PERF,VPP,3N,HSW]}" + data: "vpp-perf-results-3n-hsw" + filter: "not 'NDRCHK' and not 'PDRCHK'" + parameters: + - "name" + - "doc" + - "level" + - "parent" + data-start-level: 3 + +- + type: "file" + title: "VPP Performance Operational Data 3n-skx" + algorithm: "file_test_results" + output-file-ext: ".rst" + output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}/vpp_performance_operational_data_3n_skx" + file-header: "\n.. |br| raw:: html\n\n <br />\n\n\n.. |prein| raw:: html\n\n <pre>\n\n\n.. |preout| raw:: html\n\n </pre>\n\n" + dir-tables: "{DIR[DTO,PERF,VPP,3N,SKX]}" + data: "vpp-perf-results-3n-skx" + filter: "not 'NDRCHK' and not 'PDRCHK'" + parameters: + - "name" + - "doc" + - "level" + - "parent" + data-start-level: 3 + +- + type: "file" + title: "VPP Performance Operational Data 2n-skx" + algorithm: "file_test_results" + output-file-ext: ".rst" + output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}/vpp_performance_operational_data_2n_skx" + file-header: "\n.. |br| raw:: html\n\n <br />\n\n\n.. |prein| raw:: html\n\n <pre>\n\n\n.. |preout| raw:: html\n\n </pre>\n\n" + dir-tables: "{DIR[DTO,PERF,VPP,2N,SKX]}" + data: "vpp-perf-results-2n-skx" filter: "not 'NDRCHK' and not 'PDRCHK'" parameters: - "name" @@ -1871,14 +1928,13 @@ - type: "file" - title: "VPP MRR Configuration" + title: "VPP MRR Configuration 3n-hsw" algorithm: "file_test_results" output-file-ext: ".rst" - output-file: "{DIR[DTC,MRR,VPP]}/vpp_mrr_configuration" + output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/vpp_mrr_configuration_3n_hsw" file-header: "\n.. |br| raw:: html\n\n <br />\n\n\n.. |prein| raw:: html\n\n <pre>\n\n\n.. |preout| raw:: html\n\n </pre>\n\n" - dir-tables: "{DIR[DTC,MRR,VPP]}" - data: - "vpp-mrr-results-3n-hsw" + dir-tables: "{DIR[DTC,MRR,VPP,3N,HSW]}" + data: "vpp-mrr-results-3n-hsw" filter: "'MRR'" parameters: - "name" @@ -1889,14 +1945,14 @@ - type: "file" - title: "VPP Functional Results - Ubuntu" + title: "VPP MRR Configuration 3n-skx" algorithm: "file_test_results" output-file-ext: ".rst" - output-file: "{DIR[DTR,FUNC,VPP,UBUNTU]}/vpp_functional_results_ubuntu" + output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}/vpp_mrr_configuration_3n_skx" file-header: "\n.. |br| raw:: html\n\n <br />\n\n\n.. |prein| raw:: html\n\n <pre>\n\n\n.. |preout| raw:: html\n\n </pre>\n\n" - dir-tables: "{DIR[DTR,FUNC,VPP,UBUNTU]}" - data: "vpp-func-results-ubuntu" - filter: "all" + dir-tables: "{DIR[DTC,MRR,VPP,3N,SKX]}" + data: "vpp-mrr-results-3n-skx" + filter: "'MRR'" parameters: - "name" - "doc" @@ -1906,15 +1962,14 @@ - type: "file" - title: "VPP Functional Results - CentOS" + title: "VPP MRR Configuration 2n-skx" algorithm: "file_test_results" output-file-ext: ".rst" - output-file: "{DIR[DTR,FUNC,VPP,CENTOS]}/vpp_functional_results_centos" + output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}/vpp_mrr_configuration_2n_skx" file-header: "\n.. |br| raw:: html\n\n <br />\n\n\n.. |prein| raw:: html\n\n <pre>\n\n\n.. |preout| raw:: html\n\n </pre>\n\n" - dir-tables: "{DIR[DTR,FUNC,VPP,CENTOS]}" - data: - "vpp-func-results-centos" - filter: "all" + dir-tables: "{DIR[DTC,MRR,VPP,2N,SKX]}" + data: "vpp-mrr-results-2n-skx" + filter: "'MRR'" parameters: - "name" - "doc" @@ -1924,30 +1979,29 @@ - type: "file" - title: "VPP Functional Configuration - Ubuntu" + title: "VPP Functional Results - Ubuntu" algorithm: "file_test_results" output-file-ext: ".rst" - output-file: "{DIR[DTC,FUNC,VPP]}/vpp_functional_configuration" + output-file: "{DIR[DTR,FUNC,VPP,UBUNTU]}/vpp_functional_results_ubuntu" file-header: "\n.. |br| raw:: html\n\n <br />\n\n\n.. |prein| raw:: html\n\n <pre>\n\n\n.. |preout| raw:: html\n\n </pre>\n\n" - dir-tables: "{DIR[DTC,FUNC,VPP]}" - data: - "vpp-func-results-ubuntu" + dir-tables: "{DIR[DTR,FUNC,VPP,UBUNTU]}" + data: "vpp-func-results-ubuntu" filter: "all" parameters: - "name" - "doc" - "level" - "parent" - data-start-level: 3 + data-start-level: 2 - type: "file" - title: "VPP Functional Configuration - CentOS" + title: "VPP Functional Results - CentOS" algorithm: "file_test_results" output-file-ext: ".rst" - output-file: "{DIR[DTC,FUNC,VPP,CENTOS]}/vpp_functional_configuration_centos" + output-file: "{DIR[DTR,FUNC,VPP,CENTOS]}/vpp_functional_results_centos" file-header: "\n.. |br| raw:: html\n\n <br />\n\n\n.. |prein| raw:: html\n\n <pre>\n\n\n.. |preout| raw:: html\n\n </pre>\n\n" - dir-tables: "{DIR[DTC,FUNC,VPP,CENTOS]}" + dir-tables: "{DIR[DTR,FUNC,VPP,CENTOS]}" data: "vpp-func-results-centos" filter: "all" @@ -1956,58 +2010,59 @@ - "doc" - "level" - "parent" - data-start-level: 3 + data-start-level: 2 - type: "file" - title: "Container Orchestrated Performance Results 3n-hsw" + title: "VPP Functional Configuration - Ubuntu" algorithm: "file_test_results" output-file-ext: ".rst" - output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw" + output-file: "{DIR[DTC,FUNC,VPP,UBUNTU]}/vpp_functional_configuration_ubuntu" file-header: "\n.. |br| raw:: html\n\n <br />\n\n\n.. |prein| raw:: html\n\n <pre>\n\n\n.. |preout| raw:: html\n\n </pre>\n\n" - dir-tables: "{DIR[DTR,PERF,COT,3N,HSW]}" - data: "ligato-perf-results-3n-hsw" + dir-tables: "{DIR[DTC,FUNC,VPP,UBUNTU]}" + data: "vpp-func-results-ubuntu" filter: "all" parameters: - "name" - "doc" - "level" - "parent" - data-start-level: 3 + data-start-level: 2 - type: "file" - title: "Container Orchestrated Performance Results 3n-skx" + title: "VPP Functional Configuration - CentOS" algorithm: "file_test_results" output-file-ext: ".rst" - output-file: "{DIR[DTR,PERF,COT,3N,SKX]}/cot_performance_results_3n_skx" + output-file: "{DIR[DTC,FUNC,VPP,CENTOS]}/vpp_functional_configuration_centos" file-header: "\n.. |br| raw:: html\n\n <br />\n\n\n.. |prein| raw:: html\n\n <pre>\n\n\n.. |preout| raw:: html\n\n </pre>\n\n" - dir-tables: "{DIR[DTR,PERF,COT,3N,SKX]}" - data: "ligato-perf-results-3n-skx" + dir-tables: "{DIR[DTC,FUNC,VPP,CENTOS]}" + data: + "vpp-func-results-centos" filter: "all" parameters: - "name" - "doc" - "level" - "parent" - data-start-level: 3 + data-start-level: 2 - type: "file" - title: "Container Orchestrated Performance Results 2n-skx" + title: "Container Orchestrated Performance Results 3n-hsw" algorithm: "file_test_results" output-file-ext: ".rst" - output-file: "{DIR[DTR,PERF,COT,2N,SKX]}/cot_performance_results_2n_skx" + output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw" file-header: "\n.. |br| raw:: html\n\n <br />\n\n\n.. |prein| raw:: html\n\n <pre>\n\n\n.. |preout| raw:: html\n\n </pre>\n\n" - dir-tables: "{DIR[DTR,PERF,COT,2N,SKX]}" - data: "ligato-perf-results-2n-skx" + dir-tables: "{DIR[DTR,PERF,COT,3N,HSW]}" + data: "ligato-perf-results-3n-hsw" filter: "all" parameters: - "name" - "doc" - "level" - "parent" - data-start-level: 2 + data-start-level: 3 - type: "file" |