CSIT-1104: Trending: Speed-up plots generation

Change-Id: Ia3916523d4fc9e05ec864af2a858a03dea46c73c
Signed-off-by: Tibor Frank <tifrank@cisco.com>

8 files changed, 96 insertions, 96 deletions

diff --git a/docs/cpta/trending/container_memif.rst b/docs/cpta/trending/container_memif.rst
index 205268857d..097349d3a7 100644
--- a/docs/cpta/trending/container_memif.rst
+++ b/docs/cpta/trending/container_memif.rst
@@ -17,7 +17,7 @@ x520-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -34,7 +34,7 @@ x520-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -51,7 +51,7 @@ x520-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -71,7 +71,7 @@ x710-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -88,7 +88,7 @@ x710-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -105,7 +105,7 @@ x710-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -125,7 +125,7 @@ xl710-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -142,7 +142,7 @@ xl710-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -159,7 +159,7 @@ xl710-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -179,7 +179,7 @@ x520-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -196,7 +196,7 @@ x520-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -213,7 +213,7 @@ x520-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -233,7 +233,7 @@ x710-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -250,7 +250,7 @@ x710-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -267,7 +267,7 @@ x710-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -287,7 +287,7 @@ xl710-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -304,7 +304,7 @@ xl710-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -321,6 +321,6 @@ xl710-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4.rst b/docs/cpta/trending/ip4.rst
index 82aff5ff76..61d4841a70 100644
--- a/docs/cpta/trending/ip4.rst
+++ b/docs/cpta/trending/ip4.rst
@@ -17,7 +17,7 @@ x520-64b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -34,7 +34,7 @@ x520-64b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -51,7 +51,7 @@ x520-64b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -71,7 +71,7 @@ x520-64b-features
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -88,7 +88,7 @@ x520-64b-features
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -105,7 +105,7 @@ x520-64b-features
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -125,7 +125,7 @@ x710-64b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -142,7 +142,7 @@ x710-64b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -159,7 +159,7 @@ x710-64b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -179,7 +179,7 @@ x710-64b-features
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -196,7 +196,7 @@ x710-64b-features
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -213,7 +213,7 @@ x710-64b-features
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -233,7 +233,7 @@ xl710-64b-base-scale-features
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -250,7 +250,7 @@ xl710-64b-base-scale-features
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -267,6 +267,6 @@ xl710-64b-base-scale-features
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4_tunnels.rst b/docs/cpta/trending/ip4_tunnels.rst
index 5430c97ab8..746499283f 100644
--- a/docs/cpta/trending/ip4_tunnels.rst
+++ b/docs/cpta/trending/ip4_tunnels.rst
@@ -17,7 +17,7 @@ x520-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-1t1c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-1t1c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -34,7 +34,7 @@ x520-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t2c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t2c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -51,7 +51,7 @@ x520-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t4c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t4c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -71,7 +71,7 @@ x710-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-1t1c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-1t1c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -88,7 +88,7 @@ x710-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t2c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t2c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -105,6 +105,6 @@ x710-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t4c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t4c-x710.html"></iframe>
     <p><br><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6.rst b/docs/cpta/trending/ip6.rst
index cc1abc780a..9122c1e465 100644
--- a/docs/cpta/trending/ip6.rst
+++ b/docs/cpta/trending/ip6.rst
@@ -17,7 +17,7 @@ x520-78b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -34,7 +34,7 @@ x520-78b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -51,7 +51,7 @@ x520-78b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -71,7 +71,7 @@ x710-78b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -88,7 +88,7 @@ x710-78b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -105,7 +105,7 @@ x710-78b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -125,7 +125,7 @@ xl710-78b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -142,7 +142,7 @@ xl710-78b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -159,6 +159,6 @@ xl710-78b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
diff --git a/docs/cpta/trending/ipsec.rst b/docs/cpta/trending/ipsec.rst
index 5a4d4219dd..6b54d3e519 100644
--- a/docs/cpta/trending/ipsec.rst
+++ b/docs/cpta/trending/ipsec.rst
@@ -17,7 +17,7 @@ xl710-64b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-1t1c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-1t1c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -34,7 +34,7 @@ xl710-64b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-2t2c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-2t2c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -51,6 +51,6 @@ xl710-64b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-4t4c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-4t4c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
diff --git a/docs/cpta/trending/l2.rst b/docs/cpta/trending/l2.rst
index 5b08da2c23..05781537a8 100644
--- a/docs/cpta/trending/l2.rst
+++ b/docs/cpta/trending/l2.rst
@@ -17,7 +17,7 @@ x520-64b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -34,7 +34,7 @@ x520-64b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -51,7 +51,7 @@ x520-64b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -71,7 +71,7 @@ x520-64b-features
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-1t1c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-1t1c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -88,7 +88,7 @@ x520-64b-features
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t2c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t2c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -105,7 +105,7 @@ x520-64b-features
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -125,7 +125,7 @@ x710-64b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -142,7 +142,7 @@ x710-64b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -159,7 +159,7 @@ x710-64b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -179,7 +179,7 @@ x710-64b-features
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-1t1c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-1t1c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -196,7 +196,7 @@ x710-64b-features
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t2c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t2c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -213,7 +213,7 @@ x710-64b-features
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -233,7 +233,7 @@ xl710-64b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -250,7 +250,7 @@ xl710-64b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -267,6 +267,6 @@ xl710-64b-base-scale
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4.rst b/docs/cpta/trending/vm_vhost_ip4.rst
index 16f2746838..f13d6554af 100644
--- a/docs/cpta/trending/vm_vhost_ip4.rst
+++ b/docs/cpta/trending/vm_vhost_ip4.rst
@@ -17,7 +17,7 @@ x520-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-1t1c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-1t1c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -34,7 +34,7 @@ x520-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-2t2c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-2t2c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -51,7 +51,7 @@ x520-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-4t4c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-4t4c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -71,7 +71,7 @@ x710-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-1t1c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-1t1c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -88,7 +88,7 @@ x710-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-2t2c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-2t2c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -105,7 +105,7 @@ x710-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-4t4c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-4t4c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -125,7 +125,7 @@ x520-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-1t1c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-1t1c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -142,7 +142,7 @@ x520-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-2t2c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-2t2c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -159,7 +159,7 @@ x520-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-4t4c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-4t4c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -179,7 +179,7 @@ x710-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-1t1c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-1t1c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -196,7 +196,7 @@ x710-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-2t2c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-2t2c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -213,6 +213,6 @@ x710-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-4t4c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-4t4c-x710.html"></iframe>
     <p><br><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2.rst b/docs/cpta/trending/vm_vhost_l2.rst
index a55574f74b..4926928142 100644
--- a/docs/cpta/trending/vm_vhost_l2.rst
+++ b/docs/cpta/trending/vm_vhost_l2.rst
@@ -17,7 +17,7 @@ x520-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -34,7 +34,7 @@ x520-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -51,7 +51,7 @@ x520-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -71,7 +71,7 @@ x710-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -88,7 +88,7 @@ x710-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -105,7 +105,7 @@ x710-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -125,7 +125,7 @@ xl710-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -142,7 +142,7 @@ xl710-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -159,7 +159,7 @@ xl710-64b-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -179,7 +179,7 @@ x520-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -196,7 +196,7 @@ x520-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -213,7 +213,7 @@ x520-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-x520.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -233,7 +233,7 @@ x710-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -250,7 +250,7 @@ x710-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -267,7 +267,7 @@ x710-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-x710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-x710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -287,7 +287,7 @@ xl710-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -304,7 +304,7 @@ xl710-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-xl710.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -321,6 +321,6 @@ xl710-imix-base
 .. raw:: html
 
     </b>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-xl710.html"></iframe>
     <p><br><br></p>
     </center>