Report 2005: Add data
[csit.git] / resources / tools / presentation / specification.yaml
index f2056a9..66f2035 100644 (file)
         - 43  # NDRPDR sel
         - 38  # NDRPDR sel
         - 7   # NDRPDR sel
+        - 78  # nf-density-sel
+        - 83  # nf-density-sel
 
     plot-vpp-nfv-2n-skx-mrr:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 9   # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 21  # NDRPDR sel
 
     plot-vpp-hdrh-lat-3n-tsh:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
     vpp-perf-results-3n-skx:
       csit-vpp-perf-report-coverage-2005-3n-skx:
         - 10  # perf-full-3n-skx-crypto_I
+        - 11  # perf-full-3n-skx-crypto_II
         - 12  # perf-full-3n-skx-crypto_III
         - 5   # perf-full-3n-skx-ip4_I
         - 14  # perf-full-3n-skx-ip4_II
         - 7   # perf-full-3n-skx-ip4_III
         - 15  # perf-full-3n-skx-ip4_IV
+        - 16  # perf-full-3n-skx-ip4_V
         - 17  # perf-full-3n-skx-ip4_VI
         - 18  # perf-full-3n-skx-ip4_VII
         - 19  # perf-full-3n-skx-ip4_VIII
         - 20  # perf-full-3n-skx-ip4_IX
         - 24  # perf-full-3n-skx-ip6_I
+        - 25  # perf-full-3n-skx-ip6_II
+        - 21  # perf-full-3n-skx-ip4tunnels-I
         - 22  # perf-full-3n-skx-ip4tunnels-II
         - 23  # perf-full-3n-skx-ip4tunnels-III
         - 26  # perf-full-3n-skx-ip6tunnels-I
         - 28  # perf-full-3n-skx-l2_II
+        - 29  # perf-full-3n-skx-l2_III
+        - 30  # perf-full-3n-skx-l2_IV
+        - 32  # perf-full-3n-skx-l2_VI
+        - 33  # perf-full-3n-skx-l2_VII
+        - 34  # perf-full-3n-skx-l2_VIII
+        - 35  # perf-full-3n-skx-l2_IX
+        - 36  # perf-full-3n-skx-l2_X
+        - 37  # perf-full-3n-skx-l2_XI
+        - 38  # perf-full-3n-skx-memif
+        - 39  # perf-full-3n-skx-srv6-I
+        - 40  # perf-full-3n-skx-srv6-II
+        - 43  # perf-full-3n-skx-vhost-III
 
     vpp-perf-results-2n-skx:
       # TODO: Add data:
         - 16  # NDRPDR sel
         - 18  # NDRPDR sel
         - 19  # NDRPDR sel
+    vpp-performance-changes-3n-hsw-cmp-2:
+      csit-vpp-perf-report-iterative-2005-3n-hsw:
+        - 20  # NDRPDR sel env 4
+        - 21  # NDRPDR sel env 4
+        - 22  # NDRPDR sel env 4
+        - 23  # NDRPDR sel env 4
+        - 24  # NDRPDR sel env 4
+        - 25  # NDRPDR sel env 4
+        - 26  # NDRPDR sel env 4
+        - 27  # NDRPDR sel env 4
+        - 28  # NDRPDR sel env 4
+        - 29  # NDRPDR sel env 4
 
     vpp-performance-changes-3n-skx-h1:
       csit-vpp-perf-verify-1908_1-3n-skx:
         - 38  # NDRPDR sel
         - 39  # NDRPDR sel
         - 41  # NDRPDR sel
+    vpp-performance-changes-3n-skx-cmp-2:
+      csit-vpp-perf-report-iterative-2005-3n-skx:
+        # TODO: Add data
+        - 42  # NDRPDR sel env 4
+        - 43  # NDRPDR sel env 4
 
     vpp-performance-changes-2n-skx-h1:
       csit-vpp-perf-verify-1908_1-2n-skx:
         - 75  # NDRPDR sel
         - 76  # NDRPDR sel
         - 73  # NDRPDR sel
+    vpp-performance-changes-2n-skx-cmp-2:
+      csit-vpp-perf-report-iterative-2005-2n-skx:
+        # TODO: Add data
+        - 88  # NDRPDR sel env 4
+        - 89  # NDRPDR sel env 4
+        - 90  # NDRPDR sel env 4
+        - 92  # NDRPDR sel env 4
+        - 93  # NDRPDR sel env 4
 
 #    vpp-performance-changes-nfv-2n-skx-ref:
 #      csit-vpp-perf-verify-2001-2n-skx:
 #        - 43  # NDRPDR sel
 #        - 38  # NDRPDR sel
 #        - 7   # NDRPDR sel
+#        - 78  # nf-density-sel
+#        - 83  # nf-density-sel
 
     vpp-performance-changes-2n-clx-ref:
       csit-vpp-perf-verify-2001-2n-clx:
         - 43  # NDRPDR sel
         - 50  # NDRPDR sel
         - 51  # NDRPDR sel
+    vpp-performance-changes-2n-clx-cmp-2:
+      csit-vpp-perf-report-iterative-2005-2n-clx:
+        - 62  # NDRPDR sel env 4
+        - 63  # NDRPDR sel env 4
+        - 64  # NDRPDR sel env 4
+        - 66  # NDRPDR sel env 4
 
     vpp-performance-changes-2n-dnv-h1:
       csit-vpp-perf-verify-1908-2n-dnv:
         - 9   # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 21  # NDRPDR sel
+    vpp-performance-changes-3n-tsh-cmp-2:
+      # TODO: Add data:
+      csit-vpp-perf-report-iterative-2005-3n-tsh:
+        - 23  # NDRPDR sel env 4
 
     vpp-soak-vs-ndr-2n-skx-ref:
       csit-vpp-perf-report-iterative-2005-2n-skx:
       hoverlabel:
         namelength: -1
 
-#    plot-cps:
-#      titlefont:
-#        size: 18
-#      xaxis:
-#        title: "<b>Test Cases [Index]</b>"
-#        titlefont:
-#          size: 16
-#        autorange: True
-#        fixedrange: False
-#        gridcolor: "rgb(230, 230, 230)"
-#        linecolor: "rgb(220, 220, 220)"
-#        linewidth: 1
-#        showgrid: True
-#        showline: True
-#        showticklabels: True
-#        tickcolor: "rgb(220, 220, 220)"
-#        tickmode: "linear"
-#        tickfont:
-#          size: 16
-#        zeroline: False
-#      yaxis:
-#        title: "<b>Connections Per Second [cps]</b>"
-#        titlefont:
-#          size: 16
-#        gridcolor: "rgb(230, 230, 230)"
-#        hoverformat: ".4s"
-#        linecolor: "rgb(220, 220, 220)"
-#        linewidth: 1
-#        rangemode: "tozero"
-#        showgrid: True
-#        showline: True
-#        showticklabels: True
-#        tickcolor: "rgb(220, 220, 220)"
-#        tickformat: ".3s"
-#        tickfont:
-#          size: 16
-#        zeroline: False
-#      boxmode: "group"
-#      boxgroupgap: 0.5
-#      autosize: False
-#      margin:
-#        t: 50
-#        b: 20
-#        l: 80
-#        r: 20
-#      showlegend: True
-#      legend:
-#        orientation: "h"
-#        font:
-#          size: 16
-#      width: 700
-#      height: 800
-#      paper_bgcolor: "#fff"
-#      plot_bgcolor: "#fff"
-#      hoverlabel:
-#        namelength: -1
-#
-#    plot-rps:
-#      titlefont:
-#        size: 18
-#      xaxis:
-#        title: "<b>Test Cases [Index]</b>"
-#        titlefont:
-#          size: 16
-#        autorange: True
-#        fixedrange: False
-#        gridcolor: "rgb(230, 230, 230)"
-#        linecolor: "rgb(220, 220, 220)"
-#        linewidth: 1
-#        showgrid: True
-#        showline: True
-#        showticklabels: True
-#        tickcolor: "rgb(220, 220, 220)"
-#        tickmode: "linear"
-#        tickfont:
-#          size: 16
-#        zeroline: False
-#      yaxis:
-#        title: "<b>Requests Per Second [rps]</b>"
-#        titlefont:
-#          size: 16
-#        gridcolor: "rgb(230, 230, 230)"
-#        hoverformat: ".4s"
-#        linecolor: "rgb(220, 220, 220)"
-#        linewidth: 1
-#        rangemode: "tozero"
-#        showgrid: True
-#        showline: True
-#        showticklabels: True
-#        tickcolor: "rgb(230, 230, 230)"
-#        tickformat: ".3s"
-#        tickfont:
-#          size: 16
-#        zeroline: False
-#      boxmode: "group"
-#      boxgroupgap: 0.5
-#      autosize: False
-#      margin:
-#        t: 50
-#        b: 20
-#        l: 80
-#        r: 20
-#      showlegend: True
-#      legend:
-#        orientation: "h"
-#        font:
-#          size: 16
-#      width: 700
-#      height: 800
-#      paper_bgcolor: "#fff"
-#      plot_bgcolor: "#fff"
-#      hoverlabel:
-#        namelength: -1
-
     plot-hoststack:
       titlefont:
         size: 16
       - 16  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
+      - 20  # NDRPDR sel env 4
+      - 21  # NDRPDR sel env 4
+      - 22  # NDRPDR sel env 4
+      - 23  # NDRPDR sel env 4
+      - 24  # NDRPDR sel env 4
+      - 25  # NDRPDR sel env 4
+      - 26  # NDRPDR sel env 4
+      - 27  # NDRPDR sel env 4
+      - 28  # NDRPDR sel env 4
+      - 29  # NDRPDR sel env 4
       - 13  # MRR
     csit-vpp-perf-verify-2005-3n-hsw:
       - 3   # hoststack
       - 38  # NDRPDR sel
       - 39  # NDRPDR sel
       - 41  # NDRPDR sel
+      - 42  # NDRPDR sel env 4
+      - 43  # NDRPDR sel env 4
       - 6   # MRR sel
     csit-vpp-perf-report-coverage-2005-3n-skx:
       - 10  # perf-full-3n-skx-crypto_I
+      - 11  # perf-full-3n-skx-crypto_II
       - 12  # perf-full-3n-skx-crypto_III
       - 5   # perf-full-3n-skx-ip4_I
       - 14  # perf-full-3n-skx-ip4_II
       - 7   # perf-full-3n-skx-ip4_III
       - 15  # perf-full-3n-skx-ip4_IV
+      - 16  # perf-full-3n-skx-ip4_V
       - 17  # perf-full-3n-skx-ip4_VI
       - 18  # perf-full-3n-skx-ip4_VII
       - 19  # perf-full-3n-skx-ip4_VIII
       - 20  # perf-full-3n-skx-ip4_IX
       - 24  # perf-full-3n-skx-ip6_I
+      - 25  # perf-full-3n-skx-ip6_II
+      - 21  # perf-full-3n-skx-ip4tunnels-I
       - 22  # perf-full-3n-skx-ip4tunnels-II
       - 23  # perf-full-3n-skx-ip4tunnels-III
       - 26  # perf-full-3n-skx-ip6tunnels-I
       - 28  # perf-full-3n-skx-l2_II
+      - 29  # perf-full-3n-skx-l2_III
+      - 30  # perf-full-3n-skx-l2_IV
+      - 32  # perf-full-3n-skx-l2_VI
+      - 33  # perf-full-3n-skx-l2_VII
+      - 34  # perf-full-3n-skx-l2_VIII
+      - 35  # perf-full-3n-skx-l2_IX
+      - 36  # perf-full-3n-skx-l2_X
+      - 37  # perf-full-3n-skx-l2_XI
+      - 38  # perf-full-3n-skx-memif
+      - 39  # perf-full-3n-skx-srv6-I
+      - 40  # perf-full-3n-skx-srv6-II
+      - 43  # perf-full-3n-skx-vhost-III
 
     csit-vpp-perf-verify-1908_1-2n-skx:
       - 39  # NDRPDR sel - new1908.1
       - 75  # NDRPDR sel
       - 76  # NDRPDR sel
       - 73  # NDRPDR sel
+      - 88  # NDRPDR sel env 4
+      - 89  # NDRPDR sel env 4
+      - 90  # NDRPDR sel env 4
+      - 92  # NDRPDR sel env 4
+      - 93  # NDRPDR sel env 4
       - 42  # MRR sel
       - 48  # Reconf
       - 50  # Reconf
       - 66  # Reconf
       - 49  # Soak
       - 54  # Soak
+      - 78  # nf-density-sel
+      - 83  # nf-density-sel
     csit-vpp-perf-report-coverage-2005-2n-skx:
       - 11  # perf-full-2n-skx-ip4_I
       - 3   # perf-full-2n-skx-ip4_II
       - 43  # NDRPDR sel
       - 50  # NDRPDR sel
       - 51  # NDRPDR sel
+      - 62  # NDRPDR sel env 4
+      - 63  # NDRPDR sel env 4
+      - 64  # NDRPDR sel env 4
+      - 66  # NDRPDR sel env 4
       - 12  # MRR
       - 42  # Reconf
       - 45  # Reconf
       - 9   # NDRPDR sel
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel env 4
       - 10  # MRR sel
 
     csit-vpp-perf-verify-1908-3n-dnv:
   format:
     html:
     - full
-    pdf:
-    - minimal
+#    pdf:
+#    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
 ################################################################################
 # VPP
 
-## VPP Performance changes 2n-skx-xxv710 2t1c ndr
-#- type: "table"
-#  title: "VPP Performance changes 2n-skx-xxv710 2t1c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-1908_2-2n-skx-2t1c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "1908.1"
-#      data-set: "vpp-perf-changes-2n-skx-new1908_1"
-#    - title: "1908.2"
-#      data-set: "vpp-perf-changes-2n-skx-new1908_2"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 1
-#      compare: 2
-#  legend:
-#    - "Legend to Table:"
-#    - "1908.1, 1908.2 - VPP versions tested."
-#    - "Diff - difference between the previous and the current VPP version."
-#
-## VPP Performance changes 2n-skx-xxv710 2t1c pdr
-#- type: "table"
-#  title: "VPP Performance changes 2n-skx-xxv710 2t1c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-1908_2-2n-skx-2t1c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "1908.1"
-#      data-set: "vpp-perf-changes-2n-skx-new1908_1"
-#    - title: "1908.2"
-#      data-set: "vpp-perf-changes-2n-skx-new1908_2"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 1
-#      compare: 2
-#  legend:
-#    - "Legend to Table:"
-#    - "1908.1, 1908.2 - VPP versions tested."
-#    - "Diff - difference between the previous and the current VPP version."
-#
-## VPP Performance changes 3n-skx-xxv710 2t1c ndr
-#- type: "table"
-#  title: "VPP Performance changes 3n-skx-xxv710 2t1c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-1908_2-3n-skx-2t1c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "1908.1"
-#      data-set: "vpp-perf-changes-3n-skx-new1908_1"
-#    - title: "1908.2"
-#      data-set: "vpp-perf-changes-3n-skx-new1908_2"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 1
-#      compare: 2
-#  legend:
-#    - "Legend to Table:"
-#    - "1908.1, 1908.2 - VPP versions tested."
-#    - "Diff - difference between the previous and the current VPP version."
-#
-## VPP Performance changes 3n-skx-xxv710 2t1c pdr
-#- type: "table"
-#  title: "VPP Performance changes 3n-skx-xxv710 2t1c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-1908_2-3n-skx-2t1c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "1908.1"
-#      data-set: "vpp-perf-changes-3n-skx-new1908_1"
-#    - title: "1908.2"
-#      data-set: "vpp-perf-changes-3n-skx-new1908_2"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 1
-#      compare: 2
-#  legend:
-#    - "Legend to Table:"
-#    - "1908.1, 1908.2 - VPP versions tested."
-#    - "Diff - difference between the previous and the current VPP version."
-#
-## VPP Performance changes 2n-clx-xxv710 2t1c ndr
-#- type: "table"
-#  title: "VPP Performance changes 2n-clx-xxv710 2t1c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-1908_2-2n-clx-2t1c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "1908.1"
-#      data-set: "vpp-perf-changes-2n-clx-new1908_1"
-#    - title: "1908.2"
-#      data-set: "vpp-perf-changes-2n-clx-new1908_2"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 1
-#      compare: 2
-#  legend:
-#    - "Legend to Table:"
-#    - "1908.1, 1908.2 - VPP versions tested."
-#    - "Diff - difference between the previous and the current VPP version."
-#
-## VPP Performance changes 2n-clx-xxv710 2t1c pdr
-#- type: "table"
-#  title: "VPP Performance changes 2n-clx-xxv710 2t1c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-1908_2-2n-clx-2t1c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "1908.1"
-#      data-set: "vpp-perf-changes-2n-clx-new1908_1"
-#    - title: "1908.2"
-#      data-set: "vpp-perf-changes-2n-clx-new1908_2"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 1
-#      compare: 2
-#  legend:
-#    - "Legend to Table:"
-#    - "1908.1, 1908.2 - VPP versions tested."
-#    - "Diff - difference between the previous and the current VPP version."
-
 # VPP Performance Changes 3n-hsw 1t1c pdr
 - type: "table"
   title: "VPP Performance Changes 3n-hsw 1t1c pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-3n-hsw-1t1c-pdr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-3n-hsw-1t1c-pdr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2008 VPP version."
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Performance Changes 3n-hsw 2t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-3n-hsw-2t2c-pdr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-3n-hsw-2t2c-pdr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2008 VPP version."
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Performance Changes 3n-hsw 1t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-3n-hsw-1t1c-ndr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-3n-hsw-1t1c-ndr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2008 VPP version."
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Performance Changes 3n-hsw 2t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
-  legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2008 VPP version."
-
-## VPP Root Cause Analysis 3n-skx-xxv710 2t1c pdr
-#- type: "table"
-#  title: "VPP Root Cause Analysis 3n-skx-xxv710 2t1c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-rca-3n-skx-2t1c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-#  rca:
-#    - title: "RCA1"
-#      data: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
-#    - title: "RCA2"
-#      data: "rca/rca-3n-skx-2t1c-pdr-rca2.yaml"
-#  columns:
-#    - title: "1908.0-1"
-#      data-set: "vpp-perf-changes-3n-skx-old1908_0"
-#      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-3n-skx-vhost"
-#    - title: "1908.1-1"
-#      data-set: "vpp-perf-changes-3n-skx-old1908_1"
-#    - title: "1908.1-2"
-#      data-set: "vpp-perf-changes-3n-skx-new1908_1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-perf-changes-3n-skx-new2001_0"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 2
-#      reference-alt: 1
-#      compare: 3
-#    - title: "Diff2"
-#      reference: 3
-#      compare: 4
-#  legend:
-#    - 'Legend to Table:'
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "1" for 2019-08-21, "2" for 2020-03-27).'
-#    - 'Diff1 - difference between environment versions "2" and "1" for the same VPP version, 1908.1-2 vs. 1908.1-1 (if data for the latter not present, 1908.0-1 is used).'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2001.0-2 vs. 1908.1-2.'
-#    - 'RCA1 - root cause analysis reference for Diff1.'
-#    - 'RCA2 - root cause analysis reference for Diff2.'
-#
-## VPP Root Cause Analysis 3n-skx-xxv710 2t1c ndr
-#- type: "table"
-#  title: "VPP Root Cause Analysis 3n-skx-xxv710 2t1c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-rca-3n-skx-2t1c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+    - title: "Diff2"
+      reference: 2
+      compare: 4
 #  rca:
 #    - title: "RCA1"
-#      data: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
+#      data: "rca/rca-2005-3n-hsw-2t2c-ndr-rca1.yaml"
 #    - title: "RCA2"
-#      data: "rca/rca-3n-skx-2t1c-ndr-rca2.yaml"
-#  columns:
-#    - title: "1908.0-1"
-#      data-set: "vpp-perf-changes-3n-skx-old1908_0"
-#      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-3n-skx-vhost"
-#    - title: "1908.1-1"
-#      data-set: "vpp-perf-changes-3n-skx-old1908_1"
-#    - title: "1908.1-2"
-#      data-set: "vpp-perf-changes-3n-skx-new1908_1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-perf-changes-3n-skx-new2001_0"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 2
-#      reference-alt: 1
-#      compare: 3
-#    - title: "Diff2"
-#      reference: 3
-#      compare: 4
-#  legend:
-#    - 'Legend to Table:'
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "1" for 2019-08-21, "2" for 2020-03-27).'
-#    - 'Diff1 - difference between environment versions "2" and "1" for the same VPP version, 1908.1-2 vs. 1908.1-1 (if data for the latter not present, 1908.0-1 is used).'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2001.0-2 vs. 1908.1-2.'
+#      data: "rca/rca-2005-3n-hsw-2t2c-ndr-rca2.yaml"
+  legend:
+    - "Legend to Table"
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
 #    - 'RCA1 - root cause analysis reference for Diff1.'
 #    - 'RCA2 - root cause analysis reference for Diff2.'
 
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-3n-skx-2t1c-pdr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-3n-skx-2t1c-pdr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Performance Changes 3n-skx 4t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-3n-skx-4t2c-pdr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-3n-skx-4t2c-pdr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Performance Changes 3n-skx 2t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-3n-skx-2t1c-ndr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-3n-skx-2t1c-ndr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Performance Changes 3n-skx 4t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
-  legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
-
-## VPP Root Cause Analysis 2n-skx-xxv710 2t1c pdr
-#- type: "table"
-#  title: "VPP Root Cause Analysis 2n-skx-xxv710 2t1c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-rca-2n-skx-2t1c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-#  rca:
-#    - title: "RCA1"
-#      data: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
-#    - title: "RCA2"
-#      data: "rca/rca-2n-skx-2t1c-pdr-rca2.yaml"
-#  columns:
-#    - title: "1908.0-1"
-#      data-set: "vpp-perf-changes-2n-skx-old1908_0"
-#      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-2n-skx-vhost"
-#    - title: "1908.1-1"
-#      data-set: "vpp-perf-changes-2n-skx-old1908_1"
-#    - title: "1908.1-2"
-#      data-set: "vpp-perf-changes-2n-skx-new1908_1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-perf-changes-2n-skx-new2001_0"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 2
-#      reference-alt: 1
-#      compare: 3
-#    - title: "Diff2"
-#      reference: 3
-#      compare: 4
-#  legend:
-#    - 'Legend to Table:'
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "1" for 2019-08-21, "2" for 2020-03-27).'
-#    - 'Diff1 - difference between environment versions "2" and "1" for the same VPP version, 1908.1-2 vs. 1908.1-1 (if data for the latter not present, 1908.0-1 is used).'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2001.0-2 vs. 1908.1-2.'
-#    - 'RCA1 - root cause analysis reference for Diff1.'
-#    - 'RCA2 - root cause analysis reference for Diff2.'
-#
-## VPP Root Cause Analysis 2n-skx-xxv710 2t1c ndr
-#- type: "table"
-#  title: "VPP Root Cause Analysis 2n-skx-xxv710 2t1c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-rca-2n-skx-2t1c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+    - title: "Diff2"
+      reference: 2
+      compare: 4
 #  rca:
 #    - title: "RCA1"
-#      data: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
+#      data: "rca/rca-2005-3n-skx-4t2c-ndr-rca1.yaml"
 #    - title: "RCA2"
-#      data: "rca/rca-2n-skx-2t1c-ndr-rca2.yaml"
-#  columns:
-#    - title: "1908.0-1"
-#      data-set: "vpp-perf-changes-2n-skx-old1908_0"
-#      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-2n-skx-vhost"
-#    - title: "1908.1-1"
-#      data-set: "vpp-perf-changes-2n-skx-old1908_1"
-#    - title: "1908.1-2"
-#      data-set: "vpp-perf-changes-2n-skx-new1908_1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-perf-changes-2n-skx-new2001_0"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 2
-#      reference-alt: 1
-#      compare: 3
-#    - title: "Diff2"
-#      reference: 3
-#      compare: 4
-#  legend:
-#    - 'Legend to Table:'
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "1" for 2019-08-21, "2" for 2020-03-27).'
-#    - 'Diff1 - difference between environment versions "2" and "1" for the same VPP version, 1908.1-2 vs. 1908.1-1 (if data for the latter not present, 1908.0-1 is used).'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2001.0-2 vs. 1908.1-2.'
+#      data: "rca/rca-2005-3n-skx-4t2c-ndr-rca2.yaml"
+  legend:
+    - "Legend to Table"
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
 #    - 'RCA1 - root cause analysis reference for Diff1.'
 #    - 'RCA2 - root cause analysis reference for Diff2.'
 
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-2n-skx-2t1c-pdr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-2n-skx-2t1c-pdr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Performance Changes 2n-skx 4t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-2n-skx-4t2c-pdr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-2n-skx-4t2c-pdr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Performance Changes 2n-skx 2t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
-  legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-2n-skx-2t1c-ndr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-2n-skx-2t1c-ndr-rca2.yaml"
+  legend:
+    - "Legend to Table"
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Performance Changes 2n-skx 4t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-2n-skx-4t2c-ndr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-2n-skx-4t2c-ndr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 1
+    - title: "Diff1"
+      reference: 3
       compare: 2
+    - title: "Diff2"
+      reference: 1
+      compare: 3
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-2n-clx-2t1c-pdr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-2n-clx-2t1c-pdr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 1
+    - title: "Diff1"
+      reference: 3
       compare: 2
+    - title: "Diff2"
+      reference: 1
+      compare: 3
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-2n-clx-4t2c-pdr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-2n-clx-4t2c-pdr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 1
+    - title: "Diff1"
+      reference: 3
       compare: 2
+    - title: "Diff2"
+      reference: 1
+      compare: 3
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-2n-clx-2t1c-ndr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-2n-clx-2t1c-ndr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 1
+    - title: "Diff1"
+      reference: 3
       compare: 2
+    - title: "Diff2"
+      reference: 1
+      compare: 3
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-2n-clx-4t2c-ndr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-2n-clx-4t2c-ndr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Performance Changes 2n-clx-x556 2t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
   legend:
     - "Legend to Table"
     - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - "Diff - difference between 2001.0-2 and 2005.0-3 VPP version."
 
 # VPP Performance Changes 2n-clx-x556 4t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
   legend:
     - "Legend to Table"
     - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - "Diff - difference between 2001.0-2 and 2005.0-3 VPP version."
 
 # VPP Performance Changes 2n-clx-x556 2t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
   legend:
     - "Legend to Table"
     - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - "Diff - difference between 2001.0-2 and 2005.0-3 VPP version."
 
 # VPP Performance Changes 2n-clx-x556 4t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
   legend:
     - "Legend to Table"
     - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - "Diff - difference between 2001.0-2 and 2005.0-3 VPP version."
 
 # VPP Performance Changes 2n-dnv 1t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-3n-tsh-1t1c-pdr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-3n-tsh-1t1c-pdr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Performance Changes 3n-tsh 2t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-3n-tsh-2t2c-pdr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-3n-tsh-2t2c-pdr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Performance Changes 3n-tsh 1t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-3n-tsh-1t1c-ndr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-3n-tsh-1t1c-ndr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Performance Changes 3n-tsh 2t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2005"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-3n-tsh-2t2c-ndr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-3n-tsh-2t2c-ndr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr
 - type: "table"
     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"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  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
-#           'VXLAN' and
-#           'CHAIN' and
-#           '118' 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-vxlan-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  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
-#           'VXLAN' and
-#           'CHAIN' and
-#           '118' 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-vxlan-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  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
-#           'VXLAN' and
-#           'CHAIN' and
-#           '118' 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-vxlan-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-vxlan-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  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
-#           'VXLAN' and
-#           'CHAIN' 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-vxlan-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  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
-#           'VXLAN' and
-#           'CHAIN' 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-vxlan-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  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
-#           'VXLAN' and
-#           'CHAIN' 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-vxlan-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-vxlan-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  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
-#           'VXLAN' and
-#           'CHAIN' and
-#           '118' 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-vxlan-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  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
-#           'VXLAN' and
-#           'CHAIN' and
-#           '118' 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-vxlan-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  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
-#           'VXLAN' and
-#           'CHAIN' and
-#           '118' 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-vxlan-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-vxlan-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  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
-#           'VXLAN' and
-#           'CHAIN' 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-vxlan-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  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
-#           'VXLAN' and
-#           'CHAIN' 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-vxlan-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  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
-#           'VXLAN' and
-#           'CHAIN' 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-vxlan-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-vxlan-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  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
-#           'VXLAN' and
-#           'CHAIN' and
-#           '118' 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-vxlan-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  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
-#           'VXLAN' and
-#           'CHAIN' and
-#           '118' 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-vxlan-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  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
-#           'VXLAN' and
-#           'CHAIN' and
-#           '118' 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-vxlan-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-vxlan-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  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
-#           'VXLAN' and
-#           'CHAIN' 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-vxlan-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  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
-#           'VXLAN' and
-#           'CHAIN' 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-vxlan-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  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
-#           'VXLAN' and
-#           'CHAIN' 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-vxlan-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-################################################################################
-## Plots - NF Density - CSC - MRR 64b
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '8T4C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - CSC - MRR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '8T4C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - CSC - NDR 64b
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-csc-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-csc-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-csc-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '8T4C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - CSC - NDR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csc-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csc-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csc-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '8T4C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - CSC - PDR 64b
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-csc-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-csc-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-csc-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '8T4C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - CSC - PDR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csc-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csc-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csc-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '8T4C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-pdr"
-#    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 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 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 IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  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
+           'VXLAN' and
+           'CHAIN' 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-vxlan-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  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
+           'VXLAN' and
+           'CHAIN' 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-vxlan-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  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
+           'VXLAN' and
+           'CHAIN' 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-vxlan-vppip4-mrr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - VSC - NDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  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
+           'VXLAN' and
+           'CHAIN' 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-vxlan-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  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
+           'VXLAN' and
+           'CHAIN' 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-vxlan-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  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
+           'VXLAN' and
+           'CHAIN' 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-vxlan-vppip4-ndr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - VSC - PDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  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
+           'VXLAN' and
+           'CHAIN' 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-vxlan-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  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
+           'VXLAN' and
+           'CHAIN' 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-vxlan-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  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
+           'VXLAN' and
+           'CHAIN' 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-vxlan-vppip4-pdr"
+    layout: "plot-service-density"
+
+###############################################################################
+
+# Plots - NF Density - CSC - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - CSC - NDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - CSC - PDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs 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}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
 ################################################################################
 #
 ## Plots - NF Density - CSC IPSEC 4tnl - MRR IMIX
   - "throughput"
   - "name"
   - "tags"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs 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}mif-{XY}dcr-10000tnl-vppip4-pdr"
-    layout: "plot-service-density"
-
-###############################################################################
-
-## Plots - NF Density - CSC IPSEC 10000tnl - MRR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-1t1c-ipsec-10000tnl-csc-mrr"
-#  data: "plot-vpp-nfv-3n-hsw-mrr"
-#  filter: "'NIC_Intel-XL710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           'TNL_10000' and
-#           '1T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-10000tnl-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-2t2c-ipsec-10000tnl-csc-mrr"
-#  data: "plot-vpp-nfv-3n-hsw-mrr"
-#  filter: "'NIC_Intel-XL710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IPSEC' and
-#           'TNL_10000' and
-#           'IMIX' and
-#           '2T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-10000tnl-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-4t4c-ipsec-10000tnl-csc-mrr"
-#  data: "plot-vpp-nfv-3n-hsw-mrr"
-#  filter: "'NIC_Intel-XL710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IPSEC' and
-#           'TNL_10000' and
-#           'IMIX' and
-#           '4T4C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-10000tnl-vppip4-mrr"
-#    layout: "plot-service-density"
-
-## Plots - NF Density - CSC IPSEC 10000tnl - NDR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-1t1c-ipsec-10000tnl-csc-ndr"
-#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-#  filter: "'NIC_Intel-XL710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IPSEC' and
-#           'TNL_10000' and
-#           'IMIX' and
-#           '1T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-10000tnl-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-2t2c-ipsec-10000tnl-csc-ndr"
-#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-#  filter: "'NIC_Intel-XL710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IPSEC' and
-#           'TNL_10000' and
-#           'IMIX' and
-#           '2T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-10000tnl-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-4t4c-ipsec-10000tnl-csc-ndr"
-#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-#  filter: "'NIC_Intel-XL710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IPSEC' and
-#           'TNL_10000' and
-#           'IMIX' and
-#           '4T4C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-10000tnl-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - CSC IPSEC 10000tnl - PDR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-1t1c-ipsec-10000tnl-csc-pdr"
-#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-#  filter: "'NIC_Intel-XL710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IPSEC' and
-#           'TNL_10000' and
-#           'IMIX' and
-#           '1T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-10000tnl-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-2t2c-ipsec-10000tnl-csc-pdr"
-#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-#  filter: "'NIC_Intel-XL710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IPSEC' and
-#           'TNL_10000' and
-#           'IMIX' and
-#           '2T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-10000tnl-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-4t4c-ipsec-10000tnl-csc-pdr"
-#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-#  filter: "'NIC_Intel-XL710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IPSEC' and
-#           'TNL_10000' and
-#           'IMIX' and
-#           '4T4C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs 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}mif-{XY}dcr-10000tnl-vppip4-pdr"
-#    layout: "plot-service-density"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs 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}mif-{XY}dcr-10000tnl-vppip4-pdr"
+    layout: "plot-service-density"
 
 ###############################################################################
 
-# Plots - NF Density - CSP - MRR 64b
-
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '8T4C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - CSP - MRR IMIX
+## Plots - NF Density - CSC IPSEC 10000tnl - MRR IMIX
 #- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-1t1c-ipsec-10000tnl-csc-mrr"
+#  data: "plot-vpp-nfv-3n-hsw-mrr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
-#           'PIPELINE' and
+#           'CHAIN' and
 #           'NF_VPPIP4' and
 #           'IMIX' and
-#           '2T1C' and
+#           'TNL_10000' and
+#           '1T1C' and
 #           'MRR'"
 #  parameters:
 #  - "result"
 #  - "name"
 #  - "tags"
 #  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
+#  x-axis: "X = CNFs 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}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
 #    layout: "plot-service-density"
 #
 #- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-2t2c-ipsec-10000tnl-csc-mrr"
+#  data: "plot-vpp-nfv-3n-hsw-mrr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
-#           'PIPELINE' and
+#           'CHAIN' and
 #           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
 #           'IMIX' and
-#           '4T2C' and
+#           '2T2C' and
 #           'MRR'"
 #  parameters:
 #  - "result"
 #  - "name"
 #  - "tags"
 #  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
+#  x-axis: "X = CNFs 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}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
 #    layout: "plot-service-density"
 #
 #- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-4t4c-ipsec-10000tnl-csc-mrr"
+#  data: "plot-vpp-nfv-3n-hsw-mrr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
-#           'PIPELINE' and
+#           'CHAIN' and
 #           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
 #           'IMIX' and
-#           '8T4C' and
+#           '4T4C' and
 #           'MRR'"
 #  parameters:
 #  - "result"
 #  - "name"
 #  - "tags"
 #  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
+#  x-axis: "X = CNFs 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}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - CSP - NDR 64b
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-csp-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-csp-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-csp-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '8T4C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
 #    layout: "plot-service-density"
-#
-## Plots - NF Density - CSP - NDR IMIX
+
+## Plots - NF Density - CSC IPSEC 10000tnl - NDR IMIX
 #- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-1t1c-ipsec-10000tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
-#           'PIPELINE' and
+#           'CHAIN' and
 #           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
 #           'IMIX' and
-#           '2T1C' and
+#           '1T1C' and
 #           'NDRPDR'"
 #  parameters:
 #  - "throughput"
 #  - "name"
 #  - "tags"
 #  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
+#  x-axis: "X = CNFs 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}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
 #    layout: "plot-service-density"
 #
 #- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-2t2c-ipsec-10000tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
-#           'PIPELINE' and
+#           'CHAIN' and
 #           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
 #           'IMIX' and
-#           '4T2C' and
+#           '2T2C' and
 #           'NDRPDR'"
 #  parameters:
 #  - "throughput"
 #  - "name"
 #  - "tags"
 #  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
+#  x-axis: "X = CNFs 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}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
 #    layout: "plot-service-density"
 #
 #- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-4t4c-ipsec-10000tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
-#           'PIPELINE' and
+#           'CHAIN' and
 #           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
 #           'IMIX' and
-#           '8T4C' and
+#           '4T4C' and
 #           'NDRPDR'"
 #  parameters:
 #  - "throughput"
 #  - "name"
 #  - "tags"
 #  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
+#  x-axis: "X = CNFs 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}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - CSP - PDR 64b
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-csp-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-csp-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-csp-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '8T4C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
 #    layout: "plot-service-density"
 #
-## Plots - NF Density - CSP - PDR IMIX
+## Plots - NF Density - CSC IPSEC 10000tnl - PDR IMIX
 #- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-1t1c-ipsec-10000tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
-#           'PIPELINE' and
+#           'CHAIN' and
 #           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
 #           'IMIX' and
-#           '2T1C' and
+#           '1T1C' and
 #           'NDRPDR'"
 #  parameters:
 #  - "throughput"
 #  - "name"
 #  - "tags"
 #  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
+#  x-axis: "X = CNFs 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}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
 #    layout: "plot-service-density"
 #
 #- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-2t2c-ipsec-10000tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
-#           'PIPELINE' and
+#           'CHAIN' and
 #           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
 #           'IMIX' and
-#           '4T2C' and
+#           '2T2C' and
 #           'NDRPDR'"
 #  parameters:
 #  - "throughput"
 #  - "name"
 #  - "tags"
 #  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
+#  x-axis: "X = CNFs 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}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
 #    layout: "plot-service-density"
 #
 #- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-4t4c-ipsec-10000tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
-#           'PIPELINE' and
+#           'CHAIN' and
 #           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
 #           'IMIX' and
-#           '8T4C' and
+#           '4T4C' and
 #           'NDRPDR'"
 #  parameters:
 #  - "throughput"
 #  - "name"
 #  - "tags"
 #  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
+#  x-axis: "X = CNFs 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}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
 #    layout: "plot-service-density"
 
+###############################################################################
+
+# Plots - NF Density - CSP - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - CSP - NDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - CSP - PDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
 ###############################################################################
 # Plots - 2n-clx NF Density - VSC - MRR IMIX