CSIT-1034: Add all x710 tests

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

8 files changed, 1053 insertions, 219 deletions

diff --git a/docs/cpta/trending/container_memif.rst b/docs/cpta/trending/container_memif.rst
index ac08b62cf7..b9acfd4e28 100644
--- a/docs/cpta/trending/container_memif.rst
+++ b/docs/cpta/trending/container_memif.rst
@@ -13,13 +13,13 @@ L2 Ethernet Switching
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`Container memif Connections, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-x520-1.html"></iframe><br><br>
 
-:index:`Container memif Connections, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
@@ -28,13 +28,13 @@ L2 Ethernet Switching
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`Container memif Connections, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching 10ge2p1x520, 64B, 2t2c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-x520-1.html"></iframe><br><br>
 
-:index:`Container memif Connections, 10ge2p1x520 , 64B, 2t2c- Weekly Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching 10ge2p1x520 , 64B, 2t2c- Weekly Trend`.
 
 .. raw:: html
 
@@ -43,13 +43,13 @@ L2 Ethernet Switching
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`Container memif Connections, 10ge2p1x520, 64B, 4t4c - Daily Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching 10ge2p1x520, 64B, 4t4c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-x520-1.html"></iframe><br><br>
 
-:index:`Container memif Connections, 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
@@ -61,13 +61,13 @@ IMIX Packet
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`Container memif Connections, 10ge2p1x520, IMIX, 1t1c - Daily Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching 10ge2p1x520, IMIX, 1t1c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-x520-1.html"></iframe><br><br>
 
-:index:`Container memif Connections, 10ge2p1x520, IMIX, 1t1c - Weekly Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching 10ge2p1x520, IMIX, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
@@ -76,13 +76,13 @@ IMIX Packet
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`Container memif Connections, 10ge2p1x520, IMIX, 2t2c - Daily Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching 10ge2p1x520, IMIX, 2t2c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-x520-1.html"></iframe><br><br>
 
-:index:`Container memif Connections, 10ge2p1x520, IMIX, 2t2c - Weekly Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching 10ge2p1x520, IMIX, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
@@ -91,18 +91,120 @@ IMIX Packet
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`Container memif Connections, 10ge2p1x520, IMIX, 4t4c - Daily Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching 10ge2p1x520, IMIX, 4t4c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-x520-1.html"></iframe><br><br>
 
-:index:`Container memif Connections, 10ge2p1x520, IMIX, 4t4c - Weekly Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching 10ge2p1x520, IMIX, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-x520-14.html"></iframe><br><br>
 
+NIC 10ge2p1x710
+---------------
+
+L2 Ethernet Switching
+`````````````````````
+
+64B Packet
+..........
+
+1 Thread, 1 Core
+~~~~~~~~~~~~~~~~
+
+:index:`Container memif Connections: L2 Ethernet Switching, 10ge2p1x710, 64B, 1t1c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-x710-1.html"></iframe><br><br>
+
+:index:`Container memif Connections: L2 Ethernet Switching, 10ge2p1x710, 64B, 1t1c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-x710-14.html"></iframe><br><br>
+
+2 Threads, 2 Cores
+~~~~~~~~~~~~~~~~~~
+
+:index:`Container memif Connections: L2 Ethernet Switching, 10ge2p1x710, 64B, 2t2c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-x710-1.html"></iframe><br><br>
+
+:index:`Container memif Connections: L2 Ethernet Switching, 10ge2p1x710 , 64B, 2t2c- Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-x710-14.html"></iframe><br><br>
+
+4 Threads, 4 Cores
+~~~~~~~~~~~~~~~~~~
+
+:index:`Container memif Connections: L2 Ethernet Switching, 10ge2p1x710, 64B, 4t4c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-x710-1.html"></iframe><br><br>
+
+:index:`Container memif Connections: L2 Ethernet Switching, 10ge2p1x710, 64B, 4t4c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-x710-14.html"></iframe><br><br>
+
+IMIX Packet
+...........
+
+1 Thread, 1 Core
+~~~~~~~~~~~~~~~~
+
+:index:`Container memif Connections: L2 Ethernet Switching, 10ge2p1x710, IMIX, 1t1c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-x710-1.html"></iframe><br><br>
+
+:index:`Container memif Connections: L2 Ethernet Switching, 10ge2p1x710, IMIX, 1t1c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-x710-14.html"></iframe><br><br>
+
+2 Threads, 2 Cores
+~~~~~~~~~~~~~~~~~~
+
+:index:`Container memif Connections: L2 Ethernet Switching, 10ge2p1x710, IMIX, 2t2c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-x710-1.html"></iframe><br><br>
+
+:index:`Container memif Connections: L2 Ethernet Switching, 10ge2p1x710, IMIX, 2t2c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-x710-14.html"></iframe><br><br>
+
+4 Threads, 4 Cores
+~~~~~~~~~~~~~~~~~~
+
+:index:`Container memif Connections: L2 Ethernet Switching, 10ge2p1x710, IMIX, 4t4c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-x710-1.html"></iframe><br><br>
+
+:index:`Container memif Connections: L2 Ethernet Switching, 10ge2p1x710, IMIX, 4t4c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-x710-14.html"></iframe><br><br>
+
 NIC 40ge2p1xl710
 ----------------
 
@@ -115,13 +217,13 @@ L2 Ethernet Switching
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`Container memif Connections, 40ge2p1xl710, 64B, 1t1c - Daily Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching, 40ge2p1xl710, 64B, 1t1c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-xl710-1.html"></iframe><br><br>
 
-:index:`Container memif Connections, 40ge2p1xl710, 64B, 1t1c - Weekly Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching, 40ge2p1xl710, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
@@ -130,13 +232,13 @@ L2 Ethernet Switching
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`Container memif Connections, 40ge2p1xl710, 64B, 2t2c - Daily Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching 40ge2p1xl710, 64B, 2t2c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-xl710-1.html"></iframe><br><br>
 
-:index:`Container memif Connections, 40ge2p1xl710, 64B, 2t2c - Weekly Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching, 40ge2p1xl710, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
@@ -145,13 +247,13 @@ L2 Ethernet Switching
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`Container memif Connections, 40ge2p1xl710, 64B, 4t4c - Daily Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching, 40ge2p1xl710, 64B, 4t4c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-xl710-1.html"></iframe><br><br>
 
-:index:`Container memif Connections, 40ge2p1xl710, 64B, 4t4c - Weekly Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching, 40ge2p1xl710, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
@@ -163,13 +265,13 @@ IMIX Packet
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`Container memif Connections, 40ge2p1xl710, IMIX, 1t1c - Daily Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching, 40ge2p1xl710, IMIX, 1t1c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-xl710-1.html"></iframe><br><br>
 
-:index:`Container memif Connections, 40ge2p1xl710, IMIX, 1t1c - Weekly Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching, 40ge2p1xl710, IMIX, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
@@ -180,13 +282,13 @@ IMIX Packet
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`Container memif Connections, 40ge2p1xl710, IMIX, 2t2c - Daily Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching, 40ge2p1xl710, IMIX, 2t2c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-xl710-1.html"></iframe><br><br>
 
-:index:`Container memif Connections, 40ge2p1xl710, IMIX, 2t2c - Weekly Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching, 40ge2p1xl710, IMIX, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
@@ -195,13 +297,13 @@ IMIX Packet
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`Container memif Connections, 40ge2p1xl710, IMIX, 4t4c - Daily Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching, 40ge2p1xl710, IMIX, 4t4c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-xl710-1.html"></iframe><br><br>
 
-:index:`Container memif Connections, 40ge2p1xl710, IMIX, 4t4c - Weekly Trend`.
+:index:`Container memif Connections: L2 Ethernet Switching, 40ge2p1xl710, IMIX, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
diff --git a/docs/cpta/trending/ip4.rst b/docs/cpta/trending/ip4.rst
index e766515a4b..4f75274995 100644
--- a/docs/cpta/trending/ip4.rst
+++ b/docs/cpta/trending/ip4.rst
@@ -13,13 +13,13 @@ Base and Scale
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`IPv4 Routed-Forwarding - Base and Scale, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
+:index:`IPv4 Routed-Forwarding: Base and Scale, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-x520-1.html"></iframe><br><br>
 
-:index:`IPv4 Routed-Forwarding - Base and Scale, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
+:index:`IPv4 Routed-Forwarding: Base and Scale, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
@@ -28,13 +28,13 @@ Base and Scale
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`IPv4 Routed-Forwarding - Base and Scale, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
+:index:`IPv4 Routed-Forwarding: Base and Scale, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-x520-1.html"></iframe><br><br>
 
-:index:`IPv4 Routed-Forwarding - Base and Scale, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
+:index:`IPv4 Routed-Forwarding: Base and Scale, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
@@ -43,13 +43,13 @@ Base and Scale
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`IPv4 Routed-Forwarding - Base and Scale, 10ge2p1x520, 64B, 4t4c - Daily Trend`.
+:index:`IPv4 Routed-Forwarding: Base and Scale, 10ge2p1x520, 64B, 4t4c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-x520-1.html"></iframe><br><br>
 
-:index:`IPv4 Routed-Forwarding - Base and Scale, 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
+:index:`IPv4 Routed-Forwarding: Base and Scale, 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
@@ -64,13 +64,13 @@ Features
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`IPv4 Routed-Forwarding - Features, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
+:index:`IPv4 Routed-Forwarding: Features, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x520-1.html"></iframe><br><br>
 
-:index:`IPv4 Routed-Forwarding - Features, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
+:index:`IPv4 Routed-Forwarding: Features, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
@@ -79,13 +79,13 @@ Features
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`IPv4 Routed-Forwarding - Features, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
+:index:`IPv4 Routed-Forwarding: Features, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x520-1.html"></iframe><br><br>
 
-:index:`IPv4 Routed-Forwarding - Features, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
+:index:`IPv4 Routed-Forwarding: Features, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
@@ -94,18 +94,124 @@ Features
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`IPv4 Routed-Forwarding - Features, 10ge2p1x520, 64B, 4t4c - Daily Trend`.
+:index:`IPv4 Routed-Forwarding: Features, 10ge2p1x520, 64B, 4t4c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x520-1.html"></iframe><br><br>
 
-:index:`IPv4 Routed-Forwarding - Features, 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
+:index:`IPv4 Routed-Forwarding: Features, 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x520-14.html"></iframe><br><br>
 
+
+NIC 10ge2p1x710
+---------------
+
+Base and Scale
+``````````````
+
+64B Packet
+..........
+
+1 Thread, 1 Core
+~~~~~~~~~~~~~~~~
+
+:index:`IPv4 Routed-Forwarding: Base and Scale, 10ge2p1x710, 64B, 1t1c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-x710-1.html"></iframe><br><br>
+
+:index:`IPv4 Routed-Forwarding: Base and Scale, 10ge2p1x710, 64B, 1t1c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-x710-14.html"></iframe><br><br>
+
+2 Threads, 2 Cores
+~~~~~~~~~~~~~~~~~~
+
+:index:`IPv4 Routed-Forwarding: Base and Scale, 10ge2p1x710, 64B, 2t2c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-x710-1.html"></iframe><br><br>
+
+:index:`IPv4 Routed-Forwarding: Base and Scale, 10ge2p1x710, 64B, 2t2c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-x710-14.html"></iframe><br><br>
+
+4 Threads, 4 Cores
+~~~~~~~~~~~~~~~~~~
+
+:index:`IPv4 Routed-Forwarding: Base and Scale, 10ge2p1x710, 64B, 4t4c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-x710-1.html"></iframe><br><br>
+
+:index:`IPv4 Routed-Forwarding: Base and Scale, 10ge2p1x710, 64B, 4t4c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-x710-14.html"></iframe><br><br>
+
+Features
+````````
+
+64B Packet
+..........
+
+1 Thread, 1 Core
+~~~~~~~~~~~~~~~~
+
+:index:`IPv4 Routed-Forwarding: Features, 10ge2p1x710, 64B, 1t1c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x710-1.html"></iframe><br><br>
+
+:index:`IPv4 Routed-Forwarding: Features, 10ge2p1x710, 64B, 1t1c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x710-14.html"></iframe><br><br>
+
+2 Threads, 2 Cores
+~~~~~~~~~~~~~~~~~~
+
+:index:`IPv4 Routed-Forwarding: Features, 10ge2p1x710, 64B, 2t2c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x710-1.html"></iframe><br><br>
+
+:index:`IPv4 Routed-Forwarding: Features, 10ge2p1x710, 64B, 2t2c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x710-14.html"></iframe><br><br>
+
+4 Threads, 4 Cores
+~~~~~~~~~~~~~~~~~~
+
+:index:`IPv4 Routed-Forwarding: Features, 10ge2p1x710, 64B, 4t4c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x710-1.html"></iframe><br><br>
+
+:index:`IPv4 Routed-Forwarding: Features, 10ge2p1x710, 64B, 4t4c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x710-14.html"></iframe><br><br>
+
 NIC 40ge2p1xl710
 ----------------
 
@@ -118,13 +224,13 @@ Base, Scale and Features
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 1t1c - Daily Trend`.
+:index:`IPv4 Routed-Forwarding: Base, Scale and Features, 40ge2p1xl710, 64B, 1t1c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-xl710-1.html"></iframe><br><br>
 
-:index:`IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 1t1c - Weekly Trend`.
+:index:`IPv4 Routed-Forwarding: Base, Scale and Features, 40ge2p1xl710, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
@@ -133,13 +239,13 @@ Base, Scale and Features
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 2t2c - Daily Trend`.
+:index:`IPv4 Routed-Forwarding: Base, Scale and Features, 40ge2p1xl710, 64B, 2t2c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-xl710-1.html"></iframe><br><br>
 
-:index:`IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 2t2c - Weekly Trend`.
+:index:`IPv4 Routed-Forwarding: Base, Scale and Features, 40ge2p1xl710, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
@@ -148,13 +254,13 @@ Base, Scale and Features
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 4t4c - Daily Trend`.
+:index:`IPv4 Routed-Forwarding: Base, Scale and Features, 40ge2p1xl710, 64B, 4t4c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-xl710-1.html"></iframe><br><br>
 
-:index:`IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 4t4c - Weekly Trend`.
+:index:`IPv4 Routed-Forwarding: Base, Scale and Features, 40ge2p1xl710, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
diff --git a/docs/cpta/trending/ip4_tunnels.rst b/docs/cpta/trending/ip4_tunnels.rst
index fdf37ad409..fc49ced1fe 100644
--- a/docs/cpta/trending/ip4_tunnels.rst
+++ b/docs/cpta/trending/ip4_tunnels.rst
@@ -1,19 +1,22 @@
 IPv4 Overlay Tunnels
 ====================
 
+NIC 10ge2p1x520
+---------------
+
 64B Packet
 ..........
 
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`IPv4 Overlay Tunnels, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
+:index:`IPv4 Overlay Tunnels: 10ge2p1x520, 64B, 1t1c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-1t1c-x520-1.html"></iframe><br><br>
 
-:index:`IPv4 Overlay Tunnels, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
+:index:`IPv4 Overlay Tunnels: 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
@@ -22,13 +25,13 @@ IPv4 Overlay Tunnels
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`IPv4 Overlay Tunnels, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
+:index:`IPv4 Overlay Tunnels: 10ge2p1x520, 64B, 2t2c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t2c-x520-1.html"></iframe><br><br>
 
-:index:`IPv4 Overlay Tunnels, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
+:index:`IPv4 Overlay Tunnels: 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
@@ -37,14 +40,65 @@ IPv4 Overlay Tunnels
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`IPv4 Overlay Tunnels, 10ge2p1x520, 64B, 4t4c - Daily Trend`.
+:index:`IPv4 Overlay Tunnels: 10ge2p1x520, 64B, 4t4c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t4c-x520-1.html"></iframe><br><br>
 
-:index:`IPv4 Overlay Tunnels, 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
+:index:`IPv4 Overlay Tunnels: 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t4c-x520-14.html"></iframe><br><br>
+
+NIC 10ge2p1x710
+---------------
+
+64B Packet
+..........
+
+1 Thread, 1 Core
+~~~~~~~~~~~~~~~~
+
+:index:`IPv4 Overlay Tunnels: 10ge2p1x710, 64B, 1t1c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-1t1c-x710-1.html"></iframe><br><br>
+
+:index:`IPv4 Overlay Tunnels: 10ge2p1x710, 64B, 1t1c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-1t1c-x710-14.html"></iframe><br><br>
+
+2 Threads, 2 Cores
+~~~~~~~~~~~~~~~~~~
+
+:index:`IPv4 Overlay Tunnels: 10ge2p1x710, 64B, 2t2c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t2c-x710-1.html"></iframe><br><br>
+
+:index:`IPv4 Overlay Tunnels: 10ge2p1x710, 64B, 2t2c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t2c-x710-14.html"></iframe><br><br>
+
+4 Threads, 4 Cores
+~~~~~~~~~~~~~~~~~~
+
+:index:`IPv4 Overlay Tunnels: 10ge2p1x710, 64B, 4t4c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t4c-x710-1.html"></iframe><br><br>
+
+:index:`IPv4 Overlay Tunnels: 10ge2p1x710, 64B, 4t4c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t4c-x710-14.html"></iframe><br><br>
diff --git a/docs/cpta/trending/ip6.rst b/docs/cpta/trending/ip6.rst
index 46246b554f..02df4688b8 100644
--- a/docs/cpta/trending/ip6.rst
+++ b/docs/cpta/trending/ip6.rst
@@ -10,13 +10,13 @@ NIC 10ge2p1x520
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`IPv6 Routed-Forwarding, 10ge2p1x520, 78B, 1t1c - Daily Trend`.
+:index:`IPv6 Routed-Forwarding: 10ge2p1x520, 78B, 1t1c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x520-1.html"></iframe><br><br>
 
-:index:`IPv6 Routed-Forwarding, 10ge2p1x520, 78B, 1t1c - Weekly Trend`.
+:index:`IPv6 Routed-Forwarding: 10ge2p1x520, 78B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
@@ -25,13 +25,13 @@ NIC 10ge2p1x520
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`IPv6 Routed-Forwarding, 10ge2p1x520, 78B, 2t2c - Daily Trend`.
+:index:`IPv6 Routed-Forwarding: 10ge2p1x520, 78B, 2t2c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x520-1.html"></iframe><br><br>
 
-:index:`IPv6 Routed-Forwarding, 10ge2p1x520, 78B, 2t2c - Weekly Trend`.
+:index:`IPv6 Routed-Forwarding: 10ge2p1x520, 78B, 2t2c - Weekly Trend`.
 
 
 .. raw:: html
@@ -41,18 +41,70 @@ NIC 10ge2p1x520
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`IPv6 Routed-Forwarding, 10ge2p1x520, 78B, 4t4c - Daily Trend`.
+:index:`IPv6 Routed-Forwarding: 10ge2p1x520, 78B, 4t4c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x520-1.html"></iframe><br><br>
 
-:index:`IPv6 Routed-Forwarding, 10ge2p1x520, 78B, 4t4c - Weekly Trend`.
+:index:`IPv6 Routed-Forwarding: 10ge2p1x520, 78B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x520-14.html"></iframe><br><br>
 
+NIC 10ge2p1x710
+---------------
+
+78B Packet
+..........
+
+1 Thread, 1 Core
+~~~~~~~~~~~~~~~~
+
+:index:`IPv6 Routed-Forwarding: 10ge2p1x710, 78B, 1t1c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x710-1.html"></iframe><br><br>
+
+:index:`IPv6 Routed-Forwarding: 10ge2p1x710, 78B, 1t1c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x710-14.html"></iframe><br><br>
+
+2 Threads, 2 Cores
+~~~~~~~~~~~~~~~~~~
+
+:index:`IPv6 Routed-Forwarding: 10ge2p1x710, 78B, 2t2c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x710-1.html"></iframe><br><br>
+
+:index:`IPv6 Routed-Forwarding: 10ge2p1x710, 78B, 2t2c - Weekly Trend`.
+
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x710-14.html"></iframe><br><br>
+
+4 Threads, 4 Cores
+~~~~~~~~~~~~~~~~~~
+
+:index:`IPv6 Routed-Forwarding: 10ge2p1x710, 78B, 4t4c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x710-1.html"></iframe><br><br>
+
+:index:`IPv6 Routed-Forwarding: 10ge2p1x710, 78B, 4t4c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x710-14.html"></iframe><br><br>
+
 NIC 40ge2p1xl710
 ----------------
 
@@ -62,13 +114,13 @@ NIC 40ge2p1xl710
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`IPv6 Routed-Forwarding, 40ge2p1xl710, 78B, 1t1c - Daily Trend`.
+:index:`IPv6 Routed-Forwarding: 40ge2p1xl710, 78B, 1t1c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-xl710-1.html"></iframe><br><br>
 
-:index:`IPv6 Routed-Forwarding, 40ge2p1xl710, 78B, 1t1c - Weekly Trend`.
+:index:`IPv6 Routed-Forwarding: 40ge2p1xl710, 78B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
@@ -77,13 +129,13 @@ NIC 40ge2p1xl710
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`IPv6 Routed-Forwarding, 40ge2p1xl710, 78B, 2t2c - Daily Trend`.
+:index:`IPv6 Routed-Forwarding: 40ge2p1xl710, 78B, 2t2c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-xl710-1.html"></iframe><br><br>
 
-:index:`IPv6 Routed-Forwarding, 40ge2p1xl710, 78B, 2t2c - Weekly Trend`.
+:index:`IPv6 Routed-Forwarding: 40ge2p1xl710, 78B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
@@ -92,13 +144,13 @@ NIC 40ge2p1xl710
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`IPv6 Routed-Forwarding, 40ge2p1xl710, 78B, 4t4c - Daily Trend`.
+:index:`IPv6 Routed-Forwarding: 40ge2p1xl710, 78B, 4t4c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-xl710-1.html"></iframe><br><br>
 
-:index:`IPv6 Routed-Forwarding, 40ge2p1xl710, 78B, 4t4c - Weekly Trend`.
+:index:`IPv6 Routed-Forwarding: 40ge2p1xl710, 78B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
diff --git a/docs/cpta/trending/ipsec.rst b/docs/cpta/trending/ipsec.rst
index f17d9a317e..82623ef1ae 100644
--- a/docs/cpta/trending/ipsec.rst
+++ b/docs/cpta/trending/ipsec.rst
@@ -4,6 +4,9 @@ IPSec Crypto HW: IP4 Routed-Forwarding
 NIC 40ge2p1xl710
 ----------------
 
+IPv4 Routed-Forwarding
+``````````````````````
+
 64B Packet
 ..........
 
diff --git a/docs/cpta/trending/l2.rst b/docs/cpta/trending/l2.rst
index ae24fe180a..6abdd1dd76 100644
--- a/docs/cpta/trending/l2.rst
+++ b/docs/cpta/trending/l2.rst
@@ -13,13 +13,13 @@ Base and Scale
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`L2 Ethernet Switching - Base and Scale, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
+:index:`L2 Ethernet Switching: Base and Scale, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-x520-1.html"></iframe><br><br>
 
-:index:`L2 Ethernet Switching - Base and Scale, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
+:index:`L2 Ethernet Switching: Base and Scale, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
@@ -28,13 +28,13 @@ Base and Scale
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`L2 Ethernet Switching - Base and Scale, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
+:index:`L2 Ethernet Switching: Base and Scale, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-x520-1.html"></iframe><br><br>
 
-:index:`L2 Ethernet Switching - Base and Scale, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
+:index:`L2 Ethernet Switching: Base and Scale, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
@@ -43,13 +43,13 @@ Base and Scale
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`L2 Ethernet Switching - Base and Scale, 10ge2p1x520, 64B, 4t4c - Daily Trend`.
+:index:`L2 Ethernet Switching: Base and Scale, 10ge2p1x520, 64B, 4t4c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-x520-1.html"></iframe><br><br>
 
-:index:`L2 Ethernet Switching - Base and Scale, 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
+:index:`L2 Ethernet Switching: Base and Scale, 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
@@ -64,13 +64,13 @@ Features
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`L2 Ethernet Switching - Features, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
+:index:`L2 Ethernet Switching: Features, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-1t1c-x520-1.html"></iframe><br><br>
 
-:index:`L2 Ethernet Switching - Features, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
+:index:`L2 Ethernet Switching: Features, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
@@ -79,13 +79,13 @@ Features
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`L2 Ethernet Switching - Features, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
+:index:`L2 Ethernet Switching: Features, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t2c-x520-1.html"></iframe><br><br>
 
-:index:`L2 Ethernet Switching - Features, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
+:index:`L2 Ethernet Switching: Features, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
@@ -94,19 +94,19 @@ Features
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`L2 Ethernet Switching - Features, 10ge2p1x520, 64B, 4t4c - Daily Trend`.
+:index:`L2 Ethernet Switching: Features, 10ge2p1x520, 64B, 4t4c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x520-1.html"></iframe><br><br>
 
-:index:`L2 Ethernet Switching - Features, 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
+:index:`L2 Ethernet Switching: Features, 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x520-14.html"></iframe><br><br>
 
-NIC 40ge2p1xl710
+NIC 10ge2p1x710
 ----------------
 
 Base and Scale
@@ -118,49 +118,100 @@ Base and Scale
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`L2 Ethernet Switching, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
+:index:`L2 Ethernet Switching: Base and Scale, 10ge2p1x710, 64B, 1t1c - Daily Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-xl710-1.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-x710-1.html"></iframe><br><br>
 
-:index:`L2 Ethernet Switching, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
+:index:`L2 Ethernet Switching: Base and Scale, 10ge2p1x710, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-xl710-14.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-x710-14.html"></iframe><br><br>
 
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`L2 Ethernet Switching, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
+:index:`L2 Ethernet Switching: Base and Scale, 10ge2p1x710, 64B, 2t2c - Daily Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-xl710-1.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-x710-1.html"></iframe><br><br>
 
-:index:`L2 Ethernet Switching, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
+:index:`L2 Ethernet Switching: Base and Scale, 10ge2p1x710, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-xl710-14.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-x710-14.html"></iframe><br><br>
 
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`L2 Ethernet Switching, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
+:index:`L2 Ethernet Switching: Base and Scale, 10ge2p1x710, 64B, 4t4c - Daily Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-xl710-1.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-x710-1.html"></iframe><br><br>
 
-:index:`L2 Ethernet Switching, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
+:index:`L2 Ethernet Switching: Base and Scale, 10ge2p1x710, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-xl710-14.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-x710-14.html"></iframe><br><br>
 
-NIC 10ge2p1x710
+Features
+````````
+
+64B Packet
+..........
+
+1 Thread, 1 Core
+~~~~~~~~~~~~~~~~
+
+:index:`L2 Ethernet Switching: Features, 10ge2p1x710, 64B, 1t1c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-1t1c-x710-1.html"></iframe><br><br>
+
+:index:`L2 Ethernet Switching: Features, 10ge2p1x710, 64B, 1t1c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-1t1c-x710-14.html"></iframe><br><br>
+
+2 Threads, 2 Cores
+~~~~~~~~~~~~~~~~~~
+
+:index:`L2 Ethernet Switching: Features, 10ge2p1x710, 64B, 2t2c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t2c-x710-1.html"></iframe><br><br>
+
+:index:`L2 Ethernet Switching: Features, 10ge2p1x710, 64B, 2t2c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t2c-x710-14.html"></iframe><br><br>
+
+4 Threads, 4 Cores
+~~~~~~~~~~~~~~~~~~
+
+:index:`L2 Ethernet Switching: Features, 10ge2p1x710, 64B, 4t4c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x710-1.html"></iframe><br><br>
+
+:index:`L2 Ethernet Switching: Features, 10ge2p1x710, 64B, 4t4c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x710-14.html"></iframe><br><br>
+
+NIC 40ge2p1xl710
 ----------------
 
 Base and Scale
@@ -172,44 +223,44 @@ Base and Scale
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`L2 Ethernet Switching, 10ge2p1x710, 64B, 1t1c - Daily Trend`.
+:index:`L2 Ethernet Switching: Base and Scale, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-x710-1.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-xl710-1.html"></iframe><br><br>
 
-:index:`L2 Ethernet Switching, 10ge2p1x710, 64B, 1t1c - Weekly Trend`.
+:index:`L2 Ethernet Switching: Base and Scale, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-x710-14.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-xl710-14.html"></iframe><br><br>
 
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`L2 Ethernet Switching, 10ge2p1x710, 64B, 2t2c - Daily Trend`.
+:index:`L2 Ethernet Switching: Base and Scale, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-x710-1.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-xl710-1.html"></iframe><br><br>
 
-:index:`L2 Ethernet Switching, 10ge2p1x710, 64B, 2t2c - Weekly Trend`.
+:index:`L2 Ethernet Switching: Base and Scale, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-x710-14.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-xl710-14.html"></iframe><br><br>
 
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`L2 Ethernet Switching, 10ge2p1x710, 64B, 4t4c - Daily Trend`.
+:index:`L2 Ethernet Switching: Base and Scale, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-x710-1.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-xl710-1.html"></iframe><br><br>
 
-:index:`L2 Ethernet Switching, 10ge2p1x710, 64B, 4t4c - Weekly Trend`.
+:index:`L2 Ethernet Switching: Base and Scale, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-x710-14.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-xl710-14.html"></iframe><br><br>
diff --git a/docs/cpta/trending/vm_vhost.rst b/docs/cpta/trending/vm_vhost.rst
index a614e1ddf4..01831bdf6f 100644
--- a/docs/cpta/trending/vm_vhost.rst
+++ b/docs/cpta/trending/vm_vhost.rst
@@ -13,13 +13,13 @@ IPv4 Routed-Forwarding
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-1t1c-x520-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
@@ -28,13 +28,13 @@ IPv4 Routed-Forwarding
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-2t2c-x520-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
@@ -43,13 +43,13 @@ IPv4 Routed-Forwarding
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x520, 64B, 4t4c - Daily Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x520, 64B, 4t4c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-4t4c-x520-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
@@ -61,13 +61,13 @@ IMIX Packet
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x520, IMIX, 1t1c - Daily Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x520, IMIX, 1t1c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-1t1c-x520-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x520, IMIX, 1t1c - Weekly Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x520, IMIX, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
@@ -76,13 +76,13 @@ IMIX Packet
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x520, IMIX, 2t2c - Daily Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x520, IMIX, 2t2c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-2t2c-x520-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x520, IMIX, 2t2c - Weekly Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x520, IMIX, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
@@ -91,13 +91,13 @@ IMIX Packet
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x520, IMIX, 4t4c - Daily Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x520, IMIX, 4t4c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-4t4c-x520-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x520, IMIX, 4t4c - Weekly Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x520, IMIX, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
@@ -112,13 +112,13 @@ L2 Ethernet Switching
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, L2 Ethernet Switching, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
+:index:`VM vhost Connections: L2 Ethernet Switching, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-x520-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, L2 Ethernet Switching, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
+:index:`VM vhost Connections: L2 Ethernet Switching, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
@@ -127,13 +127,13 @@ L2 Ethernet Switching
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, L2 Ethernet Switching, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
+:index:`VM vhost Connections: L2 Ethernet Switching, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-x520-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, L2 Ethernet Switching, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
+:index:`VM vhost Connections: L2 Ethernet Switching, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
@@ -142,13 +142,13 @@ L2 Ethernet Switching
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, L2 Ethernet Switching, 10ge2p1x520, 64B, 4t4c - Daily Trend`.
+:index:`VM vhost Connections: L2 Ethernet Switching, 10ge2p1x520, 64B, 4t4c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-x520-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, L2 Ethernet Switching, 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
+:index:`VM vhost Connections: L2 Ethernet Switching, 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
@@ -160,13 +160,13 @@ IMIX Packet
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, L2 Ethernet Switching, 10ge2p1x520, IMIX, 1t1c - Daily Trend`.
+:index:`VM vhost Connections: L2 Ethernet Switching, 10ge2p1x520, IMIX, 1t1c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-x520-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, L2 Ethernet Switching, 10ge2p1x520, IMIX, 1t1c - Weekly Trend`.
+:index:`VM vhost Connections: L2 Ethernet Switching, 10ge2p1x520, IMIX, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
@@ -175,13 +175,13 @@ IMIX Packet
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, L2 Ethernet Switching, 10ge2p1x520, IMIX, 2t2c - Daily Trend`.
+:index:`VM vhost Connections: L2 Ethernet Switching, 10ge2p1x520, IMIX, 2t2c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-x520-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, L2 Ethernet Switching, 10ge2p1x520, IMIX, 2t2c - Weekly Trend`.
+:index:`VM vhost Connections: L2 Ethernet Switching, 10ge2p1x520, IMIX, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
@@ -190,23 +190,24 @@ IMIX Packet
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, L2 Ethernet Switching, 10ge2p1x520, IMIX, 4t4c - Daily Trend`.
+:index:`VM vhost Connections: L2 Ethernet Switching, 10ge2p1x520, IMIX, 4t4c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-x520-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, L2 Ethernet Switching, 10ge2p1x520, IMIX, 4t4c - Weekly Trend`.
+:index:`VM vhost Connections: L2 Ethernet Switching, 10ge2p1x520, IMIX, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-x520-14.html"></iframe><br><br>
 
-NIC 40ge2p1xl710
+
+NIC 10ge2p1x710
 ----------------
 
-L2 Ethernet Switching
-`````````````````````
+IPv4 Routed-Forwarding
+``````````````````````
 
 64B Packet
 ..........
@@ -214,47 +215,47 @@ L2 Ethernet Switching
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 1t1c - Daily Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, 64B, 1t1c - Daily Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-xl710-1.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-1t1c-x710-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 1t1c - Weekly Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-xl710-14.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-1t1c-x710-14.html"></iframe><br><br>
 
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 2t2c - Daily Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, 64B, 2t2c - Daily Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-xl710-1.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-2t2c-x710-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 2t2c - Weekly Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-xl710-14.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-2t2c-x710-14.html"></iframe><br><br>
 
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 4t4c - Daily Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, 64B, 4t4c - Daily Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-xl710-1.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-4t4c-x710-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 4t4c - Weekly Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-xl710-14.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-4t4c-x710-14.html"></iframe><br><br>
 
 IMIX Packet
 ...........
@@ -262,50 +263,47 @@ IMIX Packet
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 40ge2p1xl710, IMIX, 1t1c - Daily Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, IMIX, 1t1c - Daily Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-xl710-1.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-1t1c-x710-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 40ge2p1xl710, IMIX, 1t1c - Weekly Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, IMIX, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-xl710-14.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-1t1c-x710-14.html"></iframe><br><br>
 
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 40ge2p1xl710, IMIX, 2t2c - Daily Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, IMIX, 2t2c - Daily Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-xl710-1.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-2t2c-x710-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 40ge2p1xl710, IMIX, 2t2c - Weekly Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, IMIX, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-xl710-14.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-2t2c-x710-14.html"></iframe><br><br>
 
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 40ge2p1xl710, IMIX, 4t4c - Daily Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, IMIX, 4t4c - Daily Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-xl710-1.html"></iframe><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-4t4c-x710-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 40ge2p1xl710, IMIX, 4t4c - Weekly Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, IMIX, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-xl710-14.html"></iframe><br><br>
-
-NIC 10ge2p1x710
-----------------
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-4t4c-x710-14.html"></iframe><br><br>
 
 L2 Ethernet Switching
 `````````````````````
@@ -316,13 +314,13 @@ L2 Ethernet Switching
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x710, 64B, 1t1c - Daily Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, 64B, 1t1c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-x710-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x710, 64B, 1t1c - Weekly Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
@@ -331,13 +329,13 @@ L2 Ethernet Switching
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x710, 64B, 2t2c - Daily Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, 64B, 2t2c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-x710-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x710, 64B, 2t2c - Weekly Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
@@ -346,13 +344,13 @@ L2 Ethernet Switching
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x710, 64B, 4t4c - Daily Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, 64B, 4t4c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-x710-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x710, 64B, 4t4c - Weekly Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
@@ -364,13 +362,13 @@ IMIX Packet
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x710, IMIX, 1t1c - Daily Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, IMIX, 1t1c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-x710-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x710, IMIX, 1t1c - Weekly Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, IMIX, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
@@ -379,13 +377,13 @@ IMIX Packet
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x710, IMIX, 2t2c - Daily Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, IMIX, 2t2c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-x710-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x710, IMIX, 2t2c - Weekly Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, IMIX, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
@@ -394,14 +392,116 @@ IMIX Packet
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x710, IMIX, 4t4c - Daily Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, IMIX, 4t4c - Daily Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-x710-1.html"></iframe><br><br>
 
-:index:`VM vhost Connections, IPv4 Routed-Forwarding, 10ge2p1x710, IMIX, 4t4c - Weekly Trend`.
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 10ge2p1x710, IMIX, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-x710-14.html"></iframe><br><br>
+
+NIC 40ge2p1xl710
+----------------
+
+L2 Ethernet Switching
+`````````````````````
+
+64B Packet
+..........
+
+1 Thread, 1 Core
+~~~~~~~~~~~~~~~~
+
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 1t1c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-xl710-1.html"></iframe><br><br>
+
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 1t1c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-xl710-14.html"></iframe><br><br>
+
+2 Threads, 2 Cores
+~~~~~~~~~~~~~~~~~~
+
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 2t2c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-xl710-1.html"></iframe><br><br>
+
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 2t2c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-xl710-14.html"></iframe><br><br>
+
+4 Threads, 4 Cores
+~~~~~~~~~~~~~~~~~~
+
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 4t4c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-xl710-1.html"></iframe><br><br>
+
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 4t4c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-xl710-14.html"></iframe><br><br>
+
+IMIX Packet
+...........
+
+1 Thread, 1 Core
+~~~~~~~~~~~~~~~~
+
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 40ge2p1xl710, IMIX, 1t1c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-xl710-1.html"></iframe><br><br>
+
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 40ge2p1xl710, IMIX, 1t1c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-xl710-14.html"></iframe><br><br>
+
+2 Threads, 2 Cores
+~~~~~~~~~~~~~~~~~~
+
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 40ge2p1xl710, IMIX, 2t2c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-xl710-1.html"></iframe><br><br>
+
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 40ge2p1xl710, IMIX, 2t2c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-xl710-14.html"></iframe><br><br>
+
+4 Threads, 4 Cores
+~~~~~~~~~~~~~~~~~~
+
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 40ge2p1xl710, IMIX, 4t4c - Daily Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-xl710-1.html"></iframe><br><br>
+
+:index:`VM vhost Connections: IPv4 Routed-Forwarding, 40ge2p1xl710, IMIX, 4t4c - Weekly Trend`.
+
+.. raw:: html
+
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-xl710-14.html"></iframe><br><br>
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index f85fd4dc3a..f5097fc782 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -218,7 +218,7 @@
   data: "plot-performance-trending"
   plots:
 
-# L2
+# L2 - x520
 
     - title: "VPP 1T1C L2 64B Packet Throughput - {period} Trending"
       output-file-name: "l2-1t1c-x520"
@@ -292,6 +292,8 @@
       # - 60
       layout: "plot-cpta"
 
+# L2 - xl710
+
     - title: "VPP 1T1C L2 64B Packet Throughput - {period} Trending"
       output-file-name: "l2-1t1c-xl710"
       data: "plot-performance-trending"
@@ -328,6 +330,8 @@
       # - 60
       layout: "plot-cpta"
 
+# L2 - x710
+
     - title: "VPP 1T1C L2 64B Packet Throughput - {period} Trending"
       output-file-name: "l2-1t1c-x710"
       data: "plot-performance-trending"
@@ -364,7 +368,43 @@
       # - 60
       layout: "plot-cpta"
 
-# IPv4
+    - title: "VPP 1T1C L2 64B Packet Throughput - {period} Trending"
+      output-file-name: "l2-feature-1t1c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C L2 64B Packet Throughput - {period} Trending"
+      output-file-name: "l2-feature-2t2c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C L2 64B Packet Throughput - {period} Trending"
+      output-file-name: "l2-feature-4t4c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+# IPv4 - x520
 
     - title: "VPP 1T1C IPv4 64B Packet Throughput - {period} Trending"
       output-file-name: "ip4-1t1c-x520"
@@ -438,6 +478,8 @@
       # - 60
       layout: "plot-cpta"
 
+# IPv4 - xl710
+
     - title: "VPP 1T1C IPv4 64B Packet Throughput - {period} Trending"
       output-file-name: "ip4-1t1c-xl710"
       data: "plot-performance-trending"
@@ -474,7 +516,81 @@
       # - 60
       layout: "plot-cpta"
 
-# IPv4 Tunnels
+# IPv4 - x710
+
+    - title: "VPP 1T1C IPv4 64B Packet Throughput - {period} Trending"
+      output-file-name: "ip4-1t1c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C IPv4 64B Packet Throughput - {period} Trending"
+      output-file-name: "ip4-2t2c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C IPv4 64B Packet Throughput - {period} Trending"
+      output-file-name: "ip4-4t4c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 1T1C IPv4 64B Packet Throughput - {period} Trending"
+      output-file-name: "ip4-feature-1t1c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C IPv4 64B Packet Throughput - {period} Trending"
+      output-file-name: "ip4-feature-2t2c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C IPv4 64B Packet Throughput - {period} Trending"
+      output-file-name: "ip4-feature-4t4c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+# IPv4 Tunnels - x520
 
     - title: "VPP 1T1C IPv4 Tunnels 64B Packet Throughput - {period} Trending"
       output-file-name: "ip4-tunnels-1t1c-x520"
@@ -512,7 +628,45 @@
       # - 60
       layout: "plot-cpta"
 
-# IPv6
+# IPv4 Tunnels - x710
+
+    - title: "VPP 1T1C IPv4 Tunnels 64B Packet Throughput - {period} Trending"
+      output-file-name: "ip4-tunnels-1t1c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C IPv4 Tunnels 64B Packet Throughput - {period} Trending"
+      output-file-name: "ip4-tunnels-2t2c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C IPv4 Tunnels 64B Packet Throughput - {period} Trending"
+      output-file-name: "ip4-tunnels-4t4c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+# IPv6 - x520
 
     - title: "VPP 1T1C IPv6 78B Packet Throughput - {period} Trending"
       output-file-name: "ip6-1t1c-x520"
@@ -550,6 +704,8 @@
       # - 60
       layout: "plot-cpta"
 
+# IPv6 - xl710
+
     - title: "VPP 1T1C IPv6 78B Packet Throughput - {period} Trending"
       output-file-name: "ip6-1t1c-xl710"
       data: "plot-performance-trending"
@@ -586,7 +742,45 @@
       # - 60
       layout: "plot-cpta"
 
-# Container memif
+# IPv6 - x710
+
+    - title: "VPP 1T1C IPv6 78B Packet Throughput - {period} Trending"
+      output-file-name: "ip6-1t1c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C IPv6 78B Packet Throughput - {period} Trending"
+      output-file-name: "ip6-2t2c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C IPv6 78B Packet Throughput - {period} Trending"
+      output-file-name: "ip6-4t4c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+# Container memif - x520, 64B
 
     - title: "VPP 1T1C L2 Container memif 64B Packet Throughput - {period} Trending"
       output-file-name: "container-memif-l2-1t1c-x520"
@@ -624,6 +818,46 @@
       # - 60
       layout: "plot-cpta"
 
+# Container memif - x520, IMIX
+
+    - title: "VPP 1T1C L2 Container memif IMIX Packet Throughput - {period} Trending"
+      output-file-name: "container-memif-imix-l2-1t1c-x520"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - {period} Trending"
+      output-file-name: "container-memif-imix-l2-2t2c-x520"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - {period} Trending"
+      output-file-name: "container-memif-imix-l2-4t4c-x520"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+# Container memif - xl710, 64B
+
     - title: "VPP 1T1C L2 Container memif 64B Packet Throughput - {period} Trending"
       output-file-name: "container-memif-l2-1t1c-xl710"
       data: "plot-performance-trending"
@@ -660,10 +894,12 @@
       # - 60
       layout: "plot-cpta"
 
+# Container memif - xl710, IMIX
+
     - title: "VPP 1T1C L2 Container memif IMIX Packet Throughput - {period} Trending"
-      output-file-name: "container-memif-imix-l2-1t1c-x520"
+      output-file-name: "container-memif-imix-l2-1t1c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       periods:
@@ -673,9 +909,9 @@
       layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - {period} Trending"
-      output-file-name: "container-memif-imix-l2-2t2c-x520"
+      output-file-name: "container-memif-imix-l2-2t2c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       periods:
@@ -685,9 +921,9 @@
       layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - {period} Trending"
-      output-file-name: "container-memif-imix-l2-4t4c-x520"
+      output-file-name: "container-memif-imix-l2-4t4c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       periods:
@@ -696,10 +932,50 @@
       # - 60
       layout: "plot-cpta"
 
+# Container memif - x710, 64B
+
+    - title: "VPP 1T1C L2 Container memif 64B Packet Throughput - {period} Trending"
+      output-file-name: "container-memif-l2-1t1c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - {period} Trending"
+      output-file-name: "container-memif-l2-2t2c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - {period} Trending"
+      output-file-name: "container-memif-l2-4t4c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+# Container memif - x520, IMIX
+
     - title: "VPP 1T1C L2 Container memif IMIX Packet Throughput - {period} Trending"
-      output-file-name: "container-memif-imix-l2-1t1c-xl710"
+      output-file-name: "container-memif-imix-l2-1t1c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       periods:
@@ -709,9 +985,9 @@
       layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - {period} Trending"
-      output-file-name: "container-memif-imix-l2-2t2c-xl710"
+      output-file-name: "container-memif-imix-l2-2t2c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       periods:
@@ -721,9 +997,9 @@
       layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - {period} Trending"
-      output-file-name: "container-memif-imix-l2-4t4c-xl710"
+      output-file-name: "container-memif-imix-l2-4t4c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       periods:
@@ -732,7 +1008,7 @@
       # - 60
       layout: "plot-cpta"
 
-# VM vhost
+# VM vhost - x520, ethip4, 64B
 
     - title: "VPP 1T1C VM vhost ethip4 64B Packet Throughput - {period} Trending"
       output-file-name: "vm-vhost-ethip4-1t1c-x520"
@@ -770,6 +1046,46 @@
       # - 60
       layout: "plot-cpta"
 
+# VM vhost - x520, ethip4, IMIX
+
+    - title: "VPP 1T1C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-ethip4-1t1c-x520"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-ethip4-2t2c-x520"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-ethip4-4t4c-x520"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+# VM vhost - x520, eth, 64B
+
     - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - {period} Trending"
       output-file-name: "vm-vhost-eth-1t1c-x520"
       data: "plot-performance-trending"
@@ -807,6 +1123,47 @@
       # - 60
       layout: "plot-cpta"
 
+# VM vhost - x520, eth, IMIX
+
+    - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-eth-1t1c-x520"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-eth-2t2c-x520"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-eth-4t4c-x520"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      - 14
+      # - 60
+      layout: "plot-cpta"
+
+# VM vhost - xl710, eth, 64B
+
     - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - {period} Trending"
       output-file-name: "vm-vhost-eth-1t1c-xl710"
       data: "plot-performance-trending"
@@ -844,10 +1201,12 @@
       # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-eth-1t1c-x710"
+# VM vhost - xl710, eth, IMIX
+
+    - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-eth-1t1c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
 
       parameters:
       - "result"
@@ -857,10 +1216,10 @@
       # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-eth-2t2c-x710"
+    - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-eth-2t2c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
       parameters:
       - "result"
       periods:
@@ -869,10 +1228,10 @@
       # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-eth-4t4c-x710"
+    - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-eth-4t4c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
       parameters:
       - "result"
       periods:
@@ -881,10 +1240,12 @@
       # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-imix-ethip4-1t1c-x520"
+# VM vhost - x710, ethip4, 64B
+
+    - title: "VPP 1T1C VM vhost ethip4 64B Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-ethip4-1t1c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
       periods:
@@ -893,10 +1254,10 @@
       # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-imix-ethip4-2t2c-x520"
+    - title: "VPP 2T2C VM vhost ethip4 64B Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-ethip4-2t2c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
       periods:
@@ -905,10 +1266,10 @@
       # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-imix-ethip4-4t4c-x520"
+    - title: "VPP 4T4C VM vhost ethip4 64B Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-ethip4-4t4c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
       periods:
@@ -917,11 +1278,12 @@
       # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-imix-eth-1t1c-x520"
-      data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+# VM vhost - x710, ethip4, IMIX
 
+    - title: "VPP 1T1C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-ethip4-1t1c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
       periods:
@@ -930,10 +1292,10 @@
       # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-imix-eth-2t2c-x520"
+    - title: "VPP 2T2C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-ethip4-2t2c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
       periods:
@@ -942,10 +1304,10 @@
       # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-imix-eth-4t4c-x520"
+    - title: "VPP 4T4C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-ethip4-4t4c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
       periods:
@@ -954,10 +1316,12 @@
       # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-imix-eth-1t1c-xl710"
+# VM vhost - x710, eth, 64B
+
+    - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-eth-1t1c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
 
       parameters:
       - "result"
@@ -967,10 +1331,10 @@
       # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-imix-eth-2t2c-xl710"
+    - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-eth-2t2c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
       parameters:
       - "result"
       periods:
@@ -979,10 +1343,10 @@
       # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-imix-eth-4t4c-xl710"
+    - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-eth-4t4c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
       parameters:
       - "result"
       periods:
@@ -991,6 +1355,8 @@
       # - 60
       layout: "plot-cpta"
 
+# VM vhost - x710, eth, IMIX
+
     - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - {period} Trending"
       output-file-name: "vm-vhost-imix-eth-1t1c-x710"
       data: "plot-performance-trending"