CSIT-1270: Split feature tests in trending

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

14 files changed, 608 insertions, 70 deletions

diff --git a/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-iacl.rst b/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-iacl.rst
new file mode 100644
index 0000000000..51b45bf909
--- /dev/null
+++ b/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-iacl.rst
@@ -0,0 +1,62 @@
+3n-hsw-x520-64b-features-iacl
+-----------------------------
+
+1t1c
+````
+
+.. raw:: html
+
+    <a name="x520-64b-1t1c-features-iacl"></a>
+    <center><b>
+
+:index:`3n-hsw-x520-ip4-64b-features-iacl-1t1c-mrr`
+
+.. raw:: html
+
+    </b>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x520-3n-hsw-iacl.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+2t2c
+````
+
+.. raw:: html
+
+    <a name="x520-64b-2t2c-features-iacl"></a>
+    <center><b>
+
+:index:`3n-hsw-x520-ip4-64b-features-iacl-2t2c-mrr`
+
+.. raw:: html
+
+    </b>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x520-3n-hsw-iacl.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+4t4c
+````
+
+.. raw:: html
+
+    <a name="x520-64b-4t4c-features-iacl"></a>
+    <center><b>
+
+:index:`3n-hsw-x520-ip4-64b-features-iacl-4t4c-mrr`
+
+.. raw:: html
+
+    </b>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x520-3n-hsw-iacl.html"></iframe>
+    <p><br><br></p>
+    </center>
diff --git a/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-oacl.rst b/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-oacl.rst
new file mode 100644
index 0000000000..a2b557a574
--- /dev/null
+++ b/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-oacl.rst
@@ -0,0 +1,62 @@
+3n-hsw-x520-64b-features-oacl
+-----------------------------
+
+1t1c
+````
+
+.. raw:: html
+
+    <a name="x520-64b-1t1c-features-oacl"></a>
+    <center><b>
+
+:index:`3n-hsw-x520-ip4-64b-features-oacl-1t1c-mrr`
+
+.. raw:: html
+
+    </b>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x520-3n-hsw-oacl.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+2t2c
+````
+
+.. raw:: html
+
+    <a name="x520-64b-2t2c-features-oacl"></a>
+    <center><b>
+
+:index:`3n-hsw-x520-ip4-64b-features-oacl-2t2c-mrr`
+
+.. raw:: html
+
+    </b>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x520-3n-hsw-oacl.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+4t4c
+````
+
+.. raw:: html
+
+    <a name="x520-64b-4t4c-features-oacl"></a>
+    <center><b>
+
+:index:`3n-hsw-x520-ip4-64b-features-oacl-4t4c-mrr`
+
+.. raw:: html
+
+    </b>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x520-3n-hsw-oacl.html"></iframe>
+    <p><br><br></p>
+    </center>
diff --git a/docs/cpta/trending/ip4.rst b/docs/cpta/trending/ip4.rst
index 56aafdb474..0bdf9a68ca 100644
--- a/docs/cpta/trending/ip4.rst
+++ b/docs/cpta/trending/ip4.rst
@@ -5,6 +5,8 @@ IPv4 Routing
 
     ip4-3n-hsw-x520-64b-base-scale
     ip4-3n-hsw-x520-64b-features
+    ip4-3n-hsw-x520-64b-features-iacl
+    ip4-3n-hsw-x520-64b-features-oacl
     ip4-3n-hsw-x710-64b-base-scale
     ip4-3n-hsw-x710-64b-features
     ip4-3n-hsw-xl710-64b-base-scale-features
diff --git a/docs/cpta/trending/l2-3n-hsw-x520-64b-features-iacl.rst b/docs/cpta/trending/l2-3n-hsw-x520-64b-features-iacl.rst
new file mode 100644
index 0000000000..1dd2088a4c
--- /dev/null
+++ b/docs/cpta/trending/l2-3n-hsw-x520-64b-features-iacl.rst
@@ -0,0 +1,62 @@
+3n-hsw-x520-64b-features-iacl
+-----------------------------
+
+1t1c
+````
+
+.. raw:: html
+
+    <a name="x520-64b-1t1c-features-iacl"></a>
+    <center><b>
+
+:index:`3n-hsw-x520-l2sw-64b-features-iacl-1t1c-mrr`
+
+.. raw:: html
+
+    </b>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-1t1c-x520-3n-hsw-iacl.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+2t2c
+````
+
+.. raw:: html
+
+    <a name="x520-64b-2t2c-features-iacl"></a>
+    <center><b>
+
+:index:`3n-hsw-x520-l2sw-64b-features-iacl-2t2c-mrr`
+
+.. raw:: html
+
+    </b>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t2c-x520-3n-hsw-iacl.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+4t4c
+````
+
+.. raw:: html
+
+    <a name="x520-64b-4t4c-features-iacl"></a>
+    <center><b>
+
+:index:`3n-hsw-x520-l2sw-64b-features-iacl-4t4c-mrr`
+
+.. raw:: html
+
+    </b>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x520-3n-hsw-iacl.html"></iframe>
+    <p><br><br></p>
+    </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-x520-64b-features-macip.rst b/docs/cpta/trending/l2-3n-hsw-x520-64b-features-macip.rst
new file mode 100644
index 0000000000..ec1322c812
--- /dev/null
+++ b/docs/cpta/trending/l2-3n-hsw-x520-64b-features-macip.rst
@@ -0,0 +1,62 @@
+3n-hsw-x520-64b-features-macip
+------------------------------
+
+1t1c
+````
+
+.. raw:: html
+
+    <a name="x520-64b-1t1c-features-macip"></a>
+    <center><b>
+
+:index:`3n-hsw-x520-l2sw-64b-features-macip-1t1c-mrr`
+
+.. raw:: html
+
+    </b>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-1t1c-x520-3n-hsw-macip.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+2t2c
+````
+
+.. raw:: html
+
+    <a name="x520-64b-2t2c-features-macip"></a>
+    <center><b>
+
+:index:`3n-hsw-x520-l2sw-64b-features-macip-2t2c-mrr`
+
+.. raw:: html
+
+    </b>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t2c-x520-3n-hsw-macip.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+4t4c
+````
+
+.. raw:: html
+
+    <a name="x520-64b-4t4c-features-macip"></a>
+    <center><b>
+
+:index:`3n-hsw-x520-l2sw-64b-features-macip-4t4c-mrr`
+
+.. raw:: html
+
+    </b>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x520-3n-hsw-macip.html"></iframe>
+    <p><br><br></p>
+    </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-x520-64b-features-oacl.rst b/docs/cpta/trending/l2-3n-hsw-x520-64b-features-oacl.rst
new file mode 100644
index 0000000000..e650a2c020
--- /dev/null
+++ b/docs/cpta/trending/l2-3n-hsw-x520-64b-features-oacl.rst
@@ -0,0 +1,62 @@
+3n-hsw-x520-64b-features-oacl
+-----------------------------
+
+1t1c
+````
+
+.. raw:: html
+
+    <a name="x520-64b-1t1c-features-oacl"></a>
+    <center><b>
+
+:index:`3n-hsw-x520-l2sw-64b-features-oacl-1t1c-mrr`
+
+.. raw:: html
+
+    </b>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-1t1c-x520-3n-hsw-oacl.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+2t2c
+````
+
+.. raw:: html
+
+    <a name="x520-64b-2t2c-features-oacl"></a>
+    <center><b>
+
+:index:`3n-hsw-x520-l2sw-64b-features-oacl-2t2c-mrr`
+
+.. raw:: html
+
+    </b>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t2c-x520-3n-hsw-oacl.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+4t4c
+````
+
+.. raw:: html
+
+    <a name="x520-64b-4t4c-features-oacl"></a>
+    <center><b>
+
+:index:`3n-hsw-x520-l2sw-64b-features-oacl-4t4c-mrr`
+
+.. raw:: html
+
+    </b>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x520-3n-hsw-oacl.html"></iframe>
+    <p><br><br></p>
+    </center>
diff --git a/docs/cpta/trending/l2.rst b/docs/cpta/trending/l2.rst
index cda1c3012b..f3e78ca74e 100644
--- a/docs/cpta/trending/l2.rst
+++ b/docs/cpta/trending/l2.rst
@@ -4,7 +4,9 @@ L2 Ethernet Switching
 .. toctree::
 
     l2-3n-hsw-x520-64b-base-scale
-    l2-3n-hsw-x520-64b-features
+    l2-3n-hsw-x520-64b-features-iacl
+    l2-3n-hsw-x520-64b-features-oacl
+    l2-3n-hsw-x520-64b-features-macip
     l2-3n-hsw-x710-64b-base-scale
     l2-3n-hsw-x710-64b-features
     l2-3n-hsw-xl710-64b-base-scale
diff --git a/docs/cpta/trending/l2-3n-hsw-x520-64b-features.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base-l2bd.rst
index ab9be50d49..23a8f6a89b 100644
--- a/docs/cpta/trending/l2-3n-hsw-x520-64b-features.rst
+++ b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base-l2bd.rst
@@ -1,15 +1,15 @@
-3n-hsw-x520-64b-features
-------------------------
+3n-hsw-x520-64b-base-l2bd
+-------------------------
 
 1t1c
 ````
 
 .. raw:: html
 
-    <a name="x520-64b-1t1c-features"></a>
+    <a name="x520-64b-1t1c-base-l2bd"></a>
     <center><b>
 
-:index:`3n-hsw-x520-l2sw-64b-features-1t1c-mrr`
+:index:`3n-hsw-x520-l2sw-vhost-64b-base-l2bd-1t1c-mrr`
 
 .. raw:: html
 
@@ -17,7 +17,7 @@
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-1t1c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-x520-3n-hsw-l2bd.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -26,10 +26,10 @@
 
 .. raw:: html
 
-    <a name="x520-64b-2t2c-features"></a>
+    <a name="x520-64b-2t2c-base-l2bd"></a>
     <center><b>
 
-:index:`3n-hsw-x520-l2sw-64b-features-2t2c-mrr`
+:index:`3n-hsw-x520-l2sw-vhost-64b-base-l2bd-2t2c-mrr`
 
 .. raw:: html
 
@@ -37,7 +37,7 @@
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t2c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-x520-3n-hsw-l2bd.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -46,10 +46,10 @@
 
 .. raw:: html
 
-    <a name="x520-64b-4t4c-features"></a>
+    <a name="x520-64b-4t4c-base-l2bd"></a>
     <center><b>
 
-:index:`3n-hsw-x520-l2sw-64b-features-4t4c-mrr`
+:index:`3n-hsw-x520-l2sw-vhost-64b-base-l2bd-4t4c-mrr`
 
 .. raw:: html
 
@@ -57,6 +57,6 @@
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-x520-3n-hsw-l2bd.html"></iframe>
     <p><br><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base-l2xc.rst
index ec3e36ffe3..7347b2c7e3 100644
--- a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base.rst
+++ b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base-l2xc.rst
@@ -1,15 +1,15 @@
-3n-hsw-x520-64b-base
---------------------
+3n-hsw-x520-64b-base-l2xc
+-------------------------
 
 1t1c
 ````
 
 .. raw:: html
 
-    <a name="x520-64b-1t1c-base"></a>
+    <a name="x520-64b-1t1c-base-l2xc"></a>
     <center><b>
 
-:index:`3n-hsw-x520-l2sw-vhost-64b-base-1t1c-mrr`
+:index:`3n-hsw-x520-l2sw-vhost-64b-base-l2xc-1t1c-mrr`
 
 .. raw:: html
 
@@ -17,7 +17,7 @@
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-x520-3n-hsw-l2xc.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -26,10 +26,10 @@
 
 .. raw:: html
 
-    <a name="x520-64b-2t2c-base"></a>
+    <a name="x520-64b-2t2c-base-l2xc"></a>
     <center><b>
 
-:index:`3n-hsw-x520-l2sw-vhost-64b-base-2t2c-mrr`
+:index:`3n-hsw-x520-l2sw-vhost-64b-base-l2xc-2t2c-mrr`
 
 .. raw:: html
 
@@ -37,7 +37,7 @@
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-x520-3n-hsw-l2xc.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -46,10 +46,10 @@
 
 .. raw:: html
 
-    <a name="x520-64b-4t4c-base"></a>
+    <a name="x520-64b-4t4c-base-l2xc"></a>
     <center><b>
 
-:index:`3n-hsw-x520-l2sw-vhost-64b-base-4t4c-mrr`
+:index:`3n-hsw-x520-l2sw-vhost-64b-base-l2xc-4t4c-mrr`
 
 .. raw:: html
 
@@ -57,6 +57,6 @@
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-x520-3n-hsw-l2xc.html"></iframe>
     <p><br><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2bd.rst
index fd07274e5d..02d51c4d4b 100644
--- a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base.rst
+++ b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2bd.rst
@@ -1,15 +1,15 @@
-3n-hsw-x520-imix-base
----------------------
+3n-hsw-x520-imix-base-l2bd
+--------------------------
 
 1t1c
 ````
 
 .. raw:: html
 
-    <a name="x520-imix-1t1c-base"></a>
+    <a name="x520-imix-1t1c-base-l2bd"></a>
     <center><b>
 
-:index:`3n-hsw-x520-l2sw-vhost-imix-base-1t1c-mrr`
+:index:`3n-hsw-x520-l2sw-vhost-imix-base-l2bd-1t1c-mrr`
 
 .. raw:: html
 
@@ -17,7 +17,7 @@
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2bd.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -26,10 +26,10 @@
 
 .. raw:: html
 
-    <a name="x520-imix-2t2c-base"></a>
+    <a name="x520-imix-2t2c-base-l2bd"></a>
     <center><b>
 
-:index:`3n-hsw-x520-l2sw-vhost-imix-base-2t2c-mrr`
+:index:`3n-hsw-x520-l2sw-vhost-imix-base-l2bd-2t2c-mrr`
 
 .. raw:: html
 
@@ -37,7 +37,7 @@
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2bd.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -46,10 +46,10 @@
 
 .. raw:: html
 
-    <a name="x520-imix-4t4c-base"></a>
+    <a name="x520-imix-4t4c-base-l2bd"></a>
     <center><b>
 
-:index:`3n-hsw-x520-l2sw-vhost-imix-base-4t4c-mrr`
+:index:`3n-hsw-x520-l2sw-vhost-imix-base-l2bd-4t4c-mrr`
 
 .. raw:: html
 
@@ -57,6 +57,6 @@
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-x520-3n-hsw.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2bd.html"></iframe>
     <p><br><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2xc.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2xc.rst
new file mode 100644
index 0000000000..4dc46f1f71
--- /dev/null
+++ b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2xc.rst
@@ -0,0 +1,62 @@
+3n-hsw-x520-imix-base-l2xc
+--------------------------
+
+1t1c
+````
+
+.. raw:: html
+
+    <a name="x520-imix-1t1c-base-l2xc"></a>
+    <center><b>
+
+:index:`3n-hsw-x520-l2sw-vhost-imix-base-l2xc-1t1c-mrr`
+
+.. raw:: html
+
+    </b>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2xc.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+2t2c
+````
+
+.. raw:: html
+
+    <a name="x520-imix-2t2c-base-l2xc"></a>
+    <center><b>
+
+:index:`3n-hsw-x520-l2sw-vhost-imix-base-l2xc-2t2c-mrr`
+
+.. raw:: html
+
+    </b>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2xc.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+4t4c
+````
+
+.. raw:: html
+
+    <a name="x520-imix-4t4c-base-l2xc"></a>
+    <center><b>
+
+:index:`3n-hsw-x520-l2sw-vhost-imix-base-l2xc-4t4c-mrr`
+
+.. raw:: html
+
+    </b>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2xc.html"></iframe>
+    <p><br><br></p>
+    </center>
diff --git a/docs/cpta/trending/vm_vhost_l2.rst b/docs/cpta/trending/vm_vhost_l2.rst
index dbb71a6380..755f809007 100644
--- a/docs/cpta/trending/vm_vhost_l2.rst
+++ b/docs/cpta/trending/vm_vhost_l2.rst
@@ -3,10 +3,12 @@ L2 VMs vhost-user
 
 .. toctree::
 
-    vm_vhost_l2-3n-hsw-x520-64b-base
+    vm_vhost_l2-3n-hsw-x520-64b-base-l2xc
+    vm_vhost_l2-3n-hsw-x520-64b-base-l2bd
     vm_vhost_l2-3n-hsw-x710-64b-base
     vm_vhost_l2-3n-hsw-xl710-64b-base
-    vm_vhost_l2-3n-hsw-x520-imix-base
+    vm_vhost_l2-3n-hsw-x520-imix-base-l2xc
+    vm_vhost_l2-3n-hsw-x520-imix-base-l2bd
     vm_vhost_l2-3n-hsw-x710-imix-base
     vm_vhost_l2-3n-hsw-xl710-imix-base
     vm_vhost_l2-3n-skx-x710-64b-base
diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 99069ea630..1bbe8e38d4 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -555,9 +555,15 @@ def _generate_url(base, testbed, test_name):
     elif "vhost" in test_name:
         if "l2xcbase" in test_name or "l2bdbasemaclrn" in test_name:
             file_name = "vm_vhost_l2"
+            if "l2xcbase" in test_name:
+                feature = "-base-l2xc"
+            elif "l2bdbasemaclrn" in test_name:
+                feature = "-base-l2bd"
+            else:
+                feature = "-base"
         elif "ip4base" in test_name:
             file_name = "vm_vhost_ip4"
-        feature = "-base"
+            feature = "-base"
 
     elif "ipsec" in test_name:
         file_name = "ipsec"
@@ -571,7 +577,11 @@ def _generate_url(base, testbed, test_name):
         file_name = "ip4"
         if "xl710" in test_name:
             feature = "-base-scale-features"
-        elif "acl" in test_name or "snat" in test_name or "cop" in test_name:
+        elif "iacl" in test_name:
+            feature = "-features-iacl"
+        elif "oacl" in test_name:
+            feature = "-features-oacl"
+        elif "snat" in test_name or "cop" in test_name:
             feature = "-features"
         else:
             feature = "-base-scale"
@@ -584,8 +594,12 @@ def _generate_url(base, testbed, test_name):
             or "l2bdbasemaclrn" in test_name or "l2bdscale" in test_name \
             or "l2dbbasemaclrn" in test_name or "l2dbscale" in test_name:
         file_name = "l2"
-        if "acl" in test_name:
-            feature = "-features"
+        if "macip" in test_name:
+            feature = "-features-macip"
+        elif "iacl" in test_name:
+            feature = "-features-iacl"
+        elif "oacl" in test_name:
+            feature = "-features-oacl"
         else:
             feature = "-base-scale"
 
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index aa8528ceb4..7bb7312b11 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -635,26 +635,74 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-1t1c-x520-3n-hsw"
+    - title: "VPP 1T1C L2 64B IACL MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-1t1c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-2t2c-x520-3n-hsw"
+    - title: "VPP 2T2C L2 64B IACL MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-2t2c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-4t4c-x520-3n-hsw"
+    - title: "VPP 4T4C L2 64B IACL MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-4t4c-x520-3n-hsw-iacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 1T1C L2 64B OACL MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-1t1c-x520-3n-hsw-oacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C L2 64B OACL MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-2t2c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C L2 64B OACL MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-4t4c-x520-3n-hsw-oacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 1T1C L2 64B MACIP MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-1t1c-x520-3n-hsw-macip"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C L2 64B MACIP MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-2t2c-x520-3n-hsw-macip"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C L2 64B MACIP MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-4t4c-x520-3n-hsw-macip"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -761,10 +809,58 @@
       - "result"
       layout: "plot-cpta"
 
+    - title: "VPP 1T1C IPv4 64B IACL MRR Trending 3n-hsw"
+      output-file-name: "ip4-feature-1t1c-x520-3n-hsw-iacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and 'IACL' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C IPv4 64B IACL MRR Trending 3n-hsw"
+      output-file-name: "ip4-feature-2t2c-x520-3n-hsw-iacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and 'IACL' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C IPv4 64B IACL MRR Trending 3n-hsw"
+      output-file-name: "ip4-feature-4t4c-x520-3n-hsw-iacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and 'IACL' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 1T1C IPv4 64B OACL MRR Trending 3n-hsw"
+      output-file-name: "ip4-feature-1t1c-x520-3n-hsw-oacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and 'OACL' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C IPv4 64B OACL MRR Trending 3n-hsw"
+      output-file-name: "ip4-feature-2t2c-x520-3n-hsw-oacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and 'OACL' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C IPv4 64B OACL MRR Trending 3n-hsw"
+      output-file-name: "ip4-feature-4t4c-x520-3n-hsw-oacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and 'OACL' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
     - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
       output-file-name: "ip4-feature-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'OACL' and not 'IACL' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -772,7 +868,7 @@
     - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
       output-file-name: "ip4-feature-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'OACL' and not 'IACL' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -780,7 +876,7 @@
     - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
       output-file-name: "ip4-feature-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'OACL' and not 'IACL' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1201,54 +1297,104 @@
 
 # VM vhost - x520, eth, 64B
 
-    - title: "VPP 1T1C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-1t1c-x520-3n-hsw"
+    - title: "VPP 1T1C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-1t1c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
 
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-2t2c-x520-3n-hsw"
+    - title: "VPP 2T2C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-2t2c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-4t4c-x520-3n-hsw"
+    - title: "VPP 4T4C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-4t4c-x520-3n-hsw-l2xc"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 1T1C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-1t1c-x520-3n-hsw-l2bd"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-2t2c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-4t4c-x520-3n-hsw-l2bd"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x520, eth, IMIX
 
-    - title: "VPP 1T1C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-1t1c-x520-3n-hsw"
+    - title: "VPP 1T1C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
 
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-2t2c-x520-3n-hsw"
+    - title: "VPP 2T2C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-4t4c-x520-3n-hsw"
+    - title: "VPP 4T4C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2xc"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 1T1C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2bd"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2bd"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"