.. raw:: latex
- \begin{figure}[H]
- \centering
- \includesvg[width=0.90\textwidth]{../_tmp/src/csit_framework_documentation/csit_design_picture}
- \label{fig:csit_design_picture}
- \end{figure}
+ \begin{figure}[H]
+ \centering
+ \graphicspath{{../_tmp/src/csit_framework_documentation/}}
+ \includegraphics[width=0.90\textwidth]{csit_design_picture}
+ \label{fig:csit_design_picture}
+ \end{figure}
.. only:: html
--- /dev/null
+CSIT Framework Documentation
+============================
+
+.. toctree::
+
+ csit_design
+ csit_test_naming
+ pal_lld
+ csit_tag_description
--- /dev/null
+DPDK Performance
+================
+
+.. toctree::
+
+ overview
+ csit_release_notes
+ packet_throughput_graphs/index
+ packet_latency_graphs/index
+ test_environment
+ documentation
.. raw:: latex
\begin{figure}[H]
- \centering
- \includesvg[width=0.90\textwidth]{../_tmp/src/vpp_performance_tests/logical-2n-nic2nic}
- \label{fig:logical-2n-nic2nic}
+ \centering
+ \graphicspath{{../_tmp/src/vpp_performance_tests/}}
+ \includegraphics[width=0.90\textwidth]{logical-2n-nic2nic}
+ \label{fig:logical-2n-nic2nic}
\end{figure}
.. only:: html
.. raw:: latex
\begin{figure}[H]
- \centering
- \includesvg[width=0.90\textwidth]{../_tmp/src/vpp_performance_tests/logical-3n-nic2nic}
- \label{fig:logical-3n-nic2nic}
+ \centering
+ \graphicspath{{../_tmp/src/vpp_performance_tests/}}
+ \includegraphics[width=0.90\textwidth]{logical-3n-nic2nic}
+ \label{fig:logical-3n-nic2nic}
\end{figure}
.. only:: html
--- /dev/null
+HoneyComb Functional
+====================
+
+.. toctree::
+
+ overview
+ csit_release_notes
+ test_environment
+ documentation
nsh_sfc_functional_tests/test_environment
nsh_sfc_functional_tests/documentation
-.. only:: html
-
- .. toctree::
- :maxdepth: 2
- :caption: Detailed Results
-
- detailed_test_results/vpp_performance_results/index
- detailed_test_results/vpp_mrr_results/index
- detailed_test_results/cot_performance_results/index
- detailed_test_results/dpdk_performance_results/index
- detailed_test_results/vpp_functional_results/index
- detailed_test_results/honeycomb_functional_results/index
- detailed_test_results/nshsfc_functional_results/index
-
- .. toctree::
- :maxdepth: 2
- :caption: Test Configuration
-
- test_configuration/vpp_performance_configuration/index
- test_configuration/vpp_mrr_configuration/index
- test_configuration/cot_performance_configuration/index
- test_configuration/vpp_functional_configuration/index
-
- .. toctree::
- :maxdepth: 2
- :caption: Test Operational Data
-
- test_operational_data/vpp_performance_operational_data/index
+.. toctree::
+ :maxdepth: 2
+ :caption: Detailed Results
+
+ detailed_test_results/vpp_performance_results/index
+ detailed_test_results/vpp_mrr_results/index
+ detailed_test_results/cot_performance_results/index
+ detailed_test_results/dpdk_performance_results/index
+ detailed_test_results/vpp_functional_results/index
+ detailed_test_results/honeycomb_functional_results/index
+ detailed_test_results/nshsfc_functional_results/index
+
+.. toctree::
+ :maxdepth: 2
+ :caption: Test Configuration
+
+ test_configuration/vpp_performance_configuration/index
+ test_configuration/vpp_mrr_configuration/index
+ test_configuration/cot_performance_configuration/index
+ test_configuration/vpp_functional_configuration/index
+
+.. toctree::
+ :maxdepth: 2
+ :caption: Test Operational Data
+
+ test_operational_data/vpp_performance_operational_data/index
.. toctree::
:maxdepth: 2
--- /dev/null
+CSIT 18.07
+==========
+
+.. toctree::
+ :numbered:
+
+ introduction/index
+ vpp_performance_tests/index
+ dpdk_performance_tests/index
+ vpp_functional_tests/index
+ honeycomb_functional_tests/index
+ nsh_sfc_functional_tests/index
+ csit_framework_documentation/index
+ indices
--- /dev/null
+Introduction
+============
+
+.. toctree::
+
+ overview
+ general_notes
+ physical_testbeds
+ methodology
.. raw:: latex
\begin{figure}[H]
- \centering
- \includesvg[width=0.90\textwidth]{../_tmp/src/introduction/testbed-3n-hsw}
- \label{fig:testbed-3n-hsw}
+ \centering
+ \graphicspath{{../_tmp/src/introduction/}}
+ \includegraphics[width=0.90\textwidth]{testbed-3n-hsw}
+ \label{fig:testbed-3n-hsw}
\end{figure}
.. only:: html
.. raw:: latex
\begin{figure}[H]
- \centering
- \includesvg[width=0.90\textwidth]{../_tmp/src/introduction/testbed-3n-skx}
- \label{fig:testbed-3n-skx}
+ \centering
+ \graphicspath{{../_tmp/src/introduction/}}
+ \includegraphics[width=0.90\textwidth]{testbed-3n-skx}
+ \label{fig:testbed-3n-skx}
\end{figure}
.. only:: html
.. raw:: latex
\begin{figure}[H]
- \centering
- \includesvg[width=0.90\textwidth]{../_tmp/src/introduction/testbed-2n-skx}
- \label{fig:testbed-2n-skx}
+ \centering
+ \graphicspath{{../_tmp/src/introduction/}}
+ \includegraphics[width=0.90\textwidth]{testbed-2n-skx}
+ \label{fig:testbed-2n-skx}
\end{figure}
.. only:: html
--- /dev/null
+NSH_SFC Functional
+==================
+
+.. toctree::
+
+ overview
+ csit_release_notes
+ test_environment
+ documentation
--- /dev/null
+VPP Functional
+==============
+
+.. toctree::
+
+ overview
+ csit_release_notes
+ test_environment
+ documentation
.. raw:: latex
\begin{figure}[H]
- \centering
- \includesvg[width=0.90\textwidth]{../_tmp/src/vpp_performance_tests/logical-2n-nic2nic}
- \label{fig:logical-2n-nic2nic}
+ \centering
+ \graphicspath{{../_tmp/src/vpp_performance_tests/}}
+ \includegraphics[width=0.90\textwidth]{logical-2n-nic2nic}
+ \label{fig:logical-2n-nic2nic}
\end{figure}
.. only:: html
.. raw:: latex
\begin{figure}[H]
- \centering
- \includesvg[width=0.90\textwidth]{../_tmp/src/vpp_performance_tests/logical-3n-nic2nic}
- \label{fig:logical-3n-nic2nic}
+ \centering
+ \graphicspath{{../_tmp/src/vpp_performance_tests/}}
+ \includegraphics[width=0.90\textwidth]{logical-3n-nic2nic}
+ \label{fig:logical-3n-nic2nic}
\end{figure}
.. only:: html
.. raw:: latex
\begin{figure}[H]
- \centering
- \includesvg[width=0.90\textwidth]{../_tmp/src/vpp_performance_tests/logical-2n-vm-vhost}
- \label{fig:logical-2n-vm-vhost}
+ \centering
+ \graphicspath{{../_tmp/src/vpp_performance_tests/}}
+ \includegraphics[width=0.90\textwidth]{logical-2n-vm-vhost}
+ \label{fig:logical-2n-vm-vhost}
\end{figure}
.. only:: html
.. raw:: latex
\begin{figure}[H]
- \centering
- \includesvg[width=0.90\textwidth]{../_tmp/src/vpp_performance_tests/logical-3n-vm-vhost}
- \label{fig:logical-3n-vm-vhost}
+ \centering
+ \graphicspath{{../_tmp/src/vpp_performance_tests/}}
+ \includegraphics[width=0.90\textwidth]{logical-3n-vm-vhost}
+ \label{fig:logical-3n-vm-vhost}
\end{figure}
.. only:: html
--- /dev/null
+VPP Performance
+===============
+
+.. toctree::
+
+ overview
+ csit_release_notes
+ packet_throughput_graphs/index
+ throughput_speedup_multi_core/index
+ packet_latency_graphs/index
+ http_server_performance/index
+ test_environment
+ documentation/index
.. raw:: latex
\begin{figure}[H]
- \centering
- \includesvg[width=0.90\textwidth]{../_tmp/src/vpp_performance_tests/logical-2n-nic2nic}
- \label{fig:logical-2n-nic2nic}
+ \centering
+ \graphicspath{{../_tmp/src/vpp_performance_tests/}}
+ \includegraphics[width=0.90\textwidth]{logical-2n-nic2nic}
+ \label{fig:logical-2n-nic2nic}
\end{figure}
.. only:: html
.. raw:: latex
\begin{figure}[H]
- \centering
- \includesvg[width=0.90\textwidth]{../_tmp/src/vpp_performance_tests/logical-3n-nic2nic}
- \label{fig:logical-3n-nic2nic}
+ \centering
+ \graphicspath{{../_tmp/src/vpp_performance_tests/}}
+ \includegraphics[width=0.90\textwidth]{logical-3n-nic2nic}
+ \label{fig:logical-3n-nic2nic}
\end{figure}
.. only:: html
.. raw:: latex
\begin{figure}[H]
- \centering
- \includesvg[width=0.90\textwidth]{../_tmp/src/vpp_performance_tests/logical-2n-vm-vhost}
- \label{fig:logical-2n-vm-vhost}
+ \centering
+ \graphicspath{{../_tmp/src/vpp_performance_tests/}}
+ \includegraphics[width=0.90\textwidth]{logical-2n-vm-vhost}
+ \label{fig:logical-2n-vm-vhost}
\end{figure}
.. only:: html
.. raw:: latex
\begin{figure}[H]
- \centering
- \includesvg[width=0.90\textwidth]{../_tmp/src/vpp_performance_tests/logical-3n-vm-vhost}
- \label{fig:logical-3n-vm-vhost}
+ \centering
+ \graphicspath{{../_tmp/src/vpp_performance_tests/}}
+ \includegraphics[width=0.90\textwidth]{logical-3n-vm-vhost}
+ \label{fig:logical-3n-vm-vhost}
\end{figure}
.. only:: html
.. raw:: latex
\begin{figure}[H]
- \centering
- \includesvg[width=0.90\textwidth]{../_tmp/src/vpp_performance_tests/logical-2n-container-memif}
- \label{fig:logical-2n-container-memif}
+ \centering
+ \graphicspath{{../_tmp/src/vpp_performance_tests/}}
+ \includegraphics[width=0.90\textwidth]{logical-2n-container-memif}
+ \label{fig:logical-2n-container-memif}
\end{figure}
.. only:: html
.. raw:: latex
\begin{figure}[H]
- \centering
- \includesvg[width=0.90\textwidth]{../_tmp/src/vpp_performance_tests/logical-3n-container-memif}
- \label{fig:logical-3n-container-memif}
+ \centering
+ \graphicspath{{../_tmp/src/vpp_performance_tests/}}
+ \includegraphics[width=0.90\textwidth]{logical-3n-container-memif}
+ \label{fig:logical-3n-container-memif}
\end{figure}
.. only:: html
-# Copyright (c) 2017 Cisco and/or its affiliates.
+# Copyright (c) 2018 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
logging.info(" Generating the html report, give me a few minutes, please "
"...")
+ working_dir = spec.environment["paths"]["DIR[WORKING,SRC]"]
+
+ cmd = 'cd {working_dir} && mv -f index.html.template index.rst'.\
+ format(working_dir=working_dir)
+ execute_command(cmd)
+
cmd = HTML_BUILDER.format(
release=release,
report_version=report_version,
date=datetime.datetime.utcnow().strftime('%m/%d/%Y %H:%M UTC'),
- working_dir=spec.environment["paths"]["DIR[WORKING,SRC]"],
+ working_dir=working_dir,
build_dir=spec.environment["paths"]["DIR[BUILD,HTML]"])
execute_command(cmd)
logging.info(" Generating the pdf report, give me a few minutes, please "
"...")
- convert_plots = "xvfb-run -a wkhtmltopdf {html} {pdf}.pdf"
+ working_dir = spec.environment["paths"]["DIR[WORKING,SRC]"]
+
+ cmd = 'cd {working_dir} && mv -f index.pdf.template index.rst'.\
+ format(working_dir=working_dir)
+ execute_command(cmd)
+
+ _convert_all_svg_to_pdf(spec.environment["paths"]["DIR[WORKING,SRC]"])
# Convert PyPLOT graphs in HTML format to PDF.
+ convert_plots = "xvfb-run -a wkhtmltopdf {html} {pdf}"
plots = get_files(spec.environment["paths"]["DIR[STATIC,VPP]"], "html")
plots.extend(get_files(spec.environment["paths"]["DIR[STATIC,DPDK]"],
"html"))
for plot in plots:
- file_name = "{0}".format(plot.rsplit(".", 1)[0])
- cmd = convert_plots.format(html=plot, pdf=file_name)
- execute_command(cmd)
+ file_name = "{0}.pdf".format(plot.rsplit(".", 1)[0])
+ logging.info("Converting '{0}' to '{1}'".format(plot, file_name))
+ execute_command(convert_plots.format(html=plot, pdf=file_name))
# Generate the LaTeX documentation
build_dir = spec.environment["paths"]["DIR[BUILD,LATEX]"]
release=release,
report_version=report_version,
date=datetime.datetime.utcnow().strftime('%m/%d/%Y %H:%M UTC'),
- working_dir=spec.environment["paths"]["DIR[WORKING,SRC]"],
+ working_dir=working_dir,
build_dir=build_dir)
execute_command(cmd)
base_dir=spec.environment["paths"]["DIR[BUILD,HTML]"])
logging.info(" Done.")
+
+
+def _convert_all_svg_to_pdf(path):
+ """Convert all svg files on path "path" to pdf.
+
+ :param path: Path to the root directory with svg files to convert.
+ :type path: str
+ """
+
+ cmd = "inkscape -D -z --file={svg} --export-pdf={pdf} --export-latex"
+
+ svg_files = get_files(path, "svg", full_path=True)
+ for svg_file in svg_files:
+ pdf_file = "{0}.pdf".format(svg_file.rsplit('.', 1)[0])
+ logging.info("Converting '{0}' to '{1}'".format(svg_file, pdf_file))
+ execute_command(cmd.format(svg=svg_file, pdf=pdf_file))