Trending: Add more NFV tests

+ 10R2C, 6R4C
+ Tunnels

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

8 files changed, 284 insertions, 167 deletions

diff --git a/docs/cpta/data/index.rst b/docs/cpta/data/index.rst
index 035f216ce1..79084af696 100644
--- a/docs/cpta/data/index.rst
+++ b/docs/cpta/data/index.rst
@@ -8,52 +8,52 @@ in the ASCII and CSV formats:
 
     - 3n-hsw
 
-        - `ASCII format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-trending.txt>`_
-        - `CSV format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-trending.csv>`_
+        - `ASCII format <../_static/vpp/csit-vpp-perf-mrr-daily-master-trending.txt>`_
+        - `CSV format <../_static/vpp/csit-vpp-perf-mrr-daily-master-trending.csv>`_
 
     - 3n-skx
 
-        - `ASCII format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-3n-skx-trending.txt>`_
-        - `CSV format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-3n-skx-trending.csv>`_
+        - `ASCII format <../_static/vpp/csit-vpp-perf-mrr-daily-master-3n-skx-trending.txt>`_
+        - `CSV format <../_static/vpp/csit-vpp-perf-mrr-daily-master-3n-skx-trending.csv>`_
 
     - 2n-skx
 
-        - `ASCII format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-2n-skx-trending.txt>`_
-        - `CSV format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-2n-skx-trending.csv>`_
+        - `ASCII format <../_static/vpp/csit-vpp-perf-mrr-daily-master-2n-skx-trending.txt>`_
+        - `CSV format <../_static/vpp/csit-vpp-perf-mrr-daily-master-2n-skx-trending.csv>`_
 
     - 2n-clx
 
-        - `ASCII format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-2n-clx-trending.txt>`_
-        - `CSV format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-2n-clx-trending.csv>`_
+        - `ASCII format <../_static/vpp/csit-vpp-perf-mrr-daily-master-2n-clx-trending.txt>`_
+        - `CSV format <../_static/vpp/csit-vpp-perf-mrr-daily-master-2n-clx-trending.csv>`_
 
     - 3n-tsh
 
-        - `ASCII format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-3n-tsh-trending.txt>`_
-        - `CSV format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-3n-tsh-trending.csv>`_
+        - `ASCII format <../_static/vpp/csit-vpp-perf-mrr-daily-master-3n-tsh-trending.txt>`_
+        - `CSV format <../_static/vpp/csit-vpp-perf-mrr-daily-master-3n-tsh-trending.csv>`_
 
     - 3n-dnv
 
-        - `ASCII format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-3n-dnv-trending.txt>`_
-        - `CSV format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-3n-dnv-trending.csv>`_
+        - `ASCII format <../_static/vpp/csit-vpp-perf-mrr-daily-master-3n-dnv-trending.txt>`_
+        - `CSV format <../_static/vpp/csit-vpp-perf-mrr-daily-master-3n-dnv-trending.csv>`_
 
     - 2n-dnv
 
-        - `ASCII format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-2n-dnv-trending.txt>`_
-        - `CSV format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-2n-dnv-trending.csv>`_
+        - `ASCII format <../_static/vpp/csit-vpp-perf-mrr-daily-master-2n-dnv-trending.txt>`_
+        - `CSV format <../_static/vpp/csit-vpp-perf-mrr-daily-master-2n-dnv-trending.csv>`_
 
 **DPDK**
 
     - 3n-hsw
 
-        - `ASCII format <../_static/vpp/cpta-csit-dpdk-perf-mrr-weekly-master-trending.txt>`_
-        - `CSV format <../_static/vpp/cpta-csit-dpdk-perf-mrr-weekly-master-trending.csv>`_
+        - `ASCII format <../_static/vpp/csit-dpdk-perf-mrr-weekly-master-trending.txt>`_
+        - `CSV format <../_static/vpp/csit-dpdk-perf-mrr-weekly-master-trending.csv>`_
 
     - 3n-skx
 
-        - `ASCII format <../_static/vpp/cpta-csit-dpdk-perf-mrr-weekly-master-3n-skx-trending.txt>`_
-        - `CSV format <../_static/vpp/cpta-csit-dpdk-perf-mrr-weekly-master-3n-skx-trending.csv>`_
+        - `ASCII format <../_static/vpp/csit-dpdk-perf-mrr-weekly-master-3n-skx-trending.txt>`_
+        - `CSV format <../_static/vpp/csit-dpdk-perf-mrr-weekly-master-3n-skx-trending.csv>`_
 
     - 2n-skx
 
-        - `ASCII format <../_static/vpp/cpta-csit-dpdk-perf-mrr-weekly-master-2n-skx-trending.txt>`_
-        - `CSV format <../_static/vpp/cpta-csit-dpdk-perf-mrr-weekly-master-2n-skx-trending.csv>`_
+        - `ASCII format <../_static/vpp/csit-dpdk-perf-mrr-weekly-master-2n-skx-trending.txt>`_
+        - `CSV format <../_static/vpp/csit-dpdk-perf-mrr-weekly-master-2n-skx-trending.csv>`_
diff --git a/docs/cpta/trending/nf_service_density.rst b/docs/cpta/trending/nf_service_density.rst
index c8aa15f0e3..8624e0572a 100644
--- a/docs/cpta/trending/nf_service_density.rst
+++ b/docs/cpta/trending/nf_service_density.rst
@@ -7,3 +7,4 @@ NF Service Density
     nf_service_density_vnfc-2n-skx-xxv710
     nf_service_density_cnfc-2n-skx-xxv710
     nf_service_density_cnfp-2n-skx-xxv710
+    nf_service_density_vnfc-vxlan-2n-skx-xxv710
diff --git a/docs/cpta/trending/nf_service_density_cnfc-2n-skx-xxv710.rst b/docs/cpta/trending/nf_service_density_cnfc-2n-skx-xxv710.rst
index 526e531ecb..6e9aa0b8ee 100644
--- a/docs/cpta/trending/nf_service_density_cnfc-2n-skx-xxv710.rst
+++ b/docs/cpta/trending/nf_service_density_cnfc-2n-skx-xxv710.rst
@@ -1,5 +1,5 @@
-CNF Service Chains
-------------------
+CNF Service Chains Routing
+--------------------------
 
 2n-skx-xxv710-imix-memif-chains-i40e
 ````````````````````````````````````
diff --git a/docs/cpta/trending/nf_service_density_cnfp-2n-skx-xxv710.rst b/docs/cpta/trending/nf_service_density_cnfp-2n-skx-xxv710.rst
index 41b48c6ee7..2bf04a63e6 100644
--- a/docs/cpta/trending/nf_service_density_cnfp-2n-skx-xxv710.rst
+++ b/docs/cpta/trending/nf_service_density_cnfp-2n-skx-xxv710.rst
@@ -1,5 +1,5 @@
-CNF Service Pipelines
----------------------
+CNF Service Pipelines Routing
+-----------------------------
 
 2n-skx-xxv710-imix-memif-pipelines-i40e
 ```````````````````````````````````````
diff --git a/docs/cpta/trending/nf_service_density_vnfc-2n-skx-xxv710.rst b/docs/cpta/trending/nf_service_density_vnfc-2n-skx-xxv710.rst
index dae254ee08..23e259bee6 100644
--- a/docs/cpta/trending/nf_service_density_vnfc-2n-skx-xxv710.rst
+++ b/docs/cpta/trending/nf_service_density_vnfc-2n-skx-xxv710.rst
@@ -1,5 +1,5 @@
-VNF Service Chains
-------------------
+VNF Service Chains Routing
+--------------------------
 
 2n-skx-xxv710-imix-vhost-chains-i40e
 ````````````````````````````````````
diff --git a/docs/cpta/trending/nf_service_density_vnfc-vxlan-2n-skx-xxv710.rst b/docs/cpta/trending/nf_service_density_vnfc-vxlan-2n-skx-xxv710.rst
new file mode 100644
index 0000000000..66174b4cf6
--- /dev/null
+++ b/docs/cpta/trending/nf_service_density_vnfc-vxlan-2n-skx-xxv710.rst
@@ -0,0 +1,47 @@
+VNF Service Chains Tunnels
+--------------------------
+
+2n-skx-xxv710-imix-vhost-chains-vxlan-i40e
+``````````````````````````````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="imix-2t1c-base-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-imix-2t1c-vhost-chains-vxlan-i40e.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="imix-4t2c-base-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-imix-4t2c-vhost-chains-vxlan-i40e.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="imix-8t4c-base-i40e"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-imix-8t4c-vhost-chains-vxlan-i40e.html"></iframe>
+    <p><br><br></p>
+    </center>
diff --git a/resources/tools/presentation/generator_cpta.py b/resources/tools/presentation/generator_cpta.py
index c9bc44c460..29eed8cf75 100644
--- a/resources/tools/presentation/generator_cpta.py
+++ b/resources/tools/presentation/generator_cpta.py
@@ -556,18 +556,18 @@ def _generate_all_charts(spec, input_data):
 
     anomaly_classifications = dict()
 
-    # Create the header:
+    # Create the table header:
     csv_tables = dict()
     for job_name in builds_dict:
         if csv_tables.get(job_name, None) is None:
             csv_tables[job_name] = list()
-        header = u"Build Number:," + u",".join(builds_dict[job_name]) + u'\n'
+        header = f"Build Number:,{u','.join(builds_dict[job_name])}\n"
         csv_tables[job_name].append(header)
         build_dates = [x[0] for x in build_info[job_name].values()]
-        header = u"Build Date:," + u",".join(build_dates) + u'\n'
+        header = f"Build Date:,{u','.join(build_dates)}\n"
         csv_tables[job_name].append(header)
         versions = [x[1] for x in build_info[job_name].values()]
-        header = u"Version:," + u",".join(versions) + u'\n'
+        header = f"Version:,{u','.join(versions)}\n"
         csv_tables[job_name].append(header)
 
     for chart in spec.cpta[u"plots"]:
@@ -583,7 +583,7 @@ def _generate_all_charts(spec, input_data):
 
     # Write the tables:
     for job_name, csv_table in csv_tables.items():
-        file_name = spec.cpta[u"output-file"] + u"-" + job_name + u"-trending"
+        file_name = f"{spec.cpta[u'output-file']}/{job_name}-trending"
         with open(f"{file_name}.csv", u"w") as file_handler:
             file_handler.writelines(csv_table)
 
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index cb2e6997a4..62c222ecdb 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -1689,211 +1689,280 @@
 ################################################################################
 # NFV
 
-    - title: "VPP 2T1C NF Service Density VNFc 64B MRR Trending 2n-skx"
+    - title: "VPP 2T1C NF Service Density VNFc IMIX MRR Trending 2n-skx"
       output-file-name: "2n-skx-xxv710-imix-2t1c-vhost-chains-i40e"
       data: "plot-performance-trending-vpp-nfv-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN'"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN' and not 'VXLAN'"
       groups:
-      - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
-      - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
-      - ["4R1C", "4R2C", "4R4C"]
-      - ["6R1C", "6R2C"]
-      - ["8R1C", "8R2C"]
-      - ["10R1C"]
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
       group-names:
-      - "1 Chain"
-      - "2 Chains"
-      - "4 Chains"
-      - "6 Chains"
-      - "8 Chains"
-      - "10 Chains"
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
       parameters:
-      - "result"
-      - "tags"
+        - "result"
+        - "tags"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C NF Service Density VNFc 64B MRR Trending 2n-skx"
+    - title: "VPP 4T2C NF Service Density VNFc IMIX MRR Trending 2n-skx"
       output-file-name: "2n-skx-xxv710-imix-4t2c-vhost-chains-i40e"
       data: "plot-performance-trending-vpp-nfv-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN'"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN' and not 'VXLAN'"
       groups:
-      - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
-      - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
-      - ["4R1C", "4R2C", "4R4C"]
-      - ["6R1C", "6R2C"]
-      - ["8R1C", "8R2C"]
-      - ["10R1C"]
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
       group-names:
-      - "1 Chain"
-      - "2 Chains"
-      - "4 Chains"
-      - "6 Chains"
-      - "8 Chains"
-      - "10 Chains"
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
       parameters:
-      - "result"
-      - "tags"
+        - "result"
+        - "tags"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C NF Service Density VNFc 64B MRR Trending 2n-skx"
+    - title: "VPP 8T4C NF Service Density VNFc IMIX MRR Trending 2n-skx"
       output-file-name: "2n-skx-xxv710-imix-8t4c-vhost-chains-i40e"
       data: "plot-performance-trending-vpp-nfv-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN'"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN' and not 'VXLAN'"
       groups:
-      - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
-      - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
-      - ["4R1C", "4R2C", "4R4C"]
-      - ["6R1C", "6R2C"]
-      - ["8R1C", "8R2C"]
-      - ["10R1C"]
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
       group-names:
-      - "1 Chain"
-      - "2 Chains"
-      - "4 Chains"
-      - "6 Chains"
-      - "8 Chains"
-      - "10 Chains"
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
       parameters:
-      - "result"
-      - "tags"
+        - "result"
+        - "tags"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C NF Service Density VNFc VXLAN IMIX MRR Trending 2n-skx"
+      output-file-name: "2n-skx-xxv710-imix-2t1c-vhost-chains-vxlan-i40e"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN' and 'VXLAN'"
+      groups:
+        - ["1R1C", ]
+        - ["2R1C", ]
+        - ["4R1C", ]
+        - ["6R1C", ]
+        - ["8R1C", ]
+        - ["10R1C", ]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      parameters:
+        - "result"
+        - "tags"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C NF Service Density VNFc VXLAN IMIX MRR Trending 2n-skx"
+      output-file-name: "2n-skx-xxv710-imix-4t2c-vhost-chains-vxlan-i40e"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN' and 'VXLAN'"
+      groups:
+        - ["1R1C", ]
+        - ["2R1C", ]
+        - ["4R1C", ]
+        - ["6R1C", ]
+        - ["8R1C", ]
+        - ["10R1C", ]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      parameters:
+        - "result"
+        - "tags"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C NF Service Density CNFc 64B MRR Trending 2n-skx"
+    - title: "VPP 8T4C NF Service Density VNFc VXLAN IMIX MRR Trending 2n-skx"
+      output-file-name: "2n-skx-xxv710-imix-8t4c-vhost-chains-vxlan-i40e"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN' and 'VXLAN'"
+      groups:
+        - ["1R1C", ]
+        - ["2R1C", ]
+        - ["4R1C", ]
+        - ["6R1C", ]
+        - ["8R1C", ]
+        - ["10R1C", ]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      parameters:
+        - "result"
+        - "tags"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C NF Service Density CNFc IMIX MRR Trending 2n-skx"
       output-file-name: "2n-skx-xxv710-imix-2t1c-memif-chains-i40e"
       data: "plot-performance-trending-vpp-nfv-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'CHAIN' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN'"
       groups:
-      - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
-      - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
-      - ["4R1C", "4R2C", "4R4C"]
-      - ["6R1C", "6R2C"]
-      - ["8R1C", "8R2C"]
-      - ["10R1C"]
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
       group-names:
-      - "1 Chain"
-      - "2 Chains"
-      - "4 Chains"
-      - "6 Chains"
-      - "8 Chains"
-      - "10 Chains"
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
       parameters:
-      - "result"
-      - "tags"
+        - "result"
+        - "tags"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C NF Service Density CNFc 64B MRR Trending 2n-skx"
+    - title: "VPP 4T2C NF Service Density CNFc IMIX MRR Trending 2n-skx"
       output-file-name: "2n-skx-xxv710-imix-4t2c-memif-chains-i40e"
       data: "plot-performance-trending-vpp-nfv-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'CHAIN' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN'"
       groups:
-      - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
-      - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
-      - ["4R1C", "4R2C", "4R4C"]
-      - ["6R1C", "6R2C"]
-      - ["8R1C", "8R2C"]
-      - ["10R1C"]
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
       group-names:
-      - "1 Chain"
-      - "2 Chains"
-      - "4 Chains"
-      - "6 Chains"
-      - "8 Chains"
-      - "10 Chains"
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
       parameters:
-      - "result"
-      - "tags"
+        - "result"
+        - "tags"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C NF Service Density CNFc 64B MRR Trending 2n-skx"
+    - title: "VPP 8T4C NF Service Density CNFc IMIX MRR Trending 2n-skx"
       output-file-name: "2n-skx-xxv710-imix-8t4c-memif-chains-i40e"
       data: "plot-performance-trending-vpp-nfv-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'CHAIN' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN'"
       groups:
-      - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
-      - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
-      - ["4R1C", "4R2C", "4R4C"]
-      - ["6R1C", "6R2C"]
-      - ["8R1C", "8R2C"]
-      - ["10R1C"]
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
       group-names:
-      - "1 Chain"
-      - "2 Chains"
-      - "4 Chains"
-      - "6 Chains"
-      - "8 Chains"
-      - "10 Chains"
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
       parameters:
-      - "result"
-      - "tags"
+        - "result"
+        - "tags"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C NF Service Density CNFp 64B MRR Trending 2n-skx"
+    - title: "VPP 2T1C NF Service Density CNFp IMIX MRR Trending 2n-skx"
       output-file-name: "2n-skx-xxv710-imix-2t1c-memif-pipelines-i40e"
       data: "plot-performance-trending-vpp-nfv-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'PIPELINE' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN'"
       groups:
-      - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
-      - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
-      - ["4R1C", "4R2C", "4R4C"]
-      - ["6R1C", "6R2C"]
-      - ["8R1C", "8R2C"]
-      - ["10R1C"]
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
       group-names:
-      - "1 Pipe"
-      - "2 Pipes"
-      - "4 Pipes"
-      - "6 Pipes"
-      - "8 Pipes"
-      - "10 Pipes"
+        - "1 Pipe"
+        - "2 Pipes"
+        - "4 Pipes"
+        - "6 Pipes"
+        - "8 Pipes"
+        - "10 Pipes"
       parameters:
-      - "result"
-      - "tags"
+        - "result"
+        - "tags"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C NF Service Density CNFp 64B MRR Trending 2n-skx"
+    - title: "VPP 4T2C NF Service Density CNFp IMIX MRR Trending 2n-skx"
       output-file-name: "2n-skx-xxv710-imix-4t2c-memif-pipelines-i40e"
       data: "plot-performance-trending-vpp-nfv-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'PIPELINE' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN'"
       groups:
-      - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
-      - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
-      - ["4R1C", "4R2C", "4R4C"]
-      - ["6R1C", "6R2C"]
-      - ["8R1C", "8R2C"]
-      - ["10R1C"]
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
       group-names:
-      - "1 Pipe"
-      - "2 Pipes"
-      - "4 Pipes"
-      - "6 Pipes"
-      - "8 Pipes"
-      - "10 Pipes"
+        - "1 Pipe"
+        - "2 Pipes"
+        - "4 Pipes"
+        - "6 Pipes"
+        - "8 Pipes"
+        - "10 Pipes"
       parameters:
       - "result"
       - "tags"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C NF Service Density CNFp 64B MRR Trending 2n-skx"
+    - title: "VPP 8T4C NF Service Density CNFp IMIX MRR Trending 2n-skx"
       output-file-name: "2n-skx-xxv710-imix-8t4c-memif-pipelines-i40e"
       data: "plot-performance-trending-vpp-nfv-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'PIPELINE' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN'"
       groups:
-      - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
-      - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C"]
-      - ["4R1C", "4R2C", "4R4C"]
-      - ["6R1C", "6R2C"]
-      - ["8R1C", "8R2C"]
-      - ["10R1C"]
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
       group-names:
-      - "1 Pipe"
-      - "2 Pipes"
-      - "4 Pipes"
-      - "6 Pipes"
-      - "8 Pipes"
-      - "10 Pipes"
+        - "1 Pipe"
+        - "2 Pipes"
+        - "4 Pipes"
+        - "6 Pipes"
+        - "8 Pipes"
+        - "10 Pipes"
       parameters:
-      - "result"
-      - "tags"
+        - "result"
+        - "tags"
       layout: "plot-cpta"
 
 ################################################################################