diff options
| -rw-r--r-- | docs/cpta/trending/index.rst | 3 | ||||
| -rw-r--r-- | docs/cpta/trending/ip6.rst | 102 | ||||
| -rw-r--r-- | docs/cpta/trending/ip6_tunnels.rst | 3 | ||||
| -rw-r--r-- | docs/cpta/trending/ipsec.rst | 54 | ||||
| -rw-r--r-- | resources/tools/presentation/generator_CPTA.py | 7 | ||||
| -rw-r--r-- | resources/tools/presentation/generator_report.py | 6 | ||||
| -rw-r--r-- | resources/tools/presentation/specification_CPTA.yaml | 110 |
7 files changed, 269 insertions, 16 deletions
diff --git a/docs/cpta/trending/index.rst b/docs/cpta/trending/index.rst index 36c0754563..47dc032a6e 100644 --- a/docs/cpta/trending/index.rst +++ b/docs/cpta/trending/index.rst @@ -5,9 +5,8 @@ VPP Performance Trend l2 ip4 - ip6 ip4_tunnels - ip6_tunnels + ip6 vm_vhost container_memif ipsec diff --git a/docs/cpta/trending/ip6.rst b/docs/cpta/trending/ip6.rst index a2b5afdfd7..11f4b4176d 100644 --- a/docs/cpta/trending/ip6.rst +++ b/docs/cpta/trending/ip6.rst @@ -1,20 +1,116 @@ IPv6 Routed-Forwarding ====================== +NIC 10ge2p1x520 +--------------- + .. raw:: html - <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1.html"></iframe> + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x520-1.html"></iframe> *Figure 1. Daily trend.* .. raw:: html - <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-5.html"></iframe> + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x520-5.html"></iframe> *Figure 2. Weekly trend.* .. raw:: html - <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-30.html"></iframe> + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x520-30.html"></iframe> *Figure 3. Monthly trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x520-1.html"></iframe> + +*Figure 4. Daily trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x520-5.html"></iframe> + +*Figure 5. Weekly trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x520-30.html"></iframe> + +*Figure 6. Monthly trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x520-1.html"></iframe> + +*Figure 7. Daily trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x520-5.html"></iframe> + +*Figure 8. Weekly trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x520-30.html"></iframe> + +*Figure 9. Monthly trend.* + +NIC 40ge2p1xl710 +---------------- + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-xl710-1.html"></iframe> + +*Figure 1. Daily trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-xl710-5.html"></iframe> + +*Figure 2. Weekly trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-xl710-30.html"></iframe> + +*Figure 3. Monthly trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-xl710-1.html"></iframe> + +*Figure 4. Daily trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-xl710-5.html"></iframe> + +*Figure 5. Weekly trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-xl710-30.html"></iframe> + +*Figure 6. Monthly trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-xl710-1.html"></iframe> + +*Figure 7. Daily trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-xl710-5.html"></iframe> + +*Figure 8. Weekly trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-xl710-30.html"></iframe> + +*Figure 9. Monthly trend.* diff --git a/docs/cpta/trending/ip6_tunnels.rst b/docs/cpta/trending/ip6_tunnels.rst deleted file mode 100644 index 6306588673..0000000000 --- a/docs/cpta/trending/ip6_tunnels.rst +++ /dev/null @@ -1,3 +0,0 @@ -IPv6 Overlay Tunnels -==================== - diff --git a/docs/cpta/trending/ipsec.rst b/docs/cpta/trending/ipsec.rst index 345f109d6b..2259e81f35 100644 --- a/docs/cpta/trending/ipsec.rst +++ b/docs/cpta/trending/ipsec.rst @@ -1,2 +1,56 @@ IPSec Crypto HW: IP4 Routed-Forwarding ====================================== + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-1t1c-x520-1.html"></iframe> + +*Figure 1. Daily trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-1t1c-x520-5.html"></iframe> + +*Figure 2. Weekly trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-1t1c-x520-30.html"></iframe> + +*Figure 3. Monthly trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-2t2c-x520-1.html"></iframe> + +*Figure 4. Daily trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-2t2c-x520-5.html"></iframe> + +*Figure 5. Weekly trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-2t2c-x520-30.html"></iframe> + +*Figure 6. Monthly trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-4t4c-x520-1.html"></iframe> + +*Figure 7. Daily trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-4t4c-x520-5.html"></iframe> + +*Figure 8. Weekly trend.* + +.. raw:: html + + <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-4t4c-x520-30.html"></iframe> + +*Figure 9. Monthly trend.* 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" |