Trending: ipsec

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

2 files changed, 207 insertions, 98 deletions

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 3ab887070f..3087afda29 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -825,6 +825,10 @@ def _generate_url(base, testbed, test_name):
     elif "ipsec" in test_name:
         file_name = "ipsec"
         feature = "-base-scale"
+        if "-int-" in test_name:
+            feature = "-base-scale-int"
+        elif "tnl" in test_name:
+            feature = "-base-scale-tnl"
 
     elif "ethip4lispip" in test_name or "ethip4vxlan" in test_name:
         file_name = "ip4_tunnels"
@@ -872,6 +876,8 @@ def _generate_url(base, testbed, test_name):
         nic = "vic1227-"
     elif "vic1385" in test_name:
         nic = "vic1385-"
+    elif "x553" in test_name:
+        nic = "x553-"
     else:
         nic = ""
     anchor += nic
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index ae152b4918..55abc8c0a3 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -2717,50 +2717,76 @@
 
 # IPSec
 
-    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-1t1c"
-      output-file-name: "ipsec-1t1c-xl710-3n-hsw"
+#    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-1t1c"
+#      output-file-name: "ipsec-1t1c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and not 'VHOST'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-2t2c"
+#      output-file-name: "ipsec-2t2c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and not 'VHOST'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-4t4c"
+#      output-file-name: "ipsec-4t4c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and not 'VHOST'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+
+# IPSec - SW INT
+    - title: "3n-hsw-x710-ip4-ipsecsw-int-64b-base-scale-1t1c"
+      output-file-name: "ipsecsw-int-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECSW' and 'IPSECINT' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-2t2c"
-      output-file-name: "ipsec-2t2c-xl710-3n-hsw"
+    - title: "3n-hsw-x710-ip4-ipsecsw-int-64b-base-scale-2t2c"
+      output-file-name: "ipsecsw-int-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECSW' and 'IPSECINT' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-4t4c"
-      output-file-name: "ipsec-4t4c-xl710-3n-hsw"
+    - title: "3n-hsw-x710-ip4-ipsecsw-int-64b-base-scale-4t4c"
+      output-file-name: "ipsecsw-int-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECSW' and 'IPSECINT' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-xl710-ip4-ipsecsw-64b-base-scale-1t1c"
-      output-file-name: "ipsecsw-1t1c-xl710-3n-hsw"
+# IPSec - SW TUN
+    - title: "3n-hsw-x710-ip4-ipsecsw-tnl-64b-base-scale-1t1c"
+      output-file-name: "ipsecsw-tnl-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECSW' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECSW' and 'IPSECTUN' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-xl710-ip4-ipsecsw-64b-base-scale-2t2c"
-      output-file-name: "ipsecsw-2t2c-xl710-3n-hsw"
+    - title: "3n-hsw-x710-ip4-ipsecsw-tnl-64b-base-scale-2t2c"
+      output-file-name: "ipsecsw-tnl-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECSW' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECSW' and 'IPSECTUN' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "3n-hsw-xl710-ip4-ipsecsw-64b-base-scale-4t4c"
-      output-file-name: "ipsecsw-4t4c-xl710-3n-hsw"
+    - title: "3n-hsw-x710-ip4-ipsecsw-tnl-64b-base-scale-4t4c"
+      output-file-name: "ipsecsw-tnl-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECSW' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECSW' and 'IPSECTUN' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -3694,6 +3720,57 @@
       - "result"
       layout: "plot-cpta"
 
+
+# IPSec - SW INT
+    - title: "3n-skx-x710-ip4-ipsecsw-int-64b-base-scale-2t1c"
+      output-file-name: "ipsecsw-int-2t1c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '2T1C' and 'IPSECSW' and 'IPSECINT' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-x710-ip4-ipsecsw-int-64b-base-scale-4t2c"
+      output-file-name: "ipsecsw-int-4t2c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '4T2C' and 'IPSECSW' and 'IPSECINT' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-x710-ip4-ipsecsw-int-64b-base-scale-8t4c"
+      output-file-name: "ipsecsw-int-8t4c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '8T4C' and 'IPSECSW' and 'IPSECINT' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPSec - SW TUN
+    - title: "3n-skx-x710-ip4-ipsecsw-tnl-64b-base-scale-2t1c"
+      output-file-name: "ipsecsw-tnl-2t1c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '2T1C' and 'IPSECSW' and 'IPSECTUN' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-x710-ip4-ipsecsw-tnl-64b-base-scale-4t2c"
+      output-file-name: "ipsecsw-tnl-4t2c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '4T2C' and 'IPSECSW' and 'IPSECTUN' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-x710-ip4-ipsecsw-tnl-64b-base-scale-8t4c"
+      output-file-name: "ipsecsw-tnl-8t4c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'IP4FWD' and 'MRR' and '8T4C' and 'IPSECSW' and 'IPSECTUN' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
 # Link Bonding - x710
 
     - title: "3n-skx-x710-lb-64b-2t1c"
@@ -4938,132 +5015,158 @@
 ################################################################################
 # 3n-dnv
 
-# L2 - x533
+# L2 - x553
+
+    - title: "3n-dnv-x553-l2sw-64b-base-scale-1t1c"
+      output-file-name: "l2-1t1c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-l2sw-64b-base-scale-2t2c"
+      output-file-name: "l2-2t2c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-l2sw-64b-base-scale-4t4c"
+      output-file-name: "l2-4t4c-x553-3n-dnv"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPv4 - x553
 
-    - title: "3n-dnv-x533-l2sw-64b-base-scale-1t1c"
-      output-file-name: "l2-1t1c-x533-3n-dnv"
+    - title: "3n-dnv-x553-ip4-64b-base-scale-1t1c"
+      output-file-name: "ip4-1t1c-x553-3n-dnv"
       data: "plot-performance-trending-vpp-3n-dnv"
-      filter: "'NIC_Intel-X533' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "3n-dnv-x533-l2sw-64b-base-scale-2t2c"
-      output-file-name: "l2-2t2c-x533-3n-dnv"
+    - title: "3n-dnv-x553-ip4-64b-base-scale-2t2c"
+      output-file-name: "ip4-2t2c-x553-3n-dnv"
       data: "plot-performance-trending-vpp-3n-dnv"
-      filter: "'NIC_Intel-X533' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "3n-dnv-x533-l2sw-64b-base-scale-4t4c"
-      output-file-name: "l2-4t4c-x533-3n-dnv"
+    - title: "3n-dnv-x553-ip4-64b-base-scale-4t4c"
+      output-file-name: "ip4-4t4c-x553-3n-dnv"
       data: "plot-performance-trending-vpp-3n-dnv"
-      filter: "'NIC_Intel-X533' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# IPv4 - x533
+# IPv4 Tunnels - x553
 
-    - title: "3n-dnv-x533-ip4-64b-base-scale-1t1c"
-      output-file-name: "ip4-1t1c-x533-3n-dnv"
+    - title: "3n-dnv-x553-ip4tun-64b-base-1t1c"
+      output-file-name: "ip4-tunnels-1t1c-x553-3n-dnv"
       data: "plot-performance-trending-vpp-3n-dnv"
-      filter: "'NIC_Intel-X533' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
+      filter: "'NIC_Intel-X553' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "3n-dnv-x533-ip4-64b-base-scale-2t2c"
-      output-file-name: "ip4-2t2c-x533-3n-dnv"
+    - title: "3n-dnv-x553-ip4tun-64b-base-2t2c"
+      output-file-name: "ip4-tunnels-2t2c-x553-3n-dnv"
       data: "plot-performance-trending-vpp-3n-dnv"
-      filter: "'NIC_Intel-X533' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
+      filter: "'NIC_Intel-X553' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "3n-dnv-x533-ip4-64b-base-scale-4t4c"
-      output-file-name: "ip4-4t4c-x533-3n-dnv"
+    - title: "3n-dnv-x553-ip4tun-64b-base-4t4c"
+      output-file-name: "ip4-tunnels-4t4c-x553-3n-dnv"
       data: "plot-performance-trending-vpp-3n-dnv"
-      filter: "'NIC_Intel-X533' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
+      filter: "'NIC_Intel-X553' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# IPv4 Tunnels - x533
+# IPv6 - x553
 
-    - title: "3n-dnv-x533-ip4tun-64b-base-1t1c"
-      output-file-name: "ip4-tunnels-1t1c-x533-3n-dnv"
+    - title: "3n-dnv-x553-ip6-78b-base-scale-1t1c"
+      output-file-name: "ip6-1t1c-x553-3n-dnv"
       data: "plot-performance-trending-vpp-3n-dnv"
-      filter: "'NIC_Intel-X533' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      filter: "'NIC_Intel-X553' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "3n-dnv-x533-ip4tun-64b-base-2t2c"
-      output-file-name: "ip4-tunnels-2t2c-x533-3n-dnv"
+    - title: "3n-dnv-x553-ip6-78b-base-scale-2t2c"
+      output-file-name: "ip6-2t2c-x553-3n-dnv"
       data: "plot-performance-trending-vpp-3n-dnv"
-      filter: "'NIC_Intel-X533' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      filter: "'NIC_Intel-X553' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "3n-dnv-x533-ip4tun-64b-base-4t4c"
-      output-file-name: "ip4-tunnels-4t4c-x533-3n-dnv"
+    - title: "3n-dnv-x553-ip6-78b-base-scale-4t4c"
+      output-file-name: "ip6-4t4c-x553-3n-dnv"
       data: "plot-performance-trending-vpp-3n-dnv"
-      filter: "'NIC_Intel-X533' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      filter: "'NIC_Intel-X553' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# IPv6 - x533
+# IPSec HW IPSECINT
 
-    - title: "3n-dnv-x533-ip6-78b-base-scale-1t1c"
-      output-file-name: "ip6-1t1c-x533-3n-dnv"
+    - title: "3n-dnv-x553-ip4-ipsechw-int-64b-base-scale-1t1c"
+      output-file-name: "ipsechw-int-1t1c-x553-3n-dnv"
       data: "plot-performance-trending-vpp-3n-dnv"
-      filter: "'NIC_Intel-X533' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
+      filter: "'NIC_Intel-X553' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and 'IPSECINT' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "3n-dnv-x533-ip6-78b-base-scale-2t2c"
-      output-file-name: "ip6-2t2c-x533-3n-dnv"
+    - title: "3n-dnv-x553-ip4-ipsechw-int-64b-base-scale-2t2c"
+      output-file-name: "ipsechw-int-2t2c-x553-3n-dnv"
       data: "plot-performance-trending-vpp-3n-dnv"
-      filter: "'NIC_Intel-X533' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
+      filter: "'NIC_Intel-X553' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and 'IPSECINT' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "3n-dnv-x533-ip6-78b-base-scale-4t4c"
-      output-file-name: "ip6-4t4c-x533-3n-dnv"
+    - title: "3n-dnv-x553-ip4-ipsechw-int-64b-base-scale-4t4c"
+      output-file-name: "ipsechw-int-4t4c-x553-3n-dnv"
       data: "plot-performance-trending-vpp-3n-dnv"
-      filter: "'NIC_Intel-X533' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
+      filter: "'NIC_Intel-X553' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and 'IPSECINT' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# IPSec HW
+# IPSec HW IPSECTUN
 
-    - title: "3n-dnv-x533-ip4-ipsechw-64b-base-scale-1t1c"
-      output-file-name: "ipsechw-1t1c-x533-3n-dnv"
+    - title: "3n-dnv-x553-ip4-ipsechw-tnl-64b-base-scale-1t1c"
+      output-file-name: "ipsechw-tnl-1t1c-x553-3n-dnv"
       data: "plot-performance-trending-vpp-3n-dnv"
-      filter: "'NIC_Intel-X533' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and not 'VHOST'"
+      filter: "'NIC_Intel-X553' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and 'IPSECTUN' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "3n-dnv-x533-ip4-ipsechw-64b-base-scale-2t2c"
-      output-file-name: "ipsechw-2t2c-x533-3n-dnv"
+    - title: "3n-dnv-x553-ip4-ipsechw-tnl-64b-base-scale-2t2c"
+      output-file-name: "ipsechw-tnl-2t2c-x553-3n-dnv"
       data: "plot-performance-trending-vpp-3n-dnv"
-      filter: "'NIC_Intel-X533' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and not 'VHOST'"
+      filter: "'NIC_Intel-X553' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and 'IPSECTUN' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "3n-dnv-x533-ip4-ipsechw-64b-base-scale-4t4c"
-      output-file-name: "ipsechw-4t4c-x533-3n-dnv"
+    - title: "3n-dnv-x553-ip4-ipsechw-tnl-64b-base-scale-4t4c"
+      output-file-name: "ipsechw-tnl-4t4c-x553-3n-dnv"
       data: "plot-performance-trending-vpp-3n-dnv"
-      filter: "'NIC_Intel-X533' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and not 'VHOST'"
+      filter: "'NIC_Intel-X553' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and 'IPSECTUN' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -5071,80 +5174,80 @@
 ################################################################################
 # 2n-dnv
 
-# L2 - x533
+# L2 - x553
 
-    - title: "2n-dnv-x533-l2sw-64b-base-scale-1t1c"
-      output-file-name: "l2-1t1c-x533-2n-dnv"
+    - title: "2n-dnv-x553-l2sw-64b-base-scale-1t1c"
+      output-file-name: "l2-1t1c-x553-2n-dnv"
       data: "plot-performance-trending-vpp-2n-dnv"
-      filter: "'NIC_Intel-X533' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "2n-dnv-x533-l2sw-64b-base-scale-2t2c"
-      output-file-name: "l2-2t2c-x533-2n-dnv"
+    - title: "2n-dnv-x553-l2sw-64b-base-scale-2t2c"
+      output-file-name: "l2-2t2c-x553-2n-dnv"
       data: "plot-performance-trending-vpp-2n-dnv"
-      filter: "'NIC_Intel-X533' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "2n-dnv-x533-l2sw-64b-base-scale-4t4c"
-      output-file-name: "l2-4t4c-x533-2n-dnv"
+    - title: "2n-dnv-x553-l2sw-64b-base-scale-4t4c"
+      output-file-name: "l2-4t4c-x553-2n-dnv"
       data: "plot-performance-trending-vpp-2n-dnv"
-      filter: "'NIC_Intel-X533' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# IPv4 - x533
+# IPv4 - x553
 
-    - title: "2n-dnv-x533-ip4-64b-base-scale-1t1c"
-      output-file-name: "ip4-1t1c-x533-2n-dnv"
+    - title: "2n-dnv-x553-ip4-64b-base-scale-1t1c"
+      output-file-name: "ip4-1t1c-x553-2n-dnv"
       data: "plot-performance-trending-vpp-2n-dnv"
-      filter: "'NIC_Intel-X533' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "2n-dnv-x533-ip4-64b-base-scale-2t2c"
-      output-file-name: "ip4-2t2c-x533-2n-dnv"
+    - title: "2n-dnv-x553-ip4-64b-base-scale-2t2c"
+      output-file-name: "ip4-2t2c-x553-2n-dnv"
       data: "plot-performance-trending-vpp-2n-dnv"
-      filter: "'NIC_Intel-X533' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "2n-dnv-x533-ip4-64b-base-scale-4t4c"
-      output-file-name: "ip4-4t4c-x533-2n-dnv"
+    - title: "2n-dnv-x553-ip4-64b-base-scale-4t4c"
+      output-file-name: "ip4-4t4c-x553-2n-dnv"
       data: "plot-performance-trending-vpp-2n-dnv"
-      filter: "'NIC_Intel-X533' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
+      filter: "'NIC_Intel-X553' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# IPv6 - x533
+# IPv6 - x553
 
-    - title: "2n-dnv-x533-ip6-78b-base-scale-1t1c"
-      output-file-name: "ip6-1t1c-x533-2n-dnv"
+    - title: "2n-dnv-x553-ip6-78b-base-scale-1t1c"
+      output-file-name: "ip6-1t1c-x553-2n-dnv"
       data: "plot-performance-trending-vpp-2n-dnv"
-      filter: "'NIC_Intel-X533' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
+      filter: "'NIC_Intel-X553' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "2n-dnv-x533-ip6-78b-base-scale-2t2c"
-      output-file-name: "ip6-2t2c-x533-2n-dnv"
+    - title: "2n-dnv-x553-ip6-78b-base-scale-2t2c"
+      output-file-name: "ip6-2t2c-x553-2n-dnv"
       data: "plot-performance-trending-vpp-2n-dnv"
-      filter: "'NIC_Intel-X533' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
+      filter: "'NIC_Intel-X553' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "2n-dnv-x533-ip6-78b-base-scale-4t4c"
-      output-file-name: "ip6-4t4c-x533-2n-dnv"
+    - title: "2n-dnv-x553-ip6-78b-base-scale-4t4c"
+      output-file-name: "ip6-4t4c-x553-2n-dnv"
       data: "plot-performance-trending-vpp-2n-dnv"
-      filter: "'NIC_Intel-X533' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
+      filter: "'NIC_Intel-X553' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"