Report: Add VNF Service Chains Tunnels

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

diff --git a/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains.rst b/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains.rst
index 3040727..f63f9ab 100644 (file)
--- a/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains.rst
+++ b/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains.rst
@@ -30,8 +30,8 @@
 
 .. _cnf_service_chains:
 
 
 .. _cnf_service_chains:
 

-CNF Service Chains
-==================
+CNF Service Chains Routing
+==========================

 
 Throughput graphs for CNF service chains are generated by multiple
 executions of tests covering a range of CNF service densities
 
 Throughput graphs for CNF service chains are generated by multiple
 executions of tests covering a range of CNF service densities

diff --git a/docs/report/vpp_performance_tests/nf_service_density/cnf_service_pipelines.rst b/docs/report/vpp_performance_tests/nf_service_density/cnf_service_pipelines.rst
index b80aa1f..3be076c 100644 (file)
--- a/docs/report/vpp_performance_tests/nf_service_density/cnf_service_pipelines.rst
+++ b/docs/report/vpp_performance_tests/nf_service_density/cnf_service_pipelines.rst
@@ -30,8 +30,8 @@
 
 .. _cnf_service_pipelines:
 
 
 .. _cnf_service_pipelines:
 

-CNF Service Pipelines
-=====================
+CNF Service Pipelines Routing
+=============================

 
 Throughput graphs for CNF service pipelines are generated by multiple
 executions of tests covering a range of CNF service densities
 
 Throughput graphs for CNF service pipelines are generated by multiple
 executions of tests covering a range of CNF service densities

diff --git a/docs/report/vpp_performance_tests/nf_service_density/index.rst b/docs/report/vpp_performance_tests/nf_service_density/index.rst
index 4c3143b..1d30153 100644 (file)
--- a/docs/report/vpp_performance_tests/nf_service_density/index.rst
+++ b/docs/report/vpp_performance_tests/nf_service_density/index.rst
@@ -11,9 +11,10 @@ NFV Service Density
 NFV Service Density is benchmarked in three distinct NF service
 configurations:
 
 NFV Service Density is benchmarked in three distinct NF service
 configurations:
 

-- VNF Service Chains
-- CNF Service Chains
-- CNF Service Pipelines
+- VNF Service Chains Routing
+- CNF Service Chains Routing
+- CNF Service Pipelines Routing
+- VNF Service Chains Tunnels

 
 Each configuration is tested in a number of service density combinations
 [Number of Service Instances] x [Number of NFs per Service Instance].
 
 Each configuration is tested in a number of service density combinations
 [Number of Service Instances] x [Number of NFs per Service Instance].


@@ -25,3 +26,4 @@ resources.
     vnf_service_chains
     cnf_service_chains
     cnf_service_pipelines
     vnf_service_chains
     cnf_service_chains
     cnf_service_pipelines

+    vnf_service_chains_vxlan

diff --git a/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains.rst b/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains.rst
index ff3eebc..fa35669 100644 (file)
--- a/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains.rst
+++ b/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains.rst
@@ -30,8 +30,8 @@
 
 .. _vnf_service_chains:
 
 
 .. _vnf_service_chains:
 

-VNF Service Chains
-==================
+VNF Service Chains Routing
+==========================

 
 Throughput graphs for VNF service chains are generated by multiple
 executions of tests covering a range of VNF service densities
 
 Throughput graphs for VNF service chains are generated by multiple
 executions of tests covering a range of VNF service densities

diff --git a/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains_vxlan.rst b/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains_vxlan.rst
new file mode 100644 (file)
index 0000000..ee922d1
--- /dev/null
+++ b/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains_vxlan.rst
@@ -0,0 +1,466 @@
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <script type="text/javascript">
+
+        function getDocHeight(doc) {
+            doc = doc || document;
+            var body = doc.body, html = doc.documentElement;
+            var height = Math.max( body.scrollHeight, body.offsetHeight,
+                html.clientHeight, html.scrollHeight, html.offsetHeight );
+            return height;
+        }
+
+        function setIframeHeight(id) {
+            var ifrm = document.getElementById(id);
+            var doc = ifrm.contentDocument? ifrm.contentDocument:
+                ifrm.contentWindow.document;
+            ifrm.style.visibility = 'hidden';
+            ifrm.style.height = "10px"; // reset to minimal height ...
+            // IE opt. for bing/msn needs a bit added or scrollbar appears
+            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
+            ifrm.style.visibility = 'visible';
+        }
+
+    </script>
+
+.. _vnf_service_chains_tunnels:
+
+VNF Service Chains Tunnels
+==========================
+
+.. todo::
+
+    Add introduction.
+
+Additional information about graph data:
+
+#. **Graph Title**: describes tested packet path including VNF workload
+   running in each VM.
+
+#. **X-axis Labels**: VNFs per service chain.
+
+#. **Y-axis Labels**: number of service chains.
+
+#. **Z-axis Color Scale**: lists 64B/IMIX Packet Throughput
+   (mean MRR/NDR/PDR value) in Mpps or the Relative Difference.
+
+#. **Hover Information**: specific test substring listing vhost-chain-vm
+   combinations, number of runs executed, mean MRR/NDR/PDR throughput in Mpps,
+   standard deviation for both configurations and their relative difference.
+
+.. note::
+
+    Test results have been generated by
+    `FD.io test executor vpp performance job 2n-skx`_ with RF
+    result files csit-vpp-perf-|srelease|-\*.zip
+    `archived here <../../_static/archive/>`_.
+
+.. raw:: latex
+
+    \clearpage
+
+2n-skx-xxv710-mrr
+~~~~~~~~~~~~~~~~~
+
+64b-2t1c-eth-l2bd
+-----------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-mrr.html"></iframe>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-mrr}
+            \label{fig:l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-mrr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-4t2c-eth-l2bd
+-----------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-mrr.html"></iframe>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-mrr}
+            \label{fig:l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-mrr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-8t4c-eth-l2bd
+-----------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-mrr.html"></iframe>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-mrr}
+            \label{fig:l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-mrr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-2t1c-eth-l2bd
+------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-mrr.html"></iframe>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-mrr}
+            \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-mrr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-4t2c-eth-l2bd
+------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-mrr.html"></iframe>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-mrr}
+            \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-mrr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-8t4c-eth-l2bd
+------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-mrr.html"></iframe>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-mrr}
+            \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-mrr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+2n-skx-xxv710-ndr
+~~~~~~~~~~~~~~~~~
+
+64b-2t1c-eth-l2bd
+-----------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-ndr.html"></iframe>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-ndr}
+            \label{fig:l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-4t2c-eth-l2bd
+-----------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-ndr.html"></iframe>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-ndr}
+            \label{fig:l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-8t4c-eth-l2bd
+-----------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-ndr.html"></iframe>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-ndr}
+            \label{fig:l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-2t1c-eth-l2bd
+------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-ndr.html"></iframe>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-ndr}
+            \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-4t2c-eth-l2bd
+------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-ndr.html"></iframe>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-ndr}
+            \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-8t4c-eth-l2bd
+------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-ndr.html"></iframe>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-ndr}
+            \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+2n-skx-xxv710-pdr
+~~~~~~~~~~~~~~~~~
+
+64b-2t1c-eth-l2bd
+-----------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-pdr.html"></iframe>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-pdr}
+            \label{fig:l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-4t2c-eth-l2bd
+-----------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-pdr.html"></iframe>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-pdr}
+            \label{fig:l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-8t4c-eth-l2bd
+-----------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-pdr.html"></iframe>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-pdr}
+            \label{fig:l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-2t1c-eth-l2bd
+------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-pdr.html"></iframe>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-pdr}
+            \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-4t2c-eth-l2bd
+------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-pdr.html"></iframe>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-pdr}
+            \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-8t4c-eth-l2bd
+------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-pdr.html"></iframe>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-pdr}
+            \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-pdr}
+    \end{figure}

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index fc1d3bd..a589725 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -5742,27 +5742,516 @@
     title: "dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-testpmd"
     layout: "plot-throughput"
 
     title: "dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-testpmd"
     layout: "plot-throughput"
 

+###############################################################################
+# Plots - NF Density - VSC - MRR 64b
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - VSC - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - VSC - NDR 64b
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - VSC - NDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - VSC - PDR 64b
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - VSC - PDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+    layout: "plot-service-density"
+
+###############################################################################

 # Plots - NF Density - VSC - MRR 64b
 - type: "plot"
 # Plots - NF Density - VSC - MRR 64b
 - type: "plot"

-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"

   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-mrr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-mrr"

   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and
   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and

+           'VXLAN' and

            'CHAIN' and
            'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'MRR'"
            'CHAIN' and
            'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'MRR'"

-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"

   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"


@@ -5772,29 +6261,24 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:

-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"

     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"

-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"

   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-mrr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-mrr"

   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and
   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and

+           'VXLAN' and

            'CHAIN' and
            'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'MRR'"
            'CHAIN' and
            'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'MRR'"

-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"

   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"


@@ -5804,29 +6288,24 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:

-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"

     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"

-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"

   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-mrr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-mrr"

   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and
   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and

+           'VXLAN' and

            'CHAIN' and
            'NF_VPPIP4' and
            '64B' and
            '8T4C' and
            'MRR'"
            'CHAIN' and
            'NF_VPPIP4' and
            '64B' and
            '8T4C' and
            'MRR'"

-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"

   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"


@@ -5836,30 +6315,25 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:

-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"

     layout: "plot-service-density"
 
 # Plots - NF Density - VSC - MRR IMIX
 - type: "plot"
     layout: "plot-service-density"
 
 # Plots - NF Density - VSC - MRR IMIX
 - type: "plot"

-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"

   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-mrr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-mrr"

   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and
   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and

+           'VXLAN' and

            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'MRR'"
            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'MRR'"

-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"

   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"


@@ -5869,29 +6343,24 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:

-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"

     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"

-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"

   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-mrr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-mrr"

   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and
   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and

+           'VXLAN' and

            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'MRR'"
            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'MRR'"

-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"

   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"


@@ -5901,29 +6370,24 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:

-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"

     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"

-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"

   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-mrr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-mrr"

   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and
   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and

+           'VXLAN' and

            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
            '8T4C' and
            'MRR'"
            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
            '8T4C' and
            'MRR'"

-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"

   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"


@@ -5933,30 +6397,25 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:

-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"

     layout: "plot-service-density"
 
 # Plots - NF Density - VSC - NDR 64b
 - type: "plot"
     layout: "plot-service-density"
 
 # Plots - NF Density - VSC - NDR 64b
 - type: "plot"

-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"

   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-ndr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-ndr"

   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and
   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and

+           'VXLAN' and

            'CHAIN' and
            'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'NDRPDR'"
            'CHAIN' and
            'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -5966,29 +6425,24 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:

-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"

     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"

-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"

   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-ndr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-ndr"

   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and
   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and

+           'VXLAN' and

            'CHAIN' and
            'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'NDRPDR'"
            'CHAIN' and
            'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -5998,29 +6452,24 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:

-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"

     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"

-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"

   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-ndr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-ndr"

   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and
   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and

+           'VXLAN' and

            'CHAIN' and
            'NF_VPPIP4' and
            '64B' and
            '8T4C' and
            'NDRPDR'"
            'CHAIN' and
            'NF_VPPIP4' and
            '64B' and
            '8T4C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6030,30 +6479,25 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:

-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"

     layout: "plot-service-density"
 
 # Plots - NF Density - VSC - NDR IMIX
 - type: "plot"
     layout: "plot-service-density"
 
 # Plots - NF Density - VSC - NDR IMIX
 - type: "plot"

-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"

   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-ndr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-ndr"

   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and
   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and

+           'VXLAN' and

            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6063,29 +6507,24 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:

-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"

     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"

-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"

   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-ndr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-ndr"

   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and
   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and

+           'VXLAN' and

            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6095,29 +6534,24 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:

-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"

     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"

-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"

   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-ndr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-ndr"

   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and
   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and

+           'VXLAN' and

            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
            '8T4C' and
            'NDRPDR'"
            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
            '8T4C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6127,30 +6561,25 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:

-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"

     layout: "plot-service-density"
 
 # Plots - NF Density - VSC - PDR 64b
 - type: "plot"
     layout: "plot-service-density"
 
 # Plots - NF Density - VSC - PDR 64b
 - type: "plot"

-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"

   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-pdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-pdr"

   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and
   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and

+           'VXLAN' and

            'CHAIN' and
            'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'NDRPDR'"
            'CHAIN' and
            'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6160,29 +6589,24 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:

-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"

     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"

-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"

   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-pdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-pdr"

   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and
   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and

+           'VXLAN' and

            'CHAIN' and
            'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'NDRPDR'"
            'CHAIN' and
            'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6192,29 +6616,24 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:

-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"

     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"

-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"

   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-pdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-pdr"

   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and
   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and

+           'VXLAN' and

            'CHAIN' and
            'NF_VPPIP4' and
            '64B' and
            '8T4C' and
            'NDRPDR'"
            'CHAIN' and
            'NF_VPPIP4' and
            '64B' and
            '8T4C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6224,30 +6643,25 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:

-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"

     layout: "plot-service-density"
 
 # Plots - NF Density - VSC - PDR IMIX
 - type: "plot"
     layout: "plot-service-density"
 
 # Plots - NF Density - VSC - PDR IMIX
 - type: "plot"

-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"

   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-pdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-pdr"

   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and
   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and

+           'VXLAN' and

            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6257,29 +6671,24 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:

-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"

     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"

-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"

   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-pdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-pdr"

   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and
   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and

+           'VXLAN' and

            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6289,29 +6698,24 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:

-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"

     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"

-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"

   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-pdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-pdr"

   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and
   data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'VHOST' and

+           'VXLAN' and

            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
            '8T4C' and
            'NDRPDR'"
            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
            '8T4C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6321,7 +6725,7 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:

-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"

     layout: "plot-service-density"
 
 ###############################################################################
     layout: "plot-service-density"
 
 ###############################################################################


@@ -6340,12 +6744,6 @@
            '64B' and
            '2T1C' and
            'MRR'"
            '64B' and
            '2T1C' and
            'MRR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"


@@ -6372,12 +6770,6 @@
            '64B' and
            '4T2C' and
            'MRR'"
            '64B' and
            '4T2C' and
            'MRR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"


@@ -6404,12 +6796,6 @@
            '64B' and
            '8T4C' and
            'MRR'"
            '64B' and
            '8T4C' and
            'MRR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"


@@ -6437,12 +6823,6 @@
            'IMIX' and
            '2T1C' and
            'MRR'"
            'IMIX' and
            '2T1C' and
            'MRR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"


@@ -6469,12 +6849,6 @@
            'IMIX' and
            '4T2C' and
            'MRR'"
            'IMIX' and
            '4T2C' and
            'MRR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"


@@ -6501,12 +6875,6 @@
            'IMIX' and
            '8T4C' and
            'MRR'"
            'IMIX' and
            '8T4C' and
            'MRR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"


@@ -6534,12 +6902,6 @@
            '64B' and
            '2T1C' and
            'NDRPDR'"
            '64B' and
            '2T1C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6566,12 +6928,6 @@
            '64B' and
            '4T2C' and
            'NDRPDR'"
            '64B' and
            '4T2C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6598,12 +6954,6 @@
            '64B' and
            '8T4C' and
            'NDRPDR'"
            '64B' and
            '8T4C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6631,12 +6981,6 @@
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
            'IMIX' and
            '2T1C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6663,12 +7007,6 @@
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
            'IMIX' and
            '4T2C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6695,12 +7033,6 @@
            'IMIX' and
            '8T4C' and
            'NDRPDR'"
            'IMIX' and
            '8T4C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6728,12 +7060,6 @@
            '64B' and
            '2T1C' and
            'NDRPDR'"
            '64B' and
            '2T1C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6760,12 +7086,6 @@
            '64B' and
            '4T2C' and
            'NDRPDR'"
            '64B' and
            '4T2C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6792,12 +7112,6 @@
            '64B' and
            '8T4C' and
            'NDRPDR'"
            '64B' and
            '8T4C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6825,12 +7139,6 @@
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
            'IMIX' and
            '2T1C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6857,12 +7165,6 @@
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
            'IMIX' and
            '4T2C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6889,12 +7191,6 @@
            'IMIX' and
            '8T4C' and
            'NDRPDR'"
            'IMIX' and
            '8T4C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -6923,12 +7219,6 @@
            '64B' and
            '2T1C' and
            'MRR'"
            '64B' and
            '2T1C' and
            'MRR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"


@@ -6955,12 +7245,6 @@
            '64B' and
            '4T2C' and
            'MRR'"
            '64B' and
            '4T2C' and
            'MRR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"


@@ -6987,12 +7271,6 @@
            '64B' and
            '8T4C' and
            'MRR'"
            '64B' and
            '8T4C' and
            'MRR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"


@@ -7020,12 +7298,6 @@
            'IMIX' and
            '2T1C' and
            'MRR'"
            'IMIX' and
            '2T1C' and
            'MRR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"


@@ -7052,12 +7324,6 @@
            'IMIX' and
            '4T2C' and
            'MRR'"
            'IMIX' and
            '4T2C' and
            'MRR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"


@@ -7084,12 +7350,6 @@
            'IMIX' and
            '8T4C' and
            'MRR'"
            'IMIX' and
            '8T4C' and
            'MRR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"


@@ -7117,12 +7377,6 @@
            '64B' and
            '2T1C' and
            'NDRPDR'"
            '64B' and
            '2T1C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -7149,12 +7403,6 @@
            '64B' and
            '4T2C' and
            'NDRPDR'"
            '64B' and
            '4T2C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -7181,12 +7429,6 @@
            '64B' and
            '8T4C' and
            'NDRPDR'"
            '64B' and
            '8T4C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -7214,12 +7456,6 @@
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
            'IMIX' and
            '2T1C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -7246,12 +7482,6 @@
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
            'IMIX' and
            '4T2C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -7278,12 +7508,6 @@
            'IMIX' and
            '8T4C' and
            'NDRPDR'"
            'IMIX' and
            '8T4C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -7311,12 +7535,6 @@
            '64B' and
            '2T1C' and
            'NDRPDR'"
            '64B' and
            '2T1C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -7343,12 +7561,6 @@
            '64B' and
            '4T2C' and
            'NDRPDR'"
            '64B' and
            '4T2C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -7375,12 +7587,6 @@
            '64B' and
            '8T4C' and
            'NDRPDR'"
            '64B' and
            '8T4C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -7408,12 +7614,6 @@
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
            'IMIX' and
            '2T1C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -7440,12 +7640,6 @@
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
            'IMIX' and
            '4T2C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"


@@ -7472,12 +7666,6 @@
            'IMIX' and
            '8T4C' and
            'NDRPDR'"
            'IMIX' and
            '8T4C' and
            'NDRPDR'"

-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"

   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"