X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Freport_gen%2Frun_report.sh;h=e11c68e8eee5a1fef5802a76f07773ed593e2dbf;hp=d6e945845578645e03269f64961af3fb5aba4066;hb=a097c8748051f82e36b3cc3049bf3e596c2252a4;hpb=acaf20e1278478f573d1d1e7116d74d85971a941

diff --git a/resources/tools/report_gen/run_report.sh b/resources/tools/report_gen/run_report.sh
index d6e9458455..e11c68e8ee 100755
--- a/resources/tools/report_gen/run_report.sh
+++ b/resources/tools/report_gen/run_report.sh
@@ -2,27 +2,40 @@
 
 set -x
 
+# Build locally without jenkins integrations
+DEBUG=0
+
+# Build directories
 WORKING_DIR='_tmp'
 BUILD_DIR='_build'
 
+STATIC_DIR="${BUILD_DIR}/_static"
+STATIC_DIR_VPP="${STATIC_DIR}/vpp"
+STATIC_DIR_DPDK="${STATIC_DIR}/dpdk"
+STATIC_DIR_ARCH="${STATIC_DIR}/archive"
+CSS_PATCH_FILE="${STATIC_DIR}/theme_overrides.css"
+
 SOURCE_DIR='../../../docs/report'
-DTR_SOURCE_DIR="${SOURCE_DIR}/detailed_test_results"
+
+PLOT_VPP_SOURCE_DIR=${WORKING_DIR}/vpp_plot
+PLOT_DPDK_SOURCE_DIR=${WORKING_DIR}/dpdk_plot
+
+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_DPDK_SOURCE_DIR=${DTR_SOURCE_DIR}/dpdk_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_SOURCE_DIR=${SOURCE_DIR}/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"
-STATIC_DIR_ARCH="${STATIC_DIR}/archive"
-CSS_PATCH_FILE="${STATIC_DIR}/theme_overrides.css"
-JEN_URL='https://jenkins.fd.io/view/csit/job'
+DTO_SOURCE_DIR=${SOURCE_DIR}/test_operational_data
+DTO_PERF_SOURCE_OPER_DIR=${DTO_SOURCE_DIR}/vpp_performance_operational_data
+
+# Jenkins links
+CSIT_JEN_URL='https://jenkins.fd.io/view/csit/job'
+HC_JEN_URL='https://jenkins.fd.io/view/hc2vpp/job'
 
 sudo apt-get -y update
 sudo apt-get -y install libxml2 libxml2-dev libxslt-dev build-essential \
@@ -51,422 +64,131 @@ export PYTHONPATH=`pwd`
 # Download raw outputs for plots
 echo Downloading raw outputs for plots ...
 mkdir -p ${STATIC_DIR_VPP}
-mkdir -p ${STATIC_DIR_TESTPMD}
+mkdir -p ${STATIC_DIR_DPDK}
 mkdir -p ${STATIC_DIR_ARCH}
+mkdir -p ${PLOT_VPP_SOURCE_DIR}
+mkdir -p ${PLOT_DPDK_SOURCE_DIR}
 
 ### VPP PERFORMANCE SOURCE DATA
 
 JEN_FILE_PERF='output_perf_data.xml'
 JEN_JOB='csit-vpp-perf-1704-all'
-JEN_BUILD=(6)
+JEN_BUILD=(6 7 8 9 10 12 14 15 16 17)
 
 for i in "${JEN_BUILD[@]}"; do
-    curl -fs ${JEN_URL}/${JEN_JOB}/${i}/artifact/${JEN_FILE_PERF} \
-        -o ${STATIC_DIR_VPP}/${JEN_JOB}-${i}.xml
-    curl -fs ${JEN_URL}/${JEN_JOB}/${i}/artifact/\*zip\*/archive.zip \
-        -o ${STATIC_DIR_ARCH}/${JEN_JOB}-${i}.zip
+    curl --fail -fs ${CSIT_JEN_URL}/${JEN_JOB}/${i}/robot/report/output_perf_data.xml \
+        -o ${PLOT_VPP_SOURCE_DIR}/${JEN_JOB}-${i}.xml
+    if [[ ${DEBUG} -eq 1 ]] ;
+    then
+        cp ./${JEN_JOB}-10.zip ${STATIC_DIR_ARCH}/${JEN_JOB}-10.zip
+    else
+        curl --fail -fs ${CSIT_JEN_URL}/${JEN_JOB}/${i}/robot/report/\*zip\*/robot-plugin.zip \
+            -o ${STATIC_DIR_ARCH}/${JEN_JOB}-${i}.zip
+    fi
 done
 
-# DELETE ME
-#cp ./${JEN_JOB}-${JEN_BUILD[-1]}.zip ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD[-1]}.zip
-
-unzip -o ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD[-1]}.zip -d ${WORKING_DIR}/
-# L2 Ethernet Switching
-python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
-    --output ${DTR_PERF_SOURCE_DIR}/vpp_performance_results_l2.rst \
-    --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" \
+unzip -o ${STATIC_DIR_ARCH}/${JEN_JOB}-10.zip -d ${WORKING_DIR}/
+python run_robot_data.py -i ${WORKING_DIR}/robot-plugin/output.xml \
+    --output ${DTR_PERF_SOURCE_DIR}/vpp_performance_results.rst \
+    --formatting rst --start 4 --level 2
+python run_robot_teardown_data.py -i ${WORKING_DIR}/robot-plugin/output.xml \
+    --output ${DTC_PERF_SOURCE_DIR}/vpp_performance_configuration.rst \
+    --data "VAT_H" -f "rst" --start 4 --level 2
+python run_robot_teardown_data.py -i ${WORKING_DIR}/robot-plugin/output.xml \
+    -o ${DTO_PERF_SOURCE_OPER_DIR}/vpp_performance_operational_data.rst \
+    --data "SH_RUN" -f "rst" --start 4 --level 2
+sed -i -e "s@###JOB###@${JEN_JOB}\/75@g" \
     ${DTR_PERF_SOURCE_DIR}/index.rst
-sed -i -e "s@###LINK###@${JEN_URL}\/${JEN_JOB}\/${JEN_BUILD[-1]}@g" \
+sed -i -e "s@###LINK###@${CSIT_JEN_URL}\/${JEN_JOB}\/75@g" \
     ${DTR_PERF_SOURCE_DIR}/index.rst
-sed -i -e "s@###JOB###@${JEN_JOB}\/${JEN_BUILD[-1]}@g" \
+sed -i -e "s@###JOB###@${JEN_JOB}\/75@g" \
     ${DTC_PERF_SOURCE_DIR}/index.rst
-sed -i -e "s@###LINK###@${JEN_URL}\/${JEN_JOB}\/${JEN_BUILD[-1]}@g" \
+sed -i -e "s@###LINK###@${CSIT_JEN_URL}\/${JEN_JOB}\/75@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
+sed -i -e "s@###JOB###@${JEN_JOB}\/75@g" \
+    ${DTO_PERF_SOURCE_OPER_DIR}/index.rst
+sed -i -e "s@###LINK###@${CSIT_JEN_URL}\/${JEN_JOB}\/75@g" \
+    ${DTO_PERF_SOURCE_OPER_DIR}/index.rst
 
 ### DPDK PERFORMANCE SOURCE DATA
 
-JEN_JOB='csit-dpdk-perf-1704-all'
-JEN_BUILD=(1 2 3 4 5)
+JEN_JOB='csit-dpdk-perf-master-all'
+JEN_BUILD=(13 14 15 16)
 
 for i in "${JEN_BUILD[@]}"; do
-    curl -fs ${JEN_URL}/${JEN_JOB}/${i}/artifact/${JEN_FILE_PERF} \
-        -o ${STATIC_DIR_TESTPMD}/${JEN_JOB}-${i}.xml
-    curl -fs ${JEN_URL}/${JEN_JOB}/${i}/artifact/\*zip\*/archive.zip \
-       -o ${STATIC_DIR_ARCH}/${JEN_JOB}-${i}.zip
+    curl --fail -fs ${CSIT_JEN_URL}/${JEN_JOB}/${i}/robot/report/output_perf_data.xml \
+        -o ${PLOT_DPDK_SOURCE_DIR}/${JEN_JOB}-${i}.xml
+    if [[ ${DEBUG} -eq 1 ]] ;
+    then
+        cp ./${JEN_JOB}-16.zip ${STATIC_DIR_ARCH}/${JEN_JOB}-16.zip
+    else
+        curl --fail -fs ${CSIT_JEN_URL}/${JEN_JOB}/${i}/robot/report/\*zip\*/robot-plugin.zip \
+            -o ${STATIC_DIR_ARCH}/${JEN_JOB}-${i}.zip
+    fi
 done
 
-# DELETE ME
-#cp ./${JEN_JOB}-${JEN_BUILD[-1]}.zip ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD[-1]}.zip
-
-unzip -o ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD[-1]}.zip -d ${WORKING_DIR}/
-# Testpmd Performance Results
-python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
-    --output ${DTR_TESTPMD_SOURCE_DIR}/testpmd_performance_results.rst \
+unzip -o ${STATIC_DIR_ARCH}/${JEN_JOB}-16.zip -d ${WORKING_DIR}/
+python run_robot_data.py -i ${WORKING_DIR}/robot-plugin/output.xml \
+    --output ${DTR_DPDK_SOURCE_DIR}/dpdk_performance_results.rst \
     --formatting rst --start 3 --level 2
-sed -i -e "s@###JOB###@${JEN_JOB}\/${JEN_BUILD[-1]}@g" \
-    ${DTR_TESTPMD_SOURCE_DIR}/index.rst
-sed -i -e "s@###LINK###@${JEN_URL}\/${JEN_JOB}\/${JEN_BUILD[-1]}@g" \
-    ${DTR_TESTPMD_SOURCE_DIR}/index.rst
-rm -f ${DTR_TESTPMD_SOURCE_DIR}/*.json
+sed -i -e "s@###JOB###@${JEN_JOB}\/16@g" \
+    ${DTR_DPDK_SOURCE_DIR}/index.rst
+sed -i -e "s@###LINK###@${CSIT_JEN_URL}\/${JEN_JOB}\/16@g" \
+    ${DTR_DPDK_SOURCE_DIR}/index.rst
 
 ### FUNCTIONAL SOURCE DATA
 
-JEN_JOB='csit-vpp-functional-1704-ubuntu1604-virl'
-JEN_BUILD=45
-
-curl -fs ${JEN_URL}/${JEN_JOB}/${JEN_BUILD}/artifact/\*zip\*/archive.zip \
-    -o ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD}.zip
+JEN_JOB='csit-vpp-functional-master-ubuntu1604-virl'
+JEN_BUILD='lastSuccessfulBuild'
 
-# DELETE ME
-#cp ./${JEN_JOB}-${JEN_BUILD}.zip ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD}.zip
+if [[ ${DEBUG} -eq 1 ]] ;
+then
+    cp ./${JEN_JOB}-${JEN_BUILD}.zip ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD}.zip
+else
+    curl -fs ${CSIT_JEN_URL}/${JEN_JOB}/${JEN_BUILD}/robot/report/\*zip\*/robot-plugin.zip \
+        -o ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD}.zip
+fi
 
 unzip -o ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD}.zip -d ${WORKING_DIR}/
-# Cop Address Security
-python run_robot_data.py -i ${WORKING_DIR}/archive/output.xml \
-    --output ${DTR_FUNC_SOURCE_DIR}/vpp_functional_results_cop.rst \
-    --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"
+python run_robot_data.py -i ${WORKING_DIR}/robot-plugin/output.xml \
+    --output ${DTR_FUNC_SOURCE_DIR}/vpp_functional_results.rst \
+    --formatting rst --start 5 --level 2
+python run_robot_teardown_data.py -i ${WORKING_DIR}/robot-plugin/output.xml \
+    --output ${DTC_FUNC_SOURCE_DIR}/vpp_functional_configuration.rst \
+    --data "VAT_H" -f "rst" --start 5 --level 2
 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" \
+sed -i -e "s@###LINK###@${CSIT_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" \
+sed -i -e "s@###LINK###@${CSIT_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=41
+JEN_JOB='hc2vpp-csit-integration-master-ubuntu1604'
+JEN_BUILD='lastSuccessfulBuild'
 
-curl -fs ${JEN_URL}/${JEN_JOB}/${JEN_BUILD}/artifact/\*zip\*/archive.zip \
-    -o ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD}.zip
-
-# DELETE ME
-#cp ./${JEN_JOB}-${JEN_BUILD}.zip ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD}.zip
+if [[ ${DEBUG} -eq 1 ]] ;
+then
+    cp ./${JEN_JOB}-${JEN_BUILD}.zip ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD}.zip
+else
+    curl -fs ${HC_JEN_URL}/${JEN_JOB}/${JEN_BUILD}/robot/report/\*zip\*/robot-plugin.zip \
+        -o ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD}.zip
+fi
 
 unzip -o ${STATIC_DIR_ARCH}/${JEN_JOB}-${JEN_BUILD}.zip -d ${WORKING_DIR}/
-python run_robot_data.py -i ${WORKING_DIR}/archive/csit/output.xml \
+python run_robot_data.py -i ${WORKING_DIR}/robot-plugin/output.xml \
     --output ${DTR_HONEYCOMB_SOURCE_DIR}/honeycomb_functional_results.rst \
     --formatting rst --start 3 --level 2
 sed -i -e "s@###JOB###@${JEN_JOB}\/${JEN_BUILD}@g" \
     ${DTR_HONEYCOMB_SOURCE_DIR}/index.rst
-sed -i -e "s@###LINK###@${JEN_URL}\/${JEN_JOB}\/${JEN_BUILD}@g" \
+sed -i -e "s@###LINK###@${HC_JEN_URL}\/${JEN_JOB}\/${JEN_BUILD}@g" \
     ${DTR_HONEYCOMB_SOURCE_DIR}/index.rst
-rm -f ${DTR_HONEYCOMB_SOURCE_DIR}/*.json
+
+# Delete temporary json files
+find ${SOURCE_DIR} -name "*.json" -type f -delete
 
 # Generate the documentation:
 
@@ -495,223 +217,247 @@ _EOF
 
 # Plot packets per second
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-1t1c-l2-ndrdisc \
     --title "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-ndrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"NDRDISC") and contains(@tags,"1T1C") and (contains(@tags,"L2BDMACSTAT") or contains(@tags,"L2BDMACLRN") or contains(@tags,"L2XCFWD")) and not(contains(@tags,"VHOST"))]'
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-2t2c-l2-ndrdisc \
     --title "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-ndrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"NDRDISC") and contains(@tags,"2T2C") and (contains(@tags,"L2BDMACSTAT") or contains(@tags,"L2BDMACLRN") or contains(@tags,"L2XCFWD")) and not(contains(@tags,"VHOST"))]'
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-1t1c-ethip4-ip4-ndrdisc \
     --title "64B-1t1c-ethip4-ip4[a-z0-9]+-[a-z-]*ndrdisc" \
     --xpath '//*[@framesize="64B" and (contains(@tags,"BASE") or contains(@tags,"SCALE") or contains(@tags,"FEATURE")) and contains(@tags,"NDRDISC") and contains(@tags,"1T1C") and contains(@tags,"IP4FWD") and not(contains(@tags,"IPSEC")) and not(contains(@tags,"VHOST"))]'
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-2t2c-ethip4-ip4-ndrdisc \
     --title "64B-2t2c-ethip4-ip4[a-z0-9]+-[a-z-]*ndrdisc" \
     --xpath '//*[@framesize="64B" and (contains(@tags,"BASE") or contains(@tags,"SCALE") or contains(@tags,"FEATURE")) and contains(@tags,"NDRDISC") and contains(@tags,"2T2C") and contains(@tags,"IP4FWD") and not(contains(@tags,"IPSEC")) and not(contains(@tags,"VHOST"))]'
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/78B-1t1c-ethip6-ip6-ndrdisc \
     --title "78B-1t1c-ethip6-ip6[a-z0-9]+-[a-z-]*ndrdisc" \
     --xpath '//*[@framesize="78B" and (contains(@tags,"BASE") or contains(@tags,"SCALE") or contains(@tags,"FEATURE")) and contains(@tags,"NDRDISC") and contains(@tags,"1T1C") and contains(@tags,"IP6FWD") and not(contains(@tags,"IPSEC")) and not(contains(@tags,"VHOST"))]'
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/78B-2t2c-ethip6-ip6-ndrdisc \
     --title "78B-2t2c-ethip6-ip6[a-z0-9]+-[a-z-]*ndrdisc" \
     --xpath '//*[@framesize="78B" and (contains(@tags,"BASE") or contains(@tags,"SCALE") or contains(@tags,"FEATURE")) and contains(@tags,"NDRDISC") and contains(@tags,"2T2C") and contains(@tags,"IP6FWD") and not(contains(@tags,"IPSEC")) and not(contains(@tags,"VHOST"))]'
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-1t1c-ethip4-ndrdisc \
     --title "64B-1t1c-ethip4[a-z0-9]+-[a-z0-9]*-ndrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"ENCAP") and contains(@tags,"NDRDISC") and contains(@tags,"1T1C") and (contains(@tags,"VXLAN") or contains(@tags,"VXLANGPE") or contains(@tags,"LISP") or contains(@tags,"LISPGPE") or contains(@tags,"GRE")) and not(contains(@tags,"VHOST"))]'
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-2t2c-ethip4-ndrdisc \
     --title "64B-2t2c-ethip4[a-z0-9]+-[a-z0-9]*-ndrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"ENCAP") and contains(@tags,"NDRDISC") and contains(@tags,"2T2C") and (contains(@tags,"VXLAN") or contains(@tags,"VXLANGPE") or contains(@tags,"LISP") or contains(@tags,"LISPGPE") or contains(@tags,"GRE")) and not(contains(@tags,"VHOST"))]'
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/78B-1t1c-ethip6-ndrdisc \
     --title "78B-1t1c-ethip6[a-z0-9]+-[a-z0-9]*-ndrdisc" \
     --xpath '//*[@framesize="78B" and contains(@tags,"ENCAP") and contains(@tags,"NDRDISC") and contains(@tags,"1T1C") and (contains(@tags,"VXLAN") or contains(@tags,"VXLANGPE") or contains(@tags,"LISP") or contains(@tags,"LISPGPE") or contains(@tags,"GRE")) and not(contains(@tags,"VHOST"))]'
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/78B-2t2c-ethip6-ndrdisc \
     --title "78B-2t2c-ethip6[a-z0-9]+-[a-z0-9]*-ndrdisc" \
     --xpath '//*[@framesize="78B" and contains(@tags,"ENCAP") and contains(@tags,"NDRDISC") and contains(@tags,"2T2C") and (contains(@tags,"VXLAN") or contains(@tags,"VXLANGPE") or contains(@tags,"LISP") or contains(@tags,"LISPGPE") or contains(@tags,"GRE")) and not(contains(@tags,"VHOST"))]'
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-1t1c-vhost-ndrdisc \
     --title "64B-1t1c-.*vhost.*-ndrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"NDRDISC") and contains(@tags,"1T1C") and contains(@tags,"VHOST")]'
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-2t2c-vhost-ndrdisc \
     --title "64B-2t2c-.*vhost.*-ndrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"NDRDISC") and contains(@tags,"2T2C") and contains(@tags,"VHOST")]'
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-1t1c-ipsechw-ndrdisc \
     --title "64B-1t1c-.*ipsec.*-ndrdisc" \
     --xpath '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-2t2c-ipsechw-ndrdisc \
     --title "64B-2t2c-.*ipsec.*-ndrdisc" \
     --xpath '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-1t1c-l2-pdrdisc \
     --title "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-pdrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags,"1T1C") and (contains(@tags,"L2BDMACSTAT") or contains(@tags,"L2BDMACLRN") or contains(@tags,"L2XCFWD")) and not(contains(@tags,"VHOST"))]'
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-2t2c-l2-pdrdisc \
     --title "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-pdrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags,"2T2C") and (contains(@tags,"L2BDMACSTAT") or contains(@tags,"L2BDMACLRN") or contains(@tags,"L2XCFWD")) and not(contains(@tags,"VHOST"))]'
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-1t1c-ethip4-ip4-pdrdisc \
     --title "64B-1t1c-ethip4-ip4[a-z0-9]+-[a-z-]*pdrdisc" \
     --xpath '//*[@framesize="64B" and (contains(@tags,"BASE") or contains(@tags,"SCALE") or contains(@tags,"FEATURE")) and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags,"1T1C") and contains(@tags,"IP4FWD") and not(contains(@tags,"IPSEC")) and not(contains(@tags,"VHOST"))]'
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-2t2c-ethip4-ip4-pdrdisc \
     --title "64B-2t2c-ethip4-ip4[a-z0-9]+-[a-z-]*pdrdisc" \
     --xpath '//*[@framesize="64B" and (contains(@tags,"BASE") or contains(@tags,"SCALE") or contains(@tags,"FEATURE")) and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags,"2T2C") and contains(@tags,"IP4FWD") and not(contains(@tags,"IPSEC")) and not(contains(@tags,"VHOST"))]'
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/78B-1t1c-ethip6-ip6-pdrdisc \
     --title "78B-1t1c-ethip6-ip6[a-z0-9]+-[a-z-]*pdrdisc" \
     --xpath '//*[@framesize="78B" and (contains(@tags,"BASE") or contains(@tags,"SCALE") or contains(@tags,"FEATURE")) and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags,"1T1C") and contains(@tags,"IP6FWD") and not(contains(@tags,"IPSEC")) and not(contains(@tags,"VHOST"))]'
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/78B-2t2c-ethip6-ip6-pdrdisc \
     --title "78B-2t2c-ethip6-ip6[a-z0-9]+-[a-z-]*pdrdisc" \
     --xpath '//*[@framesize="78B" and (contains(@tags,"BASE") or contains(@tags,"SCALE") or contains(@tags,"FEATURE")) and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags,"2T2C") and contains(@tags,"IP6FWD") and not(contains(@tags,"IPSEC")) and not(contains(@tags,"VHOST"))]'
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-1t1c-ethip4-pdrdisc \
     --title "64B-1t1c-ethip4[a-z0-9]+-[a-z0-9]*-pdrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"ENCAP") and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags,"1T1C") and (contains(@tags,"VXLAN") or contains(@tags,"VXLANGPE") or contains(@tags,"LISP") or contains(@tags,"LISPGPE") or contains(@tags,"GRE")) and not(contains(@tags,"VHOST"))]'
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-2t2c-ethip4-pdrdisc \
     --title "64B-2t2c-ethip4[a-z0-9]+-[a-z0-9]*-pdrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"ENCAP") and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags,"2T2C") and (contains(@tags,"VXLAN") or contains(@tags,"VXLANGPE") or contains(@tags,"LISP") or contains(@tags,"LISPGPE") or contains(@tags,"GRE")) and not(contains(@tags,"VHOST"))]'
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/78B-1t1c-ethip6-pdrdisc \
     --title "78B-1t1c-ethip6[a-z0-9]+-[a-z0-9]*-pdrdisc" \
     --xpath '//*[@framesize="78B" and contains(@tags,"ENCAP") and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags,"1T1C") and (contains(@tags,"VXLAN") or contains(@tags,"VXLANGPE") or contains(@tags,"LISP") or contains(@tags,"LISPGPE") or contains(@tags,"GRE")) and not(contains(@tags,"VHOST"))]'
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/78B-2t2c-ethip6-pdrdisc \
     --title "78B-2t2c-ethip6[a-z0-9]+-[a-z0-9]*-pdrdisc" \
     --xpath '//*[@framesize="78B" and contains(@tags,"ENCAP") and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags,"2T2C") and (contains(@tags,"VXLAN") or contains(@tags,"VXLANGPE") or contains(@tags,"LISP") or contains(@tags,"LISPGPE") or contains(@tags,"GRE")) and not(contains(@tags,"VHOST"))]'
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-1t1c-vhost-pdrdisc \
     --title "64B-1t1c-.*vhost.*-pdrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"PDRDISC") and contains(@tags,"1T1C") and not(contains(@tags,"NDRDISC")) and contains(@tags,"VHOST")]'
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-2t2c-vhost-pdrdisc \
     --title "64B-2t2c-.*vhost.*-pdrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"PDRDISC") and contains(@tags,"2T2C") and not(contains(@tags,"NDRDISC")) and contains(@tags,"VHOST")]'
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-1t1c-ipsechw-pdrdisc \
     --title "64B-1t1c-.*ipsec.*-pdrdisc" \
     --xpath '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-2t2c-ipsechw-pdrdisc \
     --title "64B-2t2c-.*ipsec.*-pdrdisc" \
     --xpath '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
 
-python run_plot.py --input ${STATIC_DIR_TESTPMD} \
-    --output ${STATIC_DIR_TESTPMD}/64B-1t1c-l2-ndrdisc \
+python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
+    --output ${STATIC_DIR_DPDK}/64B-1t1c-l2-ndrdisc \
     --title "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-ndrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"NDRDISC") and contains(@tags,"1T1C") and (contains(@tags,"L2BDMACSTAT") or contains(@tags,"L2BDMACLRN") or contains(@tags,"L2XCFWD")) and not(contains(@tags,"VHOST"))]'
-python run_plot.py --input ${STATIC_DIR_TESTPMD} \
-    --output ${STATIC_DIR_TESTPMD}/64B-2t2c-l2-ndrdisc \
+python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
+    --output ${STATIC_DIR_DPDK}/64B-2t2c-l2-ndrdisc \
     --title "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-ndrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"NDRDISC") and contains(@tags,"2T2C") and (contains(@tags,"L2BDMACSTAT") or contains(@tags,"L2BDMACLRN") or contains(@tags,"L2XCFWD")) and not(contains(@tags,"VHOST"))]'
-
-python run_plot.py --input ${STATIC_DIR_TESTPMD} \
-    --output ${STATIC_DIR_TESTPMD}/64B-1t1c-l2-pdrdisc \
+python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
+    --output ${STATIC_DIR_DPDK}/64B-1t1c-ipv4-ndrdisc \
+    --title "64B-1t1c-ethip4-ip4base-l3fwd-ndrdisc" \
+    --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"NDRDISC") and contains(@tags,"1T1C") and contains(@tags,"IP4FWD")]'
+python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
+    --output ${STATIC_DIR_DPDK}/64B-2t2c-ipv4-ndrdisc \
+    --title "64B-2t2c-ethip4-ip4base-l3fwd-ndrdisc" \
+    --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"NDRDISC") and contains(@tags,"2T2C") and contains(@tags,"IP4FWD")]'
+
+python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
+    --output ${STATIC_DIR_DPDK}/64B-1t1c-l2-pdrdisc \
     --title "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-pdrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags,"1T1C") and (contains(@tags,"L2BDMACSTAT") or contains(@tags,"L2BDMACLRN") or contains(@tags,"L2XCFWD")) and not(contains(@tags,"VHOST"))]'
-python run_plot.py --input ${STATIC_DIR_TESTPMD} \
-    --output ${STATIC_DIR_TESTPMD}/64B-2t2c-l2-pdrdisc \
+python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
+    --output ${STATIC_DIR_DPDK}/64B-2t2c-l2-pdrdisc \
     --title "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-pdrdisc" \
-    --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags,"2T2C") and (contains(@tags,"L2BDMACSTAT") or contains(@tags,"L2BDMACLRN") or contains(@tags,"L2XCFWD")) and not(contains(@tags,"VHOST"))]'
+    --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and not(contains(@tags,"NDRDISC")) and contains(@tags,"2T2C") and (contains(@tags,"L2BDMACSTAT") or contains(@tags,"L2BDMACLRN") or contains(@tags,"L2XCFWD")) and not(contains(@tags,"VHOST"))]'
+python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
+    --output ${STATIC_DIR_DPDK}/64B-1t1c-ipv4-pdrdisc \
+    --title "64B-1t1c-ethip4-ip4base-l3fwd-pdrdisc" \
+    --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags,"1T1C") and contains(@tags,"IP4FWD")]'
+python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
+    --output ${STATIC_DIR_DPDK}/64B-2t2c-ipv4-pdrdisc \
+    --title "64B-2t2c-ethip4-ip4base-l3fwd-pdrdisc" \
+    --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags,"2T2C") and contains(@tags,"IP4FWD")]'
 
 # Plot latency
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-1t1c-l2-ndrdisc-lat50 \
     --title "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-ndrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"NDRDISC") and contains(@tags,"1T1C") and (contains(@tags,"L2BDMACSTAT") or contains(@tags,"L2BDMACLRN") or contains(@tags,"L2XCFWD")) and not(contains(@tags,"VHOST"))]' --latency lat_50
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-2t2c-l2-ndrdisc-lat50 \
     --title "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-ndrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"NDRDISC") and contains(@tags,"2T2C") and (contains(@tags,"L2BDMACSTAT") or contains(@tags,"L2BDMACLRN") or contains(@tags,"L2XCFWD")) and not(contains(@tags,"VHOST"))]' --latency lat_50
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-1t1c-ethip4-ip4-ndrdisc-lat50 \
     --title "64B-1t1c-ethip4-ip4[a-z0-9]+-[a-z-]*ndrdisc" \
     --xpath '//*[@framesize="64B" and (contains(@tags,"BASE") or contains(@tags,"SCALE") or contains(@tags,"FEATURE")) and contains(@tags,"NDRDISC") and contains(@tags,"1T1C") and contains(@tags,"IP4FWD") and not(contains(@tags,"IPSEC")) and not(contains(@tags,"VHOST"))]' --latency lat_50
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-2t2c-ethip4-ip4-ndrdisc-lat50 \
     --title "64B-2t2c-ethip4-ip4[a-z0-9]+-[a-z-]*ndrdisc" \
     --xpath '//*[@framesize="64B" and (contains(@tags,"BASE") or contains(@tags,"SCALE") or contains(@tags,"FEATURE")) and contains(@tags,"NDRDISC") and contains(@tags,"2T2C") and contains(@tags,"IP4FWD") and not(contains(@tags,"IPSEC")) and not(contains(@tags,"VHOST"))]' --latency lat_50
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/78B-1t1c-ethip6-ip6-ndrdisc-lat50 \
     --title "78B-1t1c-ethip6-ip6[a-z0-9]+-[a-z-]*ndrdisc" \
     --xpath '//*[@framesize="78B" and (contains(@tags,"BASE") or contains(@tags,"SCALE") or contains(@tags,"FEATURE")) and contains(@tags,"NDRDISC") and contains(@tags,"1T1C") and contains(@tags,"IP6FWD") and not(contains(@tags,"IPSEC")) and not(contains(@tags,"VHOST"))]' --latency lat_50
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/78B-2t2c-ethip6-ip6-ndrdisc-lat50 \
     --title "78B-2t2c-ethip6-ip6[a-z0-9]+-[a-z-]*ndrdisc" \
     --xpath '//*[@framesize="78B" and (contains(@tags,"BASE") or contains(@tags,"SCALE") or contains(@tags,"FEATURE")) and contains(@tags,"NDRDISC") and contains(@tags,"2T2C") and contains(@tags,"IP6FWD") and not(contains(@tags,"IPSEC")) and not(contains(@tags,"VHOST"))]' --latency lat_50
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-1t1c-ethip4-ndrdisc-lat50 \
     --title "64B-1t1c-ethip4[a-z0-9]+-[a-z0-9]*-ndrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"ENCAP") and contains(@tags,"NDRDISC") and contains(@tags,"1T1C") and (contains(@tags,"VXLAN") or contains(@tags,"VXLANGPE") or contains(@tags,"LISP") or contains(@tags,"LISPGPE") or contains(@tags,"GRE")) and not(contains(@tags,"VHOST"))]' --latency lat_50
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-2t2c-ethip4-ndrdisc-lat50 \
     --title "64B-2t2c-ethip4[a-z0-9]+-[a-z0-9]*-ndrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"ENCAP") and contains(@tags,"NDRDISC") and contains(@tags,"2T2C") and (contains(@tags,"VXLAN") or contains(@tags,"VXLANGPE") or contains(@tags,"LISP") or contains(@tags,"LISPGPE") or contains(@tags,"GRE")) and not(contains(@tags,"VHOST"))]' --latency lat_50
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/78B-1t1c-ethip6-ndrdisc-lat50 \
     --title "78B-1t1c-ethip6[a-z0-9]+-[a-z0-9]*-ndrdisc" \
     --xpath '//*[@framesize="78B" and contains(@tags,"ENCAP") and contains(@tags,"NDRDISC") and contains(@tags,"1T1C") and (contains(@tags,"VXLAN") or contains(@tags,"VXLANGPE") or contains(@tags,"LISP") or contains(@tags,"LISPGPE") or contains(@tags,"GRE")) and not(contains(@tags,"VHOST"))]' --latency lat_50
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/78B-2t2c-ethip6-ndrdisc-lat50 \
     --title "78B-2t2c-ethip6[a-z0-9]+-[a-z0-9]*-ndrdisc" \
     --xpath '//*[@framesize="78B" and contains(@tags,"ENCAP") and contains(@tags,"NDRDISC") and contains(@tags,"2T2C") and (contains(@tags,"VXLAN") or contains(@tags,"VXLANGPE") or contains(@tags,"LISP") or contains(@tags,"LISPGPE") or contains(@tags,"GRE")) and not(contains(@tags,"VHOST"))]' --latency lat_50
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-1t1c-vhost-ndrdisc-lat50 \
     --title "64B-1t1c-.*vhost.*-ndrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"NDRDISC") and contains(@tags,"1T1C") and contains(@tags,"VHOST")]' --latency lat_50
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-2t2c-vhost-ndrdisc-lat50 \
     --title "64B-2t2c-.*vhost.*-ndrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"NDRDISC") and contains(@tags,"2T2C") and contains(@tags,"VHOST")]' --latency lat_50
 
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-1t1c-ipsechw-ndrdisc-lat50 \
     --title "64B-1t1c-.*ipsec.*-ndrdisc" \
     --xpath '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]' --latency lat_50
-python run_plot.py --input ${STATIC_DIR_VPP} \
+python run_plot.py --input ${PLOT_VPP_SOURCE_DIR} \
     --output ${STATIC_DIR_VPP}/64B-2t2c-ipsechw-ndrdisc-lat50 \
     --title "64B-2t2c-.*ipsec.*-ndrdisc" \
     --xpath '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]' --latency lat_50
 
-python run_plot.py --input ${STATIC_DIR_TESTPMD} \
-    --output ${STATIC_DIR_TESTPMD}/64B-1t1c-l2-ndrdisc-lat50 \
+python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
+    --output ${STATIC_DIR_DPDK}/64B-1t1c-l2-ndrdisc-lat50 \
     --title "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-ndrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"NDRDISC") and contains(@tags,"1T1C") and (contains(@tags,"L2BDMACSTAT") or contains(@tags,"L2BDMACLRN") or contains(@tags,"L2XCFWD")) and not(contains(@tags,"VHOST"))]' --latency lat_50
-python run_plot.py --input ${STATIC_DIR_TESTPMD} \
-    --output ${STATIC_DIR_TESTPMD}/64B-2t2c-l2-ndrdisc-lat50 \
+python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
+    --output ${STATIC_DIR_DPDK}/64B-2t2c-l2-ndrdisc-lat50 \
     --title "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-ndrdisc" \
     --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"NDRDISC") and contains(@tags,"2T2C") and (contains(@tags,"L2BDMACSTAT") or contains(@tags,"L2BDMACLRN") or contains(@tags,"L2XCFWD")) and not(contains(@tags,"VHOST"))]' --latency lat_50
+python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
+    --output ${STATIC_DIR_DPDK}/64B-1t1c-ipv4-ndrdisc-lat50 \
+    --title "64B-1t1c-ethip4-ip4base-l3fwd-ndrdisc" \
+    --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"NDRDISC") and contains(@tags,"1T1C") and contains(@tags,"IP4FWD")]' --latency lat_50
+python run_plot.py --input ${PLOT_DPDK_SOURCE_DIR} \
+    --output ${STATIC_DIR_DPDK}/64B-2t2c-ipv4-ndrdisc-lat50 \
+    --title "64B-2t2c-ethip4-ip4base-l3fwd-ndrdisc" \
+    --xpath '//*[@framesize="64B" and contains(@tags,"BASE") and contains(@tags,"NDRDISC") and contains(@tags,"2T2C") and contains(@tags,"IP4FWD")]' --latency lat_50
 
 # Create archive
 echo Creating csit.report.tar.gz ...