CSIT doc gen: Add configurations and operational data.

- vpp perf configurations and operational data
- vpp func configurations

Change-Id: I634682e55a2862b927546e2657aabb242c730be1
Signed-off-by: Jan Gelety <jgelety@cisco.com>

6 files changed, 266 insertions, 4 deletions

diff --git a/docs/report/detailed_test_configuration/index.rst b/docs/report/detailed_test_configuration/index.rst
new file mode 100644
index 0000000000..96f2187518
--- /dev/null
+++ b/docs/report/detailed_test_configuration/index.rst
@@ -0,0 +1,8 @@
+Detailed Test Configuration
+===========================
+
+.. toctree::
+
+    vpp_performance_configuration/index
+    vpp_performance_operational_data/index
+    vpp_functional_configuration/index
diff --git a/docs/report/detailed_test_configuration/vpp_functional_configuration/index.rst b/docs/report/detailed_test_configuration/vpp_functional_configuration/index.rst
new file mode 100644
index 0000000000..c13f2d48fd
--- /dev/null
+++ b/docs/report/detailed_test_configuration/vpp_functional_configuration/index.rst
@@ -0,0 +1,31 @@
+VPP Functional Configuration
+============================
+
+.. note::
+
+    Data sources for reported test results: i) FD.io test executor jobs
+    `###JOB###
+    <###LINK###>`_
+    , ii) archived FD.io jobs test result `output files
+    <../../_static/archive/>`_.
+
+.. toctree::
+
+    vpp_functional_configuration_cop
+    vpp_functional_configuration_dhcp
+    vpp_functional_configuration_gre
+    vpp_functional_configuration_iacl
+    vpp_functional_configuration_ipsec
+    vpp_functional_configuration_ipv4
+    vpp_functional_configuration_ipv6
+    vpp_functional_configuration_l2bd
+    vpp_functional_configuration_l2xc
+    vpp_functional_configuration_lisp
+    vpp_functional_configuration_policer
+    vpp_functional_configuration_rpf
+    vpp_functional_configuration_softwire
+    vpp_functional_configuration_tap
+    vpp_functional_configuration_telemetry
+    vpp_functional_configuration_vlan
+    vpp_functional_configuration_vrf
+    vpp_functional_configuration_vxlan
diff --git a/docs/report/detailed_test_configuration/vpp_performance_configuration/index.rst b/docs/report/detailed_test_configuration/vpp_performance_configuration/index.rst
new file mode 100644
index 0000000000..1d1b03f561
--- /dev/null
+++ b/docs/report/detailed_test_configuration/vpp_performance_configuration/index.rst
@@ -0,0 +1,20 @@
+VPP Performance Configuration
+=============================
+
+.. note::
+
+    Data sources for reported test results: i) FD.io test executor jobs
+    `###JOB###
+    <###LINK###>`_
+    , ii) archived FD.io jobs test result `output files
+    <../../_static/archive/>`_.
+
+.. toctree::
+
+    vpp_performance_configuration_l2
+    vpp_performance_configuration_ipv4
+    vpp_performance_configuration_ipv6
+    vpp_performance_configuration_ipv4o
+    vpp_performance_configuration_ipv6o
+    vpp_performance_configuration_vhost
+    vpp_performance_configuration_ipsec
diff --git a/docs/report/detailed_test_configuration/vpp_performance_operational_data/index.rst b/docs/report/detailed_test_configuration/vpp_performance_operational_data/index.rst
new file mode 100644
index 0000000000..460c29b5a1
--- /dev/null
+++ b/docs/report/detailed_test_configuration/vpp_performance_operational_data/index.rst
@@ -0,0 +1,20 @@
+VPP Performance Operational Data
+================================
+
+.. note::
+
+    Data sources for reported test results: i) FD.io test executor jobs
+    `###JOB###
+    <###LINK###>`_
+    , ii) archived FD.io jobs test result `output files
+    <../../_static/archive/>`_.
+
+.. toctree::
+
+    vpp_performance_operational_data_l2
+    vpp_performance_operational_data_ipv4
+    vpp_performance_operational_data_ipv6
+    vpp_performance_operational_data_ipv4o
+    vpp_performance_operational_data_ipv6o
+    vpp_performance_operational_data_vhost
+    vpp_performance_operational_data_ipsec
diff --git a/docs/report/index.rst b/docs/report/index.rst
index 9eeabf685f..f24e9e78c7 100644
--- a/docs/report/index.rst
+++ b/docs/report/index.rst
@@ -11,3 +11,4 @@ CSIT 17.01
     honeycomb_functional_tests/index
     vpp_unit_tests/index
     detailed_test_results/index
+    detailed_test_configuration/index
diff --git a/resources/tools/report_gen/run_report.sh b/resources/tools/report_gen/run_report.sh
index 7274a8221a..cfa6507bc6 100755
--- a/resources/tools/report_gen/run_report.sh
+++ b/resources/tools/report_gen/run_report.sh
@@ -4,12 +4,19 @@ set -x
 
 WORKING_DIR='_tmp'
 BUILD_DIR='_build'
+
 SOURCE_DIR='../../../docs/report'
 DTR_SOURCE_DIR="${SOURCE_DIR}/detailed_test_results"
 DTR_PERF_SOURCE_DIR=${DTR_SOURCE_DIR}/vpp_performance_results
 DTR_TESTPMD_SOURCE_DIR=${DTR_SOURCE_DIR}/testpmd_performance_results
 DTR_FUNC_SOURCE_DIR=${DTR_SOURCE_DIR}/vpp_functional_results
 DTR_HONEYCOMB_SOURCE_DIR=${DTR_SOURCE_DIR}/honeycomb_functional_results
+
+DTC_SOURCE_DIR="${SOURCE_DIR}/detailed_test_configuration"
+DTC_PERF_SOURCE_DIR=${DTC_SOURCE_DIR}/vpp_performance_configuration
+DTC_PERF_SOURCE_OPER_DIR=${DTC_SOURCE_DIR}/vpp_performance_operational_data
+DTC_FUNC_SOURCE_DIR=${DTC_SOURCE_DIR}/vpp_functional_configuration
+
 STATIC_DIR="${BUILD_DIR}/_static"
 STATIC_DIR_VPP="${STATIC_DIR}/vpp"
 STATIC_DIR_TESTPMD="${STATIC_DIR}/testpmd"
@@ -51,7 +58,7 @@ mkdir -p ${STATIC_DIR_ARCH}
 
 JEN_FILE_PERF='output_perf_data.xml'
 JEN_JOB='csit-vpp-perf-1704-all'
-JEN_BUILD=(3)
+JEN_BUILD=(5)
 
 for i in "${JEN_BUILD[@]}"; do
     curl -fs ${JEN_URL}/${JEN_JOB}/${i}/artifact/${JEN_FILE_PERF} \
@@ -70,52 +77,132 @@ python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --formatting rst --start 3 --level 2 \
     --regex ".+(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-ndr" \
     --title "L2 Ethernet Switching"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_PERF_SOURCE_DIR}/vpp_performance_configuration_l2.rst \
+    --data "VAT_H" -f "rst" --start 3 --level 2 \
+    --regex ".+(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-ndr" \
+    --title "L2 Ethernet Switching"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    -o ${DTC_PERF_SOURCE_OPER_DIR}/vpp_performance_operational_data_l2.rst \
+    --data "SH_RUN" -f "rst" --start 3 --level 2 \
+    --regex ".+(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-ndr" \
+    --title "L2 Ethernet Switching"
 # IPv4 Routed-Forwarding
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_PERF_SOURCE_DIR}/vpp_performance_results_ipv4.rst \
     --formatting rst --start 3 --level 2 \
     --regex ".+ethip4-ip4[a-z0-9]+-[a-z-]*ndr" \
     --title "IPv4 Routed-Forwarding"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_PERF_SOURCE_DIR}/vpp_performance_configuration_ipv4.rst \
+    --data "VAT_H" -f "rst" --start 3 --level 2 \
+    --regex ".+ethip4-ip4[a-z0-9]+-[a-z-]*ndr" \
+    --title "IPv4 Routed-Forwarding"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    -o ${DTC_PERF_SOURCE_OPER_DIR}/vpp_performance_operational_data_ipv4.rst \
+    --data "SH_RUN" -f "rst" --start 3 --level 2 \
+    --regex ".+ethip4-ip4[a-z0-9]+-[a-z-]*ndr" \
+    --title "IPv4 Routed-Forwarding"
 # IPv6 Routed-Forwarding
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_PERF_SOURCE_DIR}/vpp_performance_results_ipv6.rst \
     --formatting rst --start 3 --level 2 \
     --regex ".+ethip6-ip6[a-z0-9]+-[a-z-]*ndr" \
     --title "IPv6 Routed-Forwarding"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_PERF_SOURCE_DIR}/vpp_performance_configuration_ipv6.rst \
+    --data "VAT_H" -f "rst" --start 3 --level 2 \
+    --regex ".+ethip6-ip6[a-z0-9]+-[a-z-]*ndr" \
+    --title "IPv6 Routed-Forwarding"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    -o ${DTC_PERF_SOURCE_OPER_DIR}/vpp_performance_operational_data_ipv6.rst \
+    --data "SH_RUN" -f "rst" --start 3 --level 2 \
+    --regex ".+ethip6-ip6[a-z0-9]+-[a-z-]*ndr" \
+    --title "IPv6 Routed-Forwarding"
 # IPv4 Overlay Tunnels
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_PERF_SOURCE_DIR}/vpp_performance_results_ipv4o.rst \
     --formatting rst --start 3 --level 2 \
     --regex ".+ethip4[a-z0-9]+-[a-z0-9]*-ndr" \
     --title "IPv4 Overlay Tunnels"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_PERF_SOURCE_DIR}/vpp_performance_configuration_ipv4o.rst \
+    --data "VAT_H" -f "rst" --start 3 --level 2 \
+    --regex ".+ethip4[a-z0-9]+-[a-z0-9]*-ndr" \
+    --title "IPv4 Overlay Tunnels"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    -o ${DTC_PERF_SOURCE_OPER_DIR}/vpp_performance_operational_data_ipv4o.rst \
+    --data "SH_RUN" -f "rst" --start 3 --level 2 \
+    --regex ".+ethip4[a-z0-9]+-[a-z0-9]*-ndr" \
+    --title "IPv4 Overlay Tunnels"
 # IPv6 Overlay Tunnels
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_PERF_SOURCE_DIR}/vpp_performance_results_ipv6o.rst \
     --formatting rst --start 3 --level 2 \
     --regex ".+ethip6[a-z0-9]+-[a-z0-9]*-ndr" \
     --title "IPv6 Overlay Tunnels"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_PERF_SOURCE_DIR}/vpp_performance_configuration_ipv6o.rst \
+    --data "VAT_H" -f "rst" --start 3 --level 2 \
+    --regex ".+ethip6[a-z0-9]+-[a-z0-9]*-ndr" \
+    --title "IPv6 Overlay Tunnels"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    -o ${DTC_PERF_SOURCE_OPER_DIR}/vpp_performance_operational_data_ipv6o.rst \
+    --data "SH_RUN" -f "rst" --start 3 --level 2 \
+    --regex ".+ethip6[a-z0-9]+-[a-z0-9]*-ndr" \
+    --title "IPv6 Overlay Tunnels"
 # VM Vhost Connections
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_PERF_SOURCE_DIR}/vpp_performance_results_vhost.rst \
     --formatting rst --start 3 --level 2 \
     --regex ".+vhost.*" \
     --title "VM Vhost Connections"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_PERF_SOURCE_DIR}/vpp_performance_configuration_vhost.rst \
+    --data "VAT_H" -f "rst" --start 3 --level 2 \
+    --regex ".+vhost.*" \
+    --title "VM Vhost Connections"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    -o ${DTC_PERF_SOURCE_OPER_DIR}/vpp_performance_operational_data_vhost.rst \
+    --data "SH_RUN" -f "rst" --start 3 --level 2 \
+    --regex ".+vhost.*" \
+    --title "VM Vhost Connections"
 # Crypto in hardware: IP4FWD, IP6FWD
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_PERF_SOURCE_DIR}/vpp_performance_results_ipsec.rst \
     --formatting rst --start 3 --level 2 \
     --regex ".+ipsec.*" \
     --title "Crypto in hardware: IP4FWD, IP6FWD"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_PERF_SOURCE_DIR}/vpp_performance_configuration_ipsec.rst \
+    --data "VAT_H" -f "rst" --start 3 --level 2 \
+    --regex ".+ipsec.*" \
+    --title "Crypto in hardware: IP4FWD, IP6FWD"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    -o ${DTC_PERF_SOURCE_OPER_DIR}/vpp_performance_operational_data_ipsec.rst \
+    --data "SH_RUN" -f "rst" --start 3 --level 2 \
+    --regex ".+ipsec.*" \
+    --title "Crypto in hardware: IP4FWD, IP6FWD"
 sed -i -e "s@###JOB###@${JEN_JOB}\/${JEN_BUILD[-1]}@g" \
     ${DTR_PERF_SOURCE_DIR}/index.rst
 sed -i -e "s@###LINK###@${JEN_URL}\/${JEN_JOB}\/${JEN_BUILD[-1]}@g" \
     ${DTR_PERF_SOURCE_DIR}/index.rst
+sed -i -e "s@###JOB###@${JEN_JOB}\/${JEN_BUILD[-1]}@g" \
+    ${DTC_PERF_SOURCE_DIR}/index.rst
+sed -i -e "s@###LINK###@${JEN_URL}\/${JEN_JOB}\/${JEN_BUILD[-1]}@g" \
+    ${DTC_PERF_SOURCE_DIR}/index.rst
+sed -i -e "s@###JOB###@${JEN_JOB}\/${JEN_BUILD[-1]}@g" \
+    ${DTC_PERF_SOURCE_OPER_DIR}/index.rst
+sed -i -e "s@###LINK###@${JEN_URL}\/${JEN_JOB}\/${JEN_BUILD[-1]}@g" \
+    ${DTC_PERF_SOURCE_OPER_DIR}/index.rst
 rm -f ${DTR_PERF_SOURCE_DIR}/*.json
+rm -f ${DTC_PERF_SOURCE_DIR}/*.json
+rm -f ${DTC_PERF_SOURCE_OPER_DIR}/*.json
 
 ### DPDK PERFORMANCE SOURCE DATA
 
 JEN_JOB='csit-dpdk-perf-1704-all'
-JEN_BUILD=(1 2 3)
+JEN_BUILD=(1 2 3 4 5)
 
 for i in "${JEN_BUILD[@]}"; do
     curl -fs ${JEN_URL}/${JEN_JOB}/${i}/artifact/${JEN_FILE_PERF} \
@@ -141,7 +228,7 @@ rm -f ${DTR_TESTPMD_SOURCE_DIR}/*.json
 ### FUNCTIONAL SOURCE DATA
 
 JEN_JOB='csit-vpp-functional-1704-ubuntu1604-virl'
-JEN_BUILD=33
+JEN_BUILD=45
 
 curl -fs ${JEN_URL}/${JEN_JOB}/${JEN_BUILD}/artifact/\*zip\*/archive.zip \
     -o ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD}.zip
@@ -156,119 +243,214 @@ python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --formatting rst --start 4 --level 2 \
     --regex ".+cop.*" \
     --title "Cop Address Security"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_performance_configuration_cop.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2 \
+    --regex ".+cop.*" \
+    --title "Cop Address Security"
 # DHCP Client and proxy
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_FUNC_SOURCE_DIR}/vpp_functional_results_dhcp.rst \
     --formatting rst --start 4 --level 2 \
     --regex ".+dhcp.*" \
     --title "DHCP - Client and Proxy"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_performance_configuration_dhcp.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2 \
+    --regex ".+dhcp.*" \
+    --title "DHCP - Client and Proxy"
 # GRE Overlay Tunnels
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_FUNC_SOURCE_DIR}/vpp_functional_results_gre.rst \
     --formatting rst --start 4 --level 2 \
     --regex ".+ethip4gre.*" \
     --title "GRE Overlay Tunnels"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_performance_configuration_gre.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2 \
+    --regex ".+ethip4gre.*" \
+    --title "GRE Overlay Tunnels"
 # iACL Security
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_FUNC_SOURCE_DIR}/vpp_functional_results_iacl.rst \
     --formatting rst --start 4 --level 2 \
     --regex ".+iacl.*" \
     --title "iACL Security"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_performance_configuration_iacl.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2 \
+    --regex ".+iacl.*" \
+    --title "iACL Security"
 # IPSec - Tunnels and Transport
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_FUNC_SOURCE_DIR}/vpp_functional_results_ipsec.rst \
     --formatting rst --start 4 --level 2 \
     --regex ".+ipsec(tnl|tpt)+-.*" \
     --title "IPSec - Tunnels and Transport"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_performance_configuration_ipsec.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2 \
+    --regex ".+ipsec(tnl|tpt)+-.*" \
+    --title "IPSec - Tunnels and Transport"
 # IPv4 Routed-Forwarding
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_FUNC_SOURCE_DIR}/vpp_functional_results_ipv4.rst \
     --formatting rst --start 4 --level 2 \
     --regex ".+ethip4-ip4base-(func|ip4ecmp\-func|ip4proxyarp\-func|ip4arp\-func)+" \
     --title "IPv4 Routed-Forwarding"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_performance_configuration_ipv4.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2 \
+    --regex ".+ethip4-ip4base-(func|ip4ecmp\-func|ip4proxyarp\-func|ip4arp\-func)+" \
+    --title "IPv4 Routed-Forwarding"
 # IPv6 Routed-Forwarding
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_FUNC_SOURCE_DIR}/vpp_functional_results_ipv6.rst \
     --formatting rst --start 4 --level 2 \
     --regex ".+ethip6-ip6base-(func|ip6ecmp\-func|ip6ra\-func)+" \
     --title "IPv6 Routed-Forwarding"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_performance_configuration_ipv6.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2 \
+    --regex ".+ethip6-ip6base-(func|ip6ecmp\-func|ip6ra\-func)+" \
+    --title "IPv6 Routed-Forwarding"
 # L2BD Ethernet Switching
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_SOURCE_DIR}/vpp_functional_results/vpp_functional_results_l2bd.rst \
     --formatting rst --start 4 --level 2 \
     --regex ".+eth-l2bdbasemac(lrn|stc)+-(func|eth\-2vhost|l2shg\-func).*" \
     --title "L2BD Ethernet Switching"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_performance_configuration_l2bd.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2 \
+    --regex ".+eth-l2bdbasemac(lrn|stc)+-(func|eth\-2vhost|l2shg\-func).*" \
+    --title "L2BD Ethernet Switching"
 # L2XC Ethernet Switching
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_FUNC_SOURCE_DIR}/vpp_functional_results_l2xc.rst \
     --formatting rst --start 4 --level 2 \
     --regex ".+eth-l2xcbase-(eth|func).*" \
     --title "L2XC Ethernet Switching"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_performance_configuration_l2xc.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2 \
+    --regex ".+eth-l2xcbase-(eth|func).*" \
+    --title "L2XC Ethernet Switching"
 # LISP Overlay Tunnels
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_FUNC_SOURCE_DIR}/vpp_functional_results_lisp.rst \
     --formatting rst --start 4 --level 2 \
     --regex ".+lisp.*" \
     --title "LISP Overlay Tunnels"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_performance_configuration_lisp.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2 \
+    --regex ".+lisp.*" \
+    --title "LISP Overlay Tunnels"
 # QoS Policer Metering
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_FUNC_SOURCE_DIR}/vpp_functional_results_policer.rst \
     --formatting rst --start 4 --level 2 \
     --regex ".+ipolicemark.*" \
     --title "QoS Policer Metering"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_performance_configuration_policer.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2 \
+    --regex ".+ipolicemark.*" \
+    --title "QoS Policer Metering"
 # RPF Source Security
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_FUNC_SOURCE_DIR}/vpp_functional_results_rpf.rst \
     --formatting rst --start 4 --level 2 \
     --regex ".+rpf.*" \
     --title "RPF Source Security"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_performance_configuration_rpf.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2 \
+    --regex ".+rpf.*" \
+    --title "RPF Source Security"
 # Softwire Tunnels
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_FUNC_SOURCE_DIR}/vpp_functional_results_softwire.rst \
     --formatting rst --start 4 --level 2 \
     --regex ".+swire.*" \
     --title "Softwire Tunnels"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_performance_configuration_softwire.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2 \
+    --regex ".+swire.*" \
+    --title "Softwire Tunnels"
 # Tap Interface
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_FUNC_SOURCE_DIR}/vpp_functional_results_tap.rst \
     --formatting rst --start 4 --level 2 \
     --regex ".+tap.*" \
     --title "Tap Interface"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_performance_configuration_tap.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2 \
+    --regex ".+tap.*" \
+    --title "Tap Interface"
 # Telemetry - IPFIX and SPAN
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_FUNC_SOURCE_DIR}/vpp_functional_results_telemetry.rst \
     --formatting rst --start 4 --level 2 \
     --regex ".+(ipfix|spanrx).*" \
     --title "Telemetry - IPFIX and SPAN"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_performance_configuration_telemetry.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2 \
+    --regex ".+(ipfix|spanrx).*" \
+    --title "Telemetry - IPFIX and SPAN"
 # VLAN Tag Translation
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_FUNC_SOURCE_DIR}/vpp_functional_results_vlan.rst \
     --formatting rst --start 4 --level 2 \
     --regex ".+(dot1q\-|dot1ad\-).*" \
     --title "VLAN Tag Translation"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_performance_configuration_vlan.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2 \
+    --regex ".+(dot1q\-|dot1ad\-).*" \
+    --title "VLAN Tag Translation"
 # VRF Routed-Forwarding
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_FUNC_SOURCE_DIR}/vpp_functional_results_vrf.rst \
     --formatting rst --start 4 --level 2 \
     --regex ".+ethip(4|6)+-ip(4|6)+basevrf.*" \
     --title "VRF Routed-Forwarding"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_performance_configuration_vrf.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2 \
+    --regex ".+ethip(4|6)+-ip(4|6)+basevrf.*" \
+    --title "VRF Routed-Forwarding"
 # VXLAN Overlay Tunnels
 python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
     --output ${DTR_FUNC_SOURCE_DIR}/vpp_functional_results_vxlan.rst \
     --formatting rst --start 4 --level 2 \
     --regex ".+(ip4vxlan|ip6vxlan).*" \
     --title "VXLAN Overlay Tunnels"
+python run_robot_teardown_data.py -i ${WORKING_DIR}/archive/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_performance_configuration_vxlan.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2 \
+    --regex ".+(ip4vxlan|ip6vxlan).*" \
+    --title "VXLAN Overlay Tunnels"
 sed -i -e "s@###JOB###@${JEN_JOB}\/${JEN_BUILD}@g" \
     ${DTR_FUNC_SOURCE_DIR}/index.rst
 sed -i -e "s@###LINK###@${JEN_URL}\/${JEN_JOB}\/${JEN_BUILD}@g" \
     ${DTR_FUNC_SOURCE_DIR}/index.rst
+sed -i -e "s@###JOB###@${JEN_JOB}\/${JEN_BUILD}@g" \
+    ${DTC_FUNC_SOURCE_DIR}/index.rst
+sed -i -e "s@###LINK###@${JEN_URL}\/${JEN_JOB}\/${JEN_BUILD}@g" \
+    ${DTC_FUNC_SOURCE_DIR}/index.rst
 rm -f ${DTR_FUNC_SOURCE_DIR}/*.json
+rm -f ${DTC_FUNC_SOURCE_DIR}/*.json
 
 ### HONEYCOMB SOURCE DATA
 
 JEN_URL='https://jenkins.fd.io/view/hc2vpp/job'
 JEN_JOB='hc2vpp-csit-integration-1704-ubuntu1604'
-JEN_BUILD=37
+JEN_BUILD=41
 
 curl -fs ${JEN_URL}/${JEN_JOB}/${JEN_BUILD}/artifact/\*zip\*/archive.zip \
     -o ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD}.zip