From 38201acbd8778f30e31909c952adc9a895d75fa6 Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Fri, 13 Sep 2019 13:53:23 +0200
Subject: [PATCH] Report: Fixes

Change-Id: Id14704f3c1526655adeaa51f0a4198b6309a64eb
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit e2d15edc355f0c70df578dde0495f8ffd85d8c12)
---
 .../packet_latency_graphs/vm_vhost-3n-skx-x710.rst |  2 +-
 .../vm_vhost-3n-skx-x710.rst                       |  2 +-
 .../ip4-3n-dnv-x553.rst                            | 24 +++++++--------
 .../ip4_tunnels-3n-dnv-x553.rst                    | 12 ++++----
 .../ip6-3n-dnv-x553.rst                            | 12 ++++----
 .../ipsec-3n-dnv-x553.rst                          | 12 ++++----
 .../l2-3n-dnv-x553.rst                             | 36 +++++++++++-----------
 .../srv6-3n-dnv-x553.rst                           | 12 ++++----
 .../vm_vhost-3n-skx-x710.rst                       |  2 +-
 resources/tools/presentation/generator_plots.py    | 16 +++++-----
 resources/tools/presentation/specification.yaml    | 10 +++---
 11 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-skx-x710.rst
index f1a6815035..6d6ef76389 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-skx-x710.rst
@@ -5,7 +5,7 @@
 
 .. raw:: html
 
-    <script type="text/javascript"
+    <script type="text/javascript">
 
         function getDocHeight(doc) {
             doc = doc || document;
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-x710.rst
index c0e65e2229..9bba507b00 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-x710.rst
@@ -5,7 +5,7 @@
 
 .. raw:: html
 
-    <script type="text/javascript"
+    <script type="text/javascript">
 
         function getDocHeight(doc) {
             doc = doc || document;
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-dnv-x553.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-dnv-x553.rst
index 1d152de207..c06253fc81 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-dnv-x553.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-dnv-x553.rst
@@ -66,7 +66,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-ip4routing-base-scale-ixgbe-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-ip4routing-base-scale-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -75,8 +75,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-ip4routing-base-scale-ixgbe-ndr}
-            \label{fig:3n-dnv-x553-64b-ip4routing-base-scale-ixgbe-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-ip4routing-base-scale-ixgbe-ndr-tsa}
+            \label{fig:3n-dnv-x553-64b-ip4routing-base-scale-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -86,7 +86,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-ip4routing-base-scale-ixgbe-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-ip4routing-base-scale-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -95,8 +95,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-ip4routing-base-scale-ixgbe-pdr}
-            \label{fig:3n-dnv-x553-64b-ip4routing-base-scale-ixgbe-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-ip4routing-base-scale-ixgbe-pdr-tsa}
+            \label{fig:3n-dnv-x553-64b-ip4routing-base-scale-ixgbe-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -109,7 +109,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-features-ip4routing-base-ixgbe-ndr.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-features-ip4routing-base-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -118,8 +118,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-features-ip4routing-base-ixgbe-ndr}
-            \label{fig:3n-dnv-x553-64b-features-ip4routing-base-ixgbe-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-features-ip4routing-base-ixgbe-ndr-tsa}
+            \label{fig:3n-dnv-x553-64b-features-ip4routing-base-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -129,7 +129,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-features-ip4routing-base-ixgbe-pdr.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-features-ip4routing-base-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -138,6 +138,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-features-ip4routing-base-ixgbe-pdr}
-            \label{fig:3n-dnv-x553-64b-features-ip4routing-base-ixgbe-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-features-ip4routing-base-ixgbe-pdr-tsa}
+            \label{fig:3n-dnv-x553-64b-features-ip4routing-base-ixgbe-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-dnv-x553.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-dnv-x553.rst
index 974cf10a3c..b8a7507c51 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-dnv-x553.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-dnv-x553.rst
@@ -49,7 +49,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-ip4tunnel-base-scale-ixgbe-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-ip4tunnel-base-scale-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -58,8 +58,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-ip4tunnel-base-scale-ixgbe-ndr}
-            \label{fig:3n-dnv-x553-64b-ip4tunnel-base-scale-ixgbe-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-ip4tunnel-base-scale-ixgbe-ndr-tsa}
+            \label{fig:3n-dnv-x553-64b-ip4tunnel-base-scale-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -69,7 +69,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-ip4tunnel-base-scale-ixgbe-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-ip4tunnel-base-scale-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -78,6 +78,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-ip4tunnel-base-scale-ixgbe-pdr}
-            \label{fig:3n-dnv-x553-64b-ip4tunnel-base-scale-ixgbe-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-ip4tunnel-base-scale-ixgbe-pdr-tsa}
+            \label{fig:3n-dnv-x553-64b-ip4tunnel-base-scale-ixgbe-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-dnv-x553.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-dnv-x553.rst
index ebdb1eb308..2ac06f0810 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-dnv-x553.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-dnv-x553.rst
@@ -52,7 +52,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-78b-ip6routing-base-scale-ixgbe-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-78b-ip6routing-base-scale-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -61,8 +61,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-78b-ip6routing-base-scale-ixgbe-ndr}
-            \label{fig:3n-dnv-x553-78b-ip6routing-base-scale-ixgbe-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-78b-ip6routing-base-scale-ixgbe-ndr-tsa}
+            \label{fig:3n-dnv-x553-78b-ip6routing-base-scale-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -72,7 +72,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-78b-ip6routing-base-scale-ixgbe-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-78b-ip6routing-base-scale-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -81,6 +81,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-78b-ip6routing-base-scale-ixgbe-pdr}
-            \label{fig:3n-dnv-x553-78b-ip6routing-base-scale-ixgbe-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-78b-ip6routing-base-scale-ixgbe-pdr-tsa}
+            \label{fig:3n-dnv-x553-78b-ip6routing-base-scale-ixgbe-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-dnv-x553.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-dnv-x553.rst
index 51326b6b8a..31575c7725 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-dnv-x553.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-dnv-x553.rst
@@ -54,7 +54,7 @@ imix-ipsec-ip4routing-base-scale-sw-ixgbe
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-imix-ipsec-ip4routing-base-scale-sw-ixgbe-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-imix-ipsec-ip4routing-base-scale-sw-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -63,8 +63,8 @@ imix-ipsec-ip4routing-base-scale-sw-ixgbe
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-imix-ipsec-ip4routing-base-scale-sw-ixgbe-ndr}
-            \label{fig:3n-dnv-x553-imix-ipsec-ip4routing-base-scale-sw-ixgbe-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-imix-ipsec-ip4routing-base-scale-sw-ixgbe-ndr-tsa}
+            \label{fig:3n-dnv-x553-imix-ipsec-ip4routing-base-scale-sw-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -74,7 +74,7 @@ imix-ipsec-ip4routing-base-scale-sw-ixgbe
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-imix-ipsec-ip4routing-base-scale-sw-ixgbe-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-imix-ipsec-ip4routing-base-scale-sw-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -83,6 +83,6 @@ imix-ipsec-ip4routing-base-scale-sw-ixgbe
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-imix-ipsec-ip4routing-base-scale-sw-ixgbe-pdr}
-            \label{fig:3n-dnv-x553-imix-ipsec-ip4routing-base-scale-sw-ixgbe-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-imix-ipsec-ip4routing-base-scale-sw-ixgbe-pdr-tsa}
+            \label{fig:3n-dnv-x553-imix-ipsec-ip4routing-base-scale-sw-ixgbe-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-dnv-x553.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-dnv-x553.rst
index 9172ecacf2..689f07599d 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-dnv-x553.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-dnv-x553.rst
@@ -80,7 +80,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-l2switching-base-ixgbe-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-l2switching-base-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-l2switching-base-ixgbe-ndr}
-            \label{fig:3n-dnv-x553-64b-l2switching-base-ixgbe-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-l2switching-base-ixgbe-ndr-tsa}
+            \label{fig:3n-dnv-x553-64b-l2switching-base-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-l2switching-base-ixgbe-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-l2switching-base-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,8 +109,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-l2switching-base-ixgbe-pdr}
-            \label{fig:3n-dnv-x553-64b-l2switching-base-ixgbe-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-l2switching-base-ixgbe-pdr-tsa}
+            \label{fig:3n-dnv-x553-64b-l2switching-base-ixgbe-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -123,7 +123,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-l2switching-base-scale-ixgbe-ndr.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-l2switching-base-scale-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -132,8 +132,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-l2switching-base-scale-ixgbe-ndr}
-            \label{fig:3n-dnv-x553-64b-l2switching-base-scale-ixgbe-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-l2switching-base-scale-ixgbe-ndr-tsa}
+            \label{fig:3n-dnv-x553-64b-l2switching-base-scale-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -143,7 +143,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-l2switching-base-scale-ixgbe-pdr.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-l2switching-base-scale-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -152,8 +152,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-l2switching-base-scale-ixgbe-pdr}
-            \label{fig:3n-dnv-x553-64b-l2switching-base-scale-ixgbe-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-l2switching-base-scale-ixgbe-pdr-tsa}
+            \label{fig:3n-dnv-x553-64b-l2switching-base-scale-ixgbe-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -166,7 +166,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-features-l2switching-base-ixgbe-ndr.html"></iframe>
+    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-features-l2switching-base-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -175,8 +175,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-features-l2switching-base-ixgbe-ndr}
-            \label{fig:3n-dnv-x553-64b-features-l2switching-base-ixgbe-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-features-l2switching-base-ixgbe-ndr-tsa}
+            \label{fig:3n-dnv-x553-64b-features-l2switching-base-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -186,7 +186,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-features-l2switching-base-ixgbe-pdr.html"></iframe>
+    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-64b-features-l2switching-base-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -195,6 +195,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-features-l2switching-base-ixgbe-pdr}
-            \label{fig:3n-dnv-x553-64b-features-l2switching-base-ixgbe-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-64b-features-l2switching-base-ixgbe-pdr-tsa}
+            \label{fig:3n-dnv-x553-64b-features-l2switching-base-ixgbe-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-dnv-x553.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-dnv-x553.rst
index 10a020399e..abf3ff4115 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-dnv-x553.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-dnv-x553.rst
@@ -51,7 +51,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -60,8 +60,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr}
-            \label{fig:3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr-tsa}
+            \label{fig:3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -71,7 +71,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -80,6 +80,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr}
-            \label{fig:3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr-tsa}
+            \label{fig:3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst
index f2637a2f38..284e3c3c85 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst
@@ -5,7 +5,7 @@
 
 .. raw:: html
 
-    <script type="text/javascript"
+    <script type="text/javascript">
 
         function getDocHeight(doc) {
             doc = doc || document;
diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 6fe1f287de..3e5da63c9e 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -1792,9 +1792,9 @@ def plot_service_density_heatmap(plot, input_data):
     """
 
     REGEX_CN = re.compile(r'^(\d*)R(\d*)C$')
-    REGEX_TEST_NAME = re.compile(r'^.*-(\d+vhost|\d+memif)-'
-                                 r'(\d+chain|\d+pipe)-'
-                                 r'(\d+vm|\d+dcr|\d+drc).*$')
+    REGEX_TEST_NAME = re.compile(r'^.*-(\d+ch|\d+pl)-'
+                                 r'(\d+mif|\d+vh)-'
+                                 r'(\d+vm\d+t|\d+dcr\d+t).*$')
 
     txt_chains = list()
     txt_nodes = list()
@@ -1821,9 +1821,9 @@ def plot_service_density_heatmap(plot, input_data):
                     continue
                 groups = re.search(REGEX_TEST_NAME, test["name"])
                 if groups and len(groups.groups()) == 3:
-                    hover_name = "{vhost}-{chain}-{vm}".format(
-                        vhost=str(groups.group(1)),
-                        chain=str(groups.group(2)),
+                    hover_name = "{chain}-{vhost}-{vm}".format(
+                        chain=str(groups.group(1)),
+                        vhost=str(groups.group(2)),
                         vm=str(groups.group(3)))
                 else:
                     hover_name = ""
@@ -2076,8 +2076,8 @@ def plot_service_density_heatmap_compare(plot, input_data):
 
     REGEX_CN = re.compile(r'^(\d*)R(\d*)C$')
     REGEX_TEST_NAME = re.compile(r'^.*-(\d+ch|\d+pl)-'
-                                 r'(\d+vh|\d+mif)-'
-                                 r'(\d+vm|\d+dcr).*$')
+                                 r'(\d+mif|\d+vh)-'
+                                 r'(\d+vm\d+t|\d+dcr\d+t).*$')
     REGEX_THREADS = re.compile(r'^(\d+)(VM|DCR)(\d+)T$')
 
     txt_chains = list()
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 3392e0bcad..30d76fb370 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -12494,7 +12494,7 @@
 - type: "plot"
   title: "Speedup: 3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-vpp-ndr"
   algorithm: "plot_throughput_speedup_analysis_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-.t.c-link-bonding-vhost-base-i40e-vpp-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-vpp-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx-vhost"
   include:
     - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
@@ -12504,13 +12504,13 @@
     - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-.t.c-link-bonding-vhost-base-i40e-vpp-ndr"
+    title: "3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-vpp-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-skx-xxv710-64b-.t.c-link-bonding-vhost-base-i40e-vpp-pdr"
+  title: "Speedup: 3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-vpp-pdr"
   algorithm: "plot_throughput_speedup_analysis_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-.t.c-link-bonding-vhost-base-i40e-vpp-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-vpp-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx-vhost"
   include:
     - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
@@ -12520,7 +12520,7 @@
     - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-.t.c-link-bonding-vhost-base-i40e-vpp-pdr"
+    title: "3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-vpp-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-- 
2.16.6