From 6b40a760505ae11c896deb68f92775cdf04ba965 Mon Sep 17 00:00:00 2001
From: Jan Gelety <jgelety@cisco.com>
Date: Thu, 26 Nov 2020 15:27:26 +0100
Subject: [PATCH] API: deprecated IPSEC APIs

Jira: CSIT-1597

+ add ipsec_sa tear down action

Change-Id: I4d1e6f26c14e61e8ddc6f29fbf5528a034c84eb0
Signed-off-by: Jan Gelety <jgelety@cisco.com>
---
 GPL/traffic_scripts/ipsec_interface.py             |  15 +-
 resources/api/vpp/supported_crcs.yaml              |  10 +-
 resources/libraries/python/IPUtil.py               |  25 ++
 resources/libraries/python/IPsecUtil.py            | 463 ++++++++++++++++-----
 resources/libraries/python/Policer.py              |  25 +-
 .../libraries/robot/shared/test_teardown.robot     |   9 +
 ...nlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot |   2 +-
 ...nlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot |   3 +-
 ...p4base-policy-aes-128-cbc-sha-512-256-dev.robot |   2 +-
 ...p4base-policy-aes-128-cbc-sha-512-256-dev.robot |   2 +-
 ...p6base-policy-aes-128-cbc-sha-512-256-dev.robot |   2 +-
 ...p6base-policy-aes-128-cbc-sha-512-256-dev.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot |   2 +-
 ...0tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot |   2 +-
 ...0tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...ec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |   2 +-
 ...ec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...sec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot |   2 +-
 ...sec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot |   2 +-
 ...p4base-policy-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...p4base-policy-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot |   2 +-
 ...1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot |   2 +-
 ...c-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...c-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...00tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot |   2 +-
 ...00tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot |   2 +-
 ...p4base-policy-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...p4base-policy-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...nlhwasync-ip4base-policy-aes128gcm-ndrpdr.robot |   2 +-
 ...nlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot |   2 +-
 ...0tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot |   2 +-
 ...0tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...sec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |   2 +-
 ...sec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |   2 +-
 ...p4base-policy-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...p4base-policy-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot |   2 +-
 ...1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot |   2 +-
 ...4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot |   2 +-
 ...p4base-policy-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...p4base-policy-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...sec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot |   2 +-
 ...sec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot |   2 +-
 ...c-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...c-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...c1tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot |   2 +-
 ...c1tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot |   2 +-
 ...p4base-policy-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...p4base-policy-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...nlhwasync-ip4base-policy-aes128gcm-ndrpdr.robot |   2 +-
 ...nlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot |   2 +-
 ...1tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot |   2 +-
 ...1tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |   2 +-
 ...4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |   2 +-
 ...p4base-policy-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...p4base-policy-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...sec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot |   2 +-
 ...sec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot |   2 +-
 ...0tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot |   2 +-
 ...0tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...ec20000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |   2 +-
 ...ec20000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot |   2 +-
 ...0tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot |   2 +-
 ...0tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...ec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |   2 +-
 ...ec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot |   2 +-
 ...0tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot |   2 +-
 ...0tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...psec400tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |   2 +-
 ...psec400tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot |   2 +-
 ...0tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot |   2 +-
 ...0tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |   2 +-
 ...ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |   2 +-
 ...c-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...c-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...c4tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot |   2 +-
 ...c4tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot |   2 +-
 ...4tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot |   2 +-
 ...4tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |   2 +-
 ...4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot |   2 +-
 ...0tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot |   2 +-
 ...0tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...sec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |   2 +-
 ...sec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot |   2 +-
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot |   2 +-
 ...0tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot |   2 +-
 ...0tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot |   2 +-
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot |   2 +-
 ...ec60000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot |   2 +-
 ...ec60000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot |   2 +-
 136 files changed, 536 insertions(+), 272 deletions(-)

diff --git a/GPL/traffic_scripts/ipsec_interface.py b/GPL/traffic_scripts/ipsec_interface.py
index 29b18a4fa2..1254388b13 100644
--- a/GPL/traffic_scripts/ipsec_interface.py
+++ b/GPL/traffic_scripts/ipsec_interface.py
@@ -76,7 +76,7 @@ def check_ipsec(
 
     if not pkt_recv.haslayer(ip_layer):
         raise RuntimeError(
-            f"Not an {ip_layer.name} packet received: {pkt_recv!r}"
+            f"Not an {ip_layer.__name__} packet received: {pkt_recv!r}"
         )
 
     if pkt_recv[ip_layer].src != src_tun:
@@ -96,6 +96,9 @@ def check_ipsec(
 
     ip_pkt = pkt_recv[ip_layer]
     d_pkt = sa_in.decrypt(ip_pkt)
+    print(u"Decrypted packet:")
+    d_pkt.show2()
+    print()
 
     if d_pkt[ip_layer].dst != dst_ip:
         raise RuntimeError(
@@ -147,19 +150,19 @@ def check_ip(pkt_recv, ip_layer, src_mac, dst_mac, src_ip, dst_ip):
 
     if not pkt_recv.haslayer(ip_layer):
         raise RuntimeError(
-            f"Not an {ip_layer.name} packet received: {pkt_recv!r}"
+            f"Not an {ip_layer.__name__} packet received: {pkt_recv!r}"
         )
 
     if pkt_recv[ip_layer].dst != dst_ip:
         raise RuntimeError(
             f"Received packet has invalid destination address: "
-            f"{pkt_recv[ip_layer.name].dst} should be: {dst_ip}"
+            f"{pkt_recv[ip_layer.__name__].dst} should be: {dst_ip}"
         )
 
     if pkt_recv[ip_layer].src != src_ip:
         raise RuntimeError(
             f"Received packet has invalid destination address: "
-            f"{pkt_recv[ip_layer.name].dst} should be: {src_ip}"
+            f"{pkt_recv[ip_layer.__name__].dst} should be: {src_ip}"
         )
 
     if ip_layer == IP and pkt_recv[ip_layer].proto != 61:
@@ -234,7 +237,7 @@ def main():
         rx_pkt_recv = rx_rxq.recv(2)
 
         if rx_pkt_recv is None:
-            raise RuntimeError(f"{ip_layer.name} packet Rx timeout")
+            raise RuntimeError(f"{ip_layer.__name__} packet Rx timeout")
 
         if rx_pkt_recv.haslayer(ICMPv6ND_NS):
             # read another packet in the queue if the current one is ICMPv6ND_NS
@@ -262,7 +265,7 @@ def main():
         tx_pkt_recv = tx_rxq.recv(2, ignore=sent_packets)
 
         if tx_pkt_recv is None:
-            raise RuntimeError(f"{ip_layer.name} packet Rx timeout")
+            raise RuntimeError(f"{ip_layer.__name__} packet Rx timeout")
 
         if tx_pkt_recv.haslayer(ICMPv6ND_NS):
             # read another packet in the queue if the current one is ICMPv6ND_NS
diff --git a/resources/api/vpp/supported_crcs.yaml b/resources/api/vpp/supported_crcs.yaml
index 7b5a718c29..70f04f93f7 100644
--- a/resources/api/vpp/supported_crcs.yaml
+++ b/resources/api/vpp/supported_crcs.yaml
@@ -113,10 +113,16 @@
     # ip_source_check_interface_add_del / reply # unused L1 keyword vpp_ip_source_check_setup
     ip_table_add_del: '0x0ffdaec0'  # dev
     ip_table_add_del_reply: '0xe8d4e804'  # dev
+    ipip_add_tunnel: '0xa9decfcd'  # dev
+    ipip_add_tunnel_reply: '0x5383d31f'  # dev
     ipsec_interface_add_del_spd: '0x80f80cbb'  # dev
     ipsec_interface_add_del_spd_reply: '0xe8d4e804'  # dev
+    ipsec_sa_v2_details: '0xe2130051'  # dev
+    ipsec_sa_v2_dump: '0x2076c2f4'  # dev
     ipsec_sad_entry_add_del: '0xb8def364'  # dev
     ipsec_sad_entry_add_del_reply: '0x9ffac24b'  # dev
+    ipsec_sad_entry_add_del_v2: '0xaca78b27'  # dev
+    ipsec_sad_entry_add_del_v2_reply: '0x9ffac24b'  # dev
     ipsec_select_backend: '0x5bcfd3b7'  # perf
     ipsec_select_backend_reply: '0xe8d4e804'  # perf
     # ^^ tc01-64B-1c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-mrr
@@ -125,8 +131,8 @@
     ipsec_spd_add_del_reply: '0xe8d4e804'  # dev
     ipsec_spd_entry_add_del: '0x9f384b8d'  # dev
     ipsec_spd_entry_add_del_reply: '0x9ffac24b'  # dev
-    ipsec_tunnel_if_add_del: '0x2b135e68'  # perf
-    ipsec_tunnel_if_add_del_reply: '0x5383d31f'  # perf
+    ipsec_tunnel_protect_update: '0x143f155d'  # dev
+    ipsec_tunnel_protect_update_reply: '0xe8d4e804'  # dev
     ipsec_set_async_mode: '0xa6465f7c'  #perf
     ipsec_set_async_mode_reply: '0xe8d4e804'  #perf
     # ^^ tc01-64B-1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-mrr
diff --git a/resources/libraries/python/IPUtil.py b/resources/libraries/python/IPUtil.py
index 552ba27d61..4d5753ea92 100644
--- a/resources/libraries/python/IPUtil.py
+++ b/resources/libraries/python/IPUtil.py
@@ -65,6 +65,31 @@ class FibPathNhProto(IntEnum):
     FIB_PATH_NH_PROTO_BIER = 4
 
 
+class IpDscp(IntEnum):
+    """DSCP code points."""
+    IP_API_DSCP_CS0 = 0,
+    IP_API_DSCP_CS1 = 8,
+    IP_API_DSCP_AF11 = 10,
+    IP_API_DSCP_AF12 = 12,
+    IP_API_DSCP_AF13 = 14,
+    IP_API_DSCP_CS2 = 16,
+    IP_API_DSCP_AF21 = 18,
+    IP_API_DSCP_AF22 = 20,
+    IP_API_DSCP_AF23 = 22,
+    IP_API_DSCP_CS3 = 24,
+    IP_API_DSCP_AF31 = 26,
+    IP_API_DSCP_AF32 = 28,
+    IP_API_DSCP_AF33 = 30,
+    IP_API_DSCP_CS4 = 32,
+    IP_API_DSCP_AF41 = 34,
+    IP_API_DSCP_AF42 = 36,
+    IP_API_DSCP_AF43 = 38,
+    IP_API_DSCP_CS5 = 40,
+    IP_API_DSCP_EF = 46,
+    IP_API_DSCP_CS6 = 48,
+    IP_API_DSCP_CS7 = 50
+
+
 class IPUtil:
     """Common IP utilities"""
 
diff --git a/resources/libraries/python/IPsecUtil.py b/resources/libraries/python/IPsecUtil.py
index 36e984923b..3c3997ab53 100644
--- a/resources/libraries/python/IPsecUtil.py
+++ b/resources/libraries/python/IPsecUtil.py
@@ -22,16 +22,20 @@ from string import ascii_letters
 
 from ipaddress import ip_network, ip_address
 
+from resources.libraries.python.Constants import Constants
 from resources.libraries.python.InterfaceUtil import InterfaceUtil, \
     InterfaceStatusFlags
 from resources.libraries.python.IPAddress import IPAddress
-from resources.libraries.python.IPUtil import IPUtil
+from resources.libraries.python.IPUtil import IPUtil, IpDscp, MPLS_LABEL_INVALID
 from resources.libraries.python.PapiExecutor import PapiSocketExecutor
 from resources.libraries.python.ssh import scp_node
 from resources.libraries.python.topology import Topology
 from resources.libraries.python.VatExecutor import VatExecutor
 
 
+IPSEC_UDP_PORT_NONE = 0xffff
+
+
 def gen_key(length):
     """Generate random string as a key.
 
@@ -90,9 +94,43 @@ class IPsecProto(IntEnum):
 
 class IPsecSadFlags(IntEnum):
     """IPsec Security Association Database flags."""
-    IPSEC_API_SAD_FLAG_NONE = 0
-    IPSEC_API_SAD_FLAG_IS_TUNNEL = 4
-    IPSEC_API_SAD_FLAG_IS_TUNNEL_V6 = 8
+    IPSEC_API_SAD_FLAG_NONE = 0,
+    # Enable extended sequence numbers
+    IPSEC_API_SAD_FLAG_USE_ESN = 0x01,
+    # Enable Anti - replay
+    IPSEC_API_SAD_FLAG_USE_ANTI_REPLAY = 0x02,
+    # IPsec tunnel mode if non-zero, else transport mode
+    IPSEC_API_SAD_FLAG_IS_TUNNEL = 0x04,
+    # IPsec tunnel mode is IPv6 if non-zero, else IPv4 tunnel
+    # only valid if is_tunnel is non-zero
+    IPSEC_API_SAD_FLAG_IS_TUNNEL_V6 = 0x08,
+    # Enable UDP encapsulation for NAT traversal
+    IPSEC_API_SAD_FLAG_UDP_ENCAP = 0x10,
+    # IPsec SA is or inbound traffic
+    IPSEC_API_SAD_FLAG_IS_INBOUND = 0x40
+
+
+class TunnelEncpaDecapFlags(IntEnum):
+    """Flags controlling tunnel behaviour."""
+    TUNNEL_API_ENCAP_DECAP_FLAG_NONE = 0
+    # at encap, copy the DF bit of the payload into the tunnel header
+    TUNNEL_API_ENCAP_DECAP_FLAG_ENCAP_COPY_DF = 1
+    # at encap, set the DF bit in the tunnel header
+    TUNNEL_API_ENCAP_DECAP_FLAG_ENCAP_SET_DF = 2
+    # at encap, copy the DSCP bits of the payload into the tunnel header
+    TUNNEL_API_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP = 4
+    # at encap, copy the ECN bit of the payload into the tunnel header
+    TUNNEL_API_ENCAP_DECAP_FLAG_ENCAP_COPY_ECN = 8
+    # at decap, copy the ECN bit of the tunnel header into the payload
+    TUNNEL_API_ENCAP_DECAP_FLAG_ENCAP_SET_ECN = 16
+
+
+class TunnelMode(IntEnum):
+    """Tunnel modes."""
+    # point-to-point
+    TUNNEL_API_MODE_P2P = 0
+    # multi-point
+    TUNNEL_API_MODE_MP = 1
 
 
 class IPsecUtil:
@@ -836,24 +874,33 @@ class IPsecUtil:
                     ikeys.append(
                         gen_key(IPsecUtil.get_integ_alg_key_len(integ_alg))
                     )
-                    integ = f"integ_alg {integ_alg.alg_name} " \
-                        f"local_integ_key {ikeys[i].hex()} " \
-                        f"remote_integ_key {ikeys[i].hex()} "
+                    integ = f"integ-alg {integ_alg.alg_name} " \
+                        f"integ-key {ikeys[i].hex()} "
                 else:
                     integ = u""
                 tmp_f1.write(
                     f"exec set interface ip address loop0 "
                     f"{tun_ips[u'ip1'] + i * addr_incr}/32\n"
-                    f"ipsec_tunnel_if_add_del "
-                    f"local_spi {spi_d[u'spi_1'] + i} "
-                    f"remote_spi {spi_d[u'spi_2'] + i} "
-                    f"crypto_alg {crypto_alg.alg_name} "
-                    f"local_crypto_key {ckeys[i].hex()} "
-                    f"remote_crypto_key {ckeys[i].hex()} "
-                    f"{integ} "
-                    f"local_ip {tun_ips[u'ip1'] + i * addr_incr} "
-                    f"remote_ip {tun_ips[u'ip2']} "
-                    f"instance {i}\n"
+                    f"exec create ipip tunnel "
+                    f"src {tun_ips[u'ip1'] + i * addr_incr} "
+                    f"dst {tun_ips[u'ip2']} "
+                    f"p2p\n"
+                    f"exec ipsec sa add {i} "
+                    f"spi {spi_d[u'spi_1'] + i} "
+                    f"crypto-alg {crypto_alg.alg_name} "
+                    f"crypto-key {ckeys[i].hex()} "
+                    f"{integ}"
+                    f"esp\n"
+                    f"exec ipsec sa add {100000 + i} "
+                    f"spi {spi_d[u'spi_2'] + i} "
+                    f"crypto-alg {crypto_alg.alg_name} "
+                    f"crypto-key {ckeys[i].hex()} "
+                    f"{integ}"
+                    f"esp\n"
+                    f"exec ipsec tunnel protect ipip{i} "
+                    f"sa-out {i} "
+                    f"sa-in {100000 + i} "
+                    f"add\n"
                 )
         vat.execute_script(
             tmp_fn1, nodes[u"DUT1"], timeout=1800, json_out=False,
@@ -925,22 +972,31 @@ class IPsecUtil:
                 )
             for i in range(existing_tunnels, n_tunnels):
                 if integ_alg:
-                    integ = f"integ_alg {integ_alg.alg_name} " \
-                        f"local_integ_key {ikeys[i].hex()} " \
-                        f"remote_integ_key {ikeys[i].hex()} "
+                    integ = f"integ-alg {integ_alg.alg_name} " \
+                        f"integ-key {ikeys[i].hex()} "
                 else:
                     integ = u""
                 tmp_f2.write(
-                    f"ipsec_tunnel_if_add_del "
-                    f"local_spi {spi_d[u'spi_2'] + i} "
-                    f"remote_spi {spi_d[u'spi_1'] + i} "
-                    f"crypto_alg {crypto_alg.alg_name} "
-                    f"local_crypto_key {ckeys[i].hex()} "
-                    f"remote_crypto_key {ckeys[i].hex()} "
-                    f"{integ} "
-                    f"local_ip {tun_ips[u'ip2']} "
-                    f"remote_ip {tun_ips[u'ip1'] + i * addr_incr} "
-                    f"instance {i}\n"
+                    f"exec create ipip tunnel "
+                    f"src {tun_ips[u'ip2']} "
+                    f"dst {tun_ips[u'ip1'] + i * addr_incr} "
+                    f"p2p\n"
+                    f"exec ipsec sa add {100000 + i} "
+                    f"spi {spi_d[u'spi_2'] + i} "
+                    f"crypto-alg {crypto_alg.alg_name} "
+                    f"crypto-key {ckeys[i].hex()} "
+                    f"{integ}"
+                    f"esp\n"
+                    f"exec ipsec sa add {i} "
+                    f"spi {spi_d[u'spi_1'] + i} "
+                    f"crypto-alg {crypto_alg.alg_name} "
+                    f"crypto-key {ckeys[i].hex()} "
+                    f"{integ}"
+                    f"esp\n"
+                    f"exec ipsec tunnel protect ipip{i} "
+                    f"sa-out {100000 + i} "
+                    f"sa-in {i} "
+                    f"add\n"
                 )
         vat.execute_script(
             tmp_fn2, nodes[u"DUT2"], timeout=1800, json_out=False,
@@ -1103,29 +1159,78 @@ class IPsecUtil:
                 papi_exec.add(
                     cmd, history=bool(not 1 < i < n_tunnels - 2), **args
                 )
-            # Configure IPsec tunnel interfaces
-            cmd = u"ipsec_tunnel_if_add_del"
+            # Configure IPIP tunnel interfaces
+            cmd = u"ipip_add_tunnel"
+            ipip_tunnel = dict(
+                instance=Constants.BITWISE_NON_ZERO,
+                src=None,
+                dst=None,
+                table_id=0,
+                flags=int(
+                    TunnelEncpaDecapFlags.TUNNEL_API_ENCAP_DECAP_FLAG_NONE
+                ),
+                mode=int(TunnelMode.TUNNEL_API_MODE_P2P),
+                dscp=int(IpDscp.IP_API_DSCP_CS0)
+            )
             args = dict(
-                is_add=True,
-                local_ip=None,
-                remote_ip=None,
-                local_spi=0,
-                remote_spi=0,
-                crypto_alg=crypto_alg.alg_int_repr,
-                local_crypto_key_len=0,
-                local_crypto_key=None,
-                remote_crypto_key_len=0,
-                remote_crypto_key=None,
-                integ_alg=integ_alg.alg_int_repr if integ_alg else 0,
-                local_integ_key_len=0,
-                local_integ_key=None,
-                remote_integ_key_len=0,
-                remote_integ_key=None,
-                tx_table_id=0
+                tunnel=ipip_tunnel
+            )
+            ipip_tunnels = [None] * existing_tunnels
+            for i in range(existing_tunnels, n_tunnels):
+                args[u"tunnel"][u"src"] = IPAddress.create_ip_address_object(
+                    tun_ips[u"ip1"] + i * addr_incr
+                )
+                args[u"tunnel"][u"dst"] = IPAddress.create_ip_address_object(
+                    tun_ips[u"ip2"]
+                )
+                papi_exec.add(
+                    cmd, history=bool(not 1 < i < n_tunnels - 2), **args
+                )
+            err_msg = f"Failed to add IPIP tunnel interfaces on host" \
+                f" {nodes[u'DUT1'][u'host']}"
+            ipip_tunnels.extend(
+                [
+                    reply[u"sw_if_index"]
+                    for reply in papi_exec.get_replies(err_msg)
+                    if u"sw_if_index" in reply
+                ]
             )
-            ipsec_tunnels = [None] * existing_tunnels
+            # Configure IPSec SAD entries
             ckeys = [bytes()] * existing_tunnels
             ikeys = [bytes()] * existing_tunnels
+            cmd = u"ipsec_sad_entry_add_del_v2"
+            c_key = dict(
+                length=0,
+                data=None
+            )
+            i_key = dict(
+                length=0,
+                data=None
+            )
+            sad_entry = dict(
+                sad_id=None,
+                spi=None,
+                protocol=int(IPsecProto.IPSEC_API_PROTO_ESP),
+                crypto_algorithm=crypto_alg.alg_int_repr,
+                crypto_key=c_key,
+                integrity_algorithm=integ_alg.alg_int_repr if integ_alg else 0,
+                integrity_key=i_key,
+                flags=None,
+                tunnel_src=0,
+                tunnel_dst=0,
+                tunnel_flags=int(
+                    TunnelEncpaDecapFlags.TUNNEL_API_ENCAP_DECAP_FLAG_NONE
+                ),
+                dscp=int(IpDscp.IP_API_DSCP_CS0),
+                table_id=0,
+                salt=0,
+                udp_src_port=IPSEC_UDP_PORT_NONE,
+                udp_dst_port=IPSEC_UDP_PORT_NONE
+            )
+            args = dict(
+                is_add=True,
+                entry=sad_entry
+            )
             for i in range(existing_tunnels, n_tunnels):
                 ckeys.append(
                     gen_key(IPsecUtil.get_crypto_alg_key_len(crypto_alg))
@@ -1134,35 +1239,68 @@ class IPsecUtil:
                     ikeys.append(
                         gen_key(IPsecUtil.get_integ_alg_key_len(integ_alg))
                     )
-                args[u"local_spi"] = spi_d[u"spi_1"] + i
-                args[u"remote_spi"] = spi_d[u"spi_2"] + i
-                args[u"local_ip"] = IPAddress.create_ip_address_object(
-                    tun_ips[u"ip1"] + i * addr_incr
+                # SAD entry for outband / tx path
+                args[u"entry"][u"sad_id"] = i
+                args[u"entry"][u"spi"] = spi_d[u"spi_1"] + i
+
+                args[u"entry"][u"crypto_key"][u"length"] = len(ckeys[i])
+                args[u"entry"][u"crypto_key"][u"data"] = ckeys[i]
+                if integ_alg:
+                    args[u"entry"][u"integrity_key"][u"length"] = len(ikeys[i])
+                    args[u"entry"][u"integrity_key"][u"data"] = ikeys[i]
+                args[u"entry"][u"flags"] = int(
+                    IPsecSadFlags.IPSEC_API_SAD_FLAG_NONE
                 )
-                args[u"remote_ip"] = IPAddress.create_ip_address_object(
-                    tun_ips[u"ip2"]
+                papi_exec.add(
+                    cmd, history=bool(not 1 < i < n_tunnels - 2), **args
                 )
-                args[u"local_crypto_key_len"] = len(ckeys[i])
-                args[u"local_crypto_key"] = ckeys[i]
-                args[u"remote_crypto_key_len"] = len(ckeys[i])
-                args[u"remote_crypto_key"] = ckeys[i]
+                # SAD entry for inband / rx path
+                args[u"entry"][u"sad_id"] = 100000 + i
+                args[u"entry"][u"spi"] = spi_d[u"spi_2"] + i
+
+                args[u"entry"][u"crypto_key"][u"length"] = len(ckeys[i])
+                args[u"entry"][u"crypto_key"][u"data"] = ckeys[i]
                 if integ_alg:
-                    args[u"local_integ_key_len"] = len(ikeys[i])
-                    args[u"local_integ_key"] = ikeys[i]
-                    args[u"remote_integ_key_len"] = len(ikeys[i])
-                    args[u"remote_integ_key"] = ikeys[i]
+                    args[u"entry"][u"integrity_key"][u"length"] = len(ikeys[i])
+                    args[u"entry"][u"integrity_key"][u"data"] = ikeys[i]
+                args[u"entry"][u"flags"] = int(
+                    IPsecSadFlags.IPSEC_API_SAD_FLAG_NONE |
+                    IPsecSadFlags.IPSEC_API_SAD_FLAG_IS_INBOUND
+                )
                 papi_exec.add(
                     cmd, history=bool(not 1 < i < n_tunnels - 2), **args
                 )
-            err_msg = f"Failed to add IPsec tunnel interfaces on host" \
+            err_msg = f"Failed to add IPsec SAD entries on host" \
                 f" {nodes[u'DUT1'][u'host']}"
-            ipsec_tunnels.extend(
-                [
-                    reply[u"sw_if_index"]
-                    for reply in papi_exec.get_replies(err_msg)
-                    if u"sw_if_index" in reply
-                ]
+            papi_exec.get_replies(err_msg)
+            # Add protection for tunnels with IPSEC
+            cmd = u"ipsec_tunnel_protect_update"
+            n_hop = dict(
+                address=0,
+                via_label=MPLS_LABEL_INVALID,
+                obj_id=Constants.BITWISE_NON_ZERO
+            )
+            ipsec_tunnel_protect = dict(
+                sw_if_index=None,
+                nh=n_hop,
+                sa_out=None,
+                n_sa_in=1,
+                sa_in=None
+            )
+            args = dict(
+                tunnel=ipsec_tunnel_protect
             )
+            for i in range(existing_tunnels, n_tunnels):
+                args[u"tunnel"][u"sw_if_index"] = ipip_tunnels[i]
+                args[u"tunnel"][u"sa_out"] = i
+                args[u"tunnel"][u"sa_in"] = [100000 + i]
+                papi_exec.add(
+                    cmd, history=bool(not 1 < i < n_tunnels - 2), **args
+                )
+            err_msg = f"Failed to add protection for tunnels with IPSEC " \
+                f"on host {nodes[u'DUT1'][u'host']}"
+            papi_exec.get_replies(err_msg)
+
             # Configure unnumbered interfaces
             cmd = u"sw_interface_set_unnumbered"
             args = dict(
@@ -1173,7 +1311,7 @@ class IPsecUtil:
                 unnumbered_sw_if_index=0
             )
             for i in range(existing_tunnels, n_tunnels):
-                args[u"unnumbered_sw_if_index"] = ipsec_tunnels[i]
+                args[u"unnumbered_sw_if_index"] = ipip_tunnels[i]
                 papi_exec.add(
                     cmd, history=bool(not 1 < i < n_tunnels - 2), **args
                 )
@@ -1184,7 +1322,7 @@ class IPsecUtil:
                 flags=InterfaceStatusFlags.IF_STATUS_API_FLAG_ADMIN_UP.value
             )
             for i in range(existing_tunnels, n_tunnels):
-                args[u"sw_if_index"] = ipsec_tunnels[i]
+                args[u"sw_if_index"] = ipip_tunnels[i]
                 papi_exec.add(
                     cmd, history=bool(not 1 < i < n_tunnels - 2), **args
                 )
@@ -1199,7 +1337,7 @@ class IPsecUtil:
                 args[u"route"] = IPUtil.compose_vpp_route_structure(
                     nodes[u"DUT1"], (raddr_ip2 + i).compressed,
                     prefix_len=128 if raddr_ip2.version == 6 else 32,
-                    interface=ipsec_tunnels[i]
+                    interface=ipip_tunnels[i]
                 )
                 papi_exec.add(
                     cmd, history=bool(not 1 < i < n_tunnels - 2), **args
@@ -1261,57 +1399,148 @@ class IPsecUtil:
                 err_msg = f"Failed to set IP address on interface {if2_key} " \
                     f"on host {nodes[u'DUT2'][u'host']}"
                 papi_exec.add(cmd, **args).get_reply(err_msg)
-            # Configure IPsec tunnel interfaces
-            cmd = u"ipsec_tunnel_if_add_del"
+            # Configure IPIP tunnel interfaces
+            cmd = u"ipip_add_tunnel"
+            ipip_tunnel = dict(
+                instance=Constants.BITWISE_NON_ZERO,
+                src=None,
+                dst=None,
+                table_id=0,
+                flags=int(
+                    TunnelEncpaDecapFlags.TUNNEL_API_ENCAP_DECAP_FLAG_NONE
+                ),
+                mode=int(TunnelMode.TUNNEL_API_MODE_P2P),
+                dscp=int(IpDscp.IP_API_DSCP_CS0)
+            )
             args = dict(
-                is_add=True,
-                local_ip=IPAddress.create_ip_address_object(tun_ips[u"ip2"]),
-                remote_ip=None,
-                local_spi=0,
-                remote_spi=0,
-                crypto_alg=crypto_alg.alg_int_repr,
-                local_crypto_key_len=0,
-                local_crypto_key=None,
-                remote_crypto_key_len=0,
-                remote_crypto_key=None,
-                integ_alg=integ_alg.alg_int_repr if integ_alg else 0,
-                local_integ_key_len=0,
-                local_integ_key=None,
-                remote_integ_key_len=0,
-                remote_integ_key=None,
-                tx_table_id=0
+                tunnel=ipip_tunnel
             )
-            ipsec_tunnels = [None] * existing_tunnels
+            ipip_tunnels = [None] * existing_tunnels
             for i in range(existing_tunnels, n_tunnels):
-                args[u"local_spi"] = spi_d[u"spi_2"] + i
-                args[u"remote_spi"] = spi_d[u"spi_1"] + i
-                args[u"local_ip"] = IPAddress.create_ip_address_object(
+                args[u"tunnel"][u"src"] = IPAddress.create_ip_address_object(
                     tun_ips[u"ip2"]
                 )
-                args[u"remote_ip"] = IPAddress.create_ip_address_object(
+                args[u"tunnel"][u"dst"] = IPAddress.create_ip_address_object(
                     tun_ips[u"ip1"] + i * addr_incr
                 )
-                args[u"local_crypto_key_len"] = len(ckeys[i])
-                args[u"local_crypto_key"] = ckeys[i]
-                args[u"remote_crypto_key_len"] = len(ckeys[i])
-                args[u"remote_crypto_key"] = ckeys[i]
-                if integ_alg:
-                    args[u"local_integ_key_len"] = len(ikeys[i])
-                    args[u"local_integ_key"] = ikeys[i]
-                    args[u"remote_integ_key_len"] = len(ikeys[i])
-                    args[u"remote_integ_key"] = ikeys[i]
                 papi_exec.add(
                     cmd, history=bool(not 1 < i < n_tunnels - 2), **args
                 )
-            err_msg = f"Failed to add IPsec tunnel interfaces " \
-                f"on host {nodes[u'DUT2'][u'host']}"
-            ipsec_tunnels.extend(
+            err_msg = f"Failed to add IPIP tunnel interfaces on host" \
+                f" {nodes[u'DUT2'][u'host']}"
+            ipip_tunnels.extend(
                 [
                     reply[u"sw_if_index"]
                     for reply in papi_exec.get_replies(err_msg)
                     if u"sw_if_index" in reply
                 ]
             )
+            # Configure IPSec SAD entries
+            cmd = u"ipsec_sad_entry_add_del_v2"
+            c_key = dict(
+                length=0,
+                data=None
+            )
+            i_key = dict(
+                length=0,
+                data=None
+            )
+            sad_entry = dict(
+                sad_id=None,
+                spi=None,
+                protocol=int(IPsecProto.IPSEC_API_PROTO_ESP),
+
+                crypto_algorithm=crypto_alg.alg_int_repr,
+                crypto_key=c_key,
+                integrity_algorithm=integ_alg.alg_int_repr if integ_alg else 0,
+                integrity_key=i_key,
+
+                flags=None,
+                tunnel_src=0,
+                tunnel_dst=0,
+                tunnel_flags=int(
+                    TunnelEncpaDecapFlags.TUNNEL_API_ENCAP_DECAP_FLAG_NONE
+                ),
+                dscp=int(IpDscp.IP_API_DSCP_CS0),
+                table_id=0,
+                salt=0,
+                udp_src_port=IPSEC_UDP_PORT_NONE,
+                udp_dst_port=IPSEC_UDP_PORT_NONE
+            )
+            args = dict(
+                is_add=True,
+                entry=sad_entry
+            )
+            for i in range(existing_tunnels, n_tunnels):
+                ckeys.append(
+                    gen_key(IPsecUtil.get_crypto_alg_key_len(crypto_alg))
+                )
+                if integ_alg:
+                    ikeys.append(
+                        gen_key(IPsecUtil.get_integ_alg_key_len(integ_alg))
+                    )
+                # SAD entry for outband / tx path
+                args[u"entry"][u"sad_id"] = 100000 + i
+                args[u"entry"][u"spi"] = spi_d[u"spi_2"] + i
+
+                args[u"entry"][u"crypto_key"][u"length"] = len(ckeys[i])
+                args[u"entry"][u"crypto_key"][u"data"] = ckeys[i]
+                if integ_alg:
+                    args[u"entry"][u"integrity_key"][u"length"] = len(ikeys[i])
+                    args[u"entry"][u"integrity_key"][u"data"] = ikeys[i]
+                args[u"entry"][u"flags"] = int(
+                    IPsecSadFlags.IPSEC_API_SAD_FLAG_NONE
+                )
+                papi_exec.add(
+                    cmd, history=bool(not 1 < i < n_tunnels - 2), **args
+                )
+                # SAD entry for inband / rx path
+                args[u"entry"][u"sad_id"] = i
+                args[u"entry"][u"spi"] = spi_d[u"spi_1"] + i
+
+                args[u"entry"][u"crypto_key"][u"length"] = len(ckeys[i])
+                args[u"entry"][u"crypto_key"][u"data"] = ckeys[i]
+                if integ_alg:
+                    args[u"entry"][u"integrity_key"][u"length"] = len(ikeys[i])
+                    args[u"entry"][u"integrity_key"][u"data"] = ikeys[i]
+                args[u"entry"][u"flags"] = int(
+                    IPsecSadFlags.IPSEC_API_SAD_FLAG_NONE |
+                    IPsecSadFlags.IPSEC_API_SAD_FLAG_IS_INBOUND
+                )
+                papi_exec.add(
+                    cmd, history=bool(not 1 < i < n_tunnels - 2), **args
+                )
+            err_msg = f"Failed to add IPsec SAD entries on host" \
+                f" {nodes[u'DUT2'][u'host']}"
+            papi_exec.get_replies(err_msg)
+            # Add protection for tunnels with IPSEC
+            cmd = u"ipsec_tunnel_protect_update"
+            n_hop = dict(
+                address=0,
+                via_label=MPLS_LABEL_INVALID,
+                obj_id=Constants.BITWISE_NON_ZERO
+            )
+            ipsec_tunnel_protect = dict(
+                sw_if_index=None,
+                nh=n_hop,
+                sa_out=None,
+                n_sa_in=1,
+                sa_in=None
+            )
+            args = dict(
+                tunnel=ipsec_tunnel_protect
+            )
+            for i in range(existing_tunnels, n_tunnels):
+                args[u"tunnel"][u"sw_if_index"] = ipip_tunnels[i]
+                args[u"tunnel"][u"sa_out"] = 100000 + i
+                args[u"tunnel"][u"sa_in"] = [i]
+                papi_exec.add(
+                    cmd, history=bool(not 1 < i < n_tunnels - 2), **args
+                )
+            err_msg = f"Failed to add protection for tunnels with IPSEC " \
+                f"on host {nodes[u'DUT2'][u'host']}"
+            papi_exec.get_replies(err_msg)
+
             if not existing_tunnels:
                 # Configure IP route
                 cmd = u"ip_route_add_del"
@@ -1337,7 +1566,7 @@ class IPsecUtil:
                 unnumbered_sw_if_index=0
             )
             for i in range(existing_tunnels, n_tunnels):
-                args[u"unnumbered_sw_if_index"] = ipsec_tunnels[i]
+                args[u"unnumbered_sw_if_index"] = ipip_tunnels[i]
                 papi_exec.add(
                     cmd, history=bool(not 1 < i < n_tunnels - 2), **args
                 )
@@ -1348,7 +1577,7 @@ class IPsecUtil:
                 flags=InterfaceStatusFlags.IF_STATUS_API_FLAG_ADMIN_UP.value
             )
             for i in range(existing_tunnels, n_tunnels):
-                args[u"sw_if_index"] = ipsec_tunnels[i]
+                args[u"sw_if_index"] = ipip_tunnels[i]
                 papi_exec.add(
                     cmd, history=bool(not 1 < i < n_tunnels - 2), **args
                 )
@@ -1363,7 +1592,7 @@ class IPsecUtil:
                 args[u"route"] = IPUtil.compose_vpp_route_structure(
                     nodes[u"DUT1"], (raddr_ip1 + i).compressed,
                     prefix_len=128 if raddr_ip1.version == 6 else 32,
-                    interface=ipsec_tunnels[i]
+                    interface=ipip_tunnels[i]
                 )
                 papi_exec.add(
                     cmd, history=bool(not 1 < i < n_tunnels - 2), **args
@@ -1722,3 +1951,15 @@ class IPsecUtil:
         :type node: dict
         """
         PapiSocketExecutor.run_cli_cmd(node, u"show ipsec")
+
+    @staticmethod
+    def show_ipsec_security_association(node):
+        """Show IPSec security association.
+
+        :param node: DUT node.
+        :type node: dict
+        """
+        cmds = [
+            u"ipsec_sa_v2_dump"
+        ]
+        PapiSocketExecutor.dump_and_log(node, cmds)
diff --git a/resources/libraries/python/Policer.py b/resources/libraries/python/Policer.py
index af2321bae9..37b1c7f745 100644
--- a/resources/libraries/python/Policer.py
+++ b/resources/libraries/python/Policer.py
@@ -16,6 +16,7 @@
 from enum import IntEnum
 
 from resources.libraries.python.Constants import Constants
+from resources.libraries.python.IPUtil import IpDscp
 from resources.libraries.python.PapiExecutor import PapiSocketExecutor
 from resources.libraries.python.topology import Topology
 
@@ -59,28 +60,6 @@ class PolicerPreColor(IntEnum):
     VIOLATE_COLOR = 2
 
 
-class DSCP(IntEnum):
-    """DSCP for mark-and-transmit action."""
-    D_CS0 = 0
-    D_CS1 = 8
-    D_CS2 = 16
-    D_CS3 = 24
-    D_CS4 = 32
-    D_vCS5 = 40
-    D_CS6 = 48
-    D_CS7 = 56
-    D_AF11 = 10
-    D_AF12 = 12
-    D_AF13 = 14
-    D_AF21 = 18
-    D_AF22 = 20
-    D_AF23 = 22
-    D_AF31 = 26
-    D_AF32 = 28
-    D_AF33 = 30
-    D_EF = 46
-
-
 class Policer:
     """Policer utilities."""
 
@@ -240,4 +219,4 @@ class Policer:
         :returns: DSCP numeric value.
         :rtype: int
         """
-        return getattr(DSCP, f"D_{dscp.upper()}").value
+        return getattr(IpDscp, f"IP_API_DSCP_{dscp.upper()}").value
diff --git a/resources/libraries/robot/shared/test_teardown.robot b/resources/libraries/robot/shared/test_teardown.robot
index d6df417db1..a2f35ed76c 100644
--- a/resources/libraries/robot/shared/test_teardown.robot
+++ b/resources/libraries/robot/shared/test_teardown.robot
@@ -104,6 +104,15 @@
 | | | ... | Show Geneve Tunnel Data | ${nodes['${dut}']}
 | | END
 
+| Additional Test Tear Down Action For ipsec_sa
+| | [Documentation]
+| | ... | Additional teardown for tests which uses IPSec security association.
+| |
+| | FOR | ${dut} | IN | @{duts}
+| | | Run Keyword If Test Failed
+| | | ... | Show Ipsec Security Association | ${nodes['${dut}']}
+| | END
+
 | Additional Test Tear Down Action For linux_bridge
 | | [Documentation]
 | | ... | Additional teardown for tests which uses linux_bridge.
diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot
index 2c5600590c..4338fa35b5 100644
--- a/tests/vpp/device/crypto/eth2p-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot
@@ -22,7 +22,7 @@
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace
+| Test Teardown | Tear down test | packet_trace | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot
index 835d86451f..f8ab71565b 100644
--- a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot
@@ -22,7 +22,7 @@
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace
+| Test Teardown | Tear down test | packet_trace | ipsec_sa
 |
 | Test Template | Local Template
 |
@@ -94,6 +94,7 @@
 | | ... | ${DUT1_${int}2_mac}[0] | ${encr_alg} | ${encr_key} | ${auth_alg}
 | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${tun_if1_ip4} | ${tun_if2_ip4}
+| | And Show Ipsec Security Association | ${dut1}
 
 *** Test Cases ***
 | 154B-ethip4ipsec1tnlsw-ip4base-int-aes-128-cbc-sha-512-256-dev
diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
index 2c24b9afa2..ccce5f0511 100644
--- a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
@@ -22,7 +22,7 @@
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace
+| Test Teardown | Tear down test | packet_trace | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
index 24025fed34..a5961ebb63 100644
--- a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
@@ -22,7 +22,7 @@
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace
+| Test Teardown | Tear down test | packet_trace | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
index 5acc830d01..08d867fe55 100644
--- a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
@@ -22,7 +22,7 @@
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace
+| Test Teardown | Tear down test | packet_trace | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
index e11d1b9bd7..9dba04e816 100644
--- a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
@@ -22,7 +22,7 @@
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace
+| Test Teardown | Tear down test | packet_trace | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 1885a307b9..71f05cc075 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index f476cbe827..35c3e5a7e8 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index 2f9c8592ec..6bd4e5f9ad 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 40d4fa4552..079378099b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 53475f356d..b710512883 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index eb3c4d5ac4..e20952c052 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index f37c87e70e..ce8d606852 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 17809cc090..0b8239bdc8 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index b8ed50429f..8b4de20ad2 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 708cdcfb77..42423b2e5f 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
index 2aaed8b346..093ddc31fb 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
index 6c3d0a2fcd..f8c25c1bc3 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index 3f61058012..2c5ac80d10 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index afc5d47272..a883c25219 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
index 8a5cd0bb8d..6ec0e83392 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
index 359b2b9873..70cdafda5a 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index ba4bde6198..dc1ea3a3db 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index dab47ff445..efcabbdf63 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot
index 34f756ed34..5f09b970c5 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot
index e74bc0c690..086b9ba511 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index a4a55bad85..258b6e28e0 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index 9e5e790df7..a20c0d1375 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes128gcm-ndrpdr.robot
index 4e12145790..35e3addd09 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot
index 5c655e2289..774a645fb3 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 54afa7c556..00e0bd7155 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index c680f87ae9..d2616a9f9c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index b9051a2dd6..729c4ae8ca 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 2b84c97792..bc2dada640 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 683601b729..c2eb1946cc 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 22b858d47b..c0240724a3 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 0e492b5a5e..19a9f19f07 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 6ec90820b7..8c60fcc2cb 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index c35e3d644e..ba11e06e34 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index d3aa7dc9da..64fa889d18 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
index a2404a3518..172a911b3c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
index 2e7e135e4d..82a861f6bd 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 1ddb366d95..3ead61307b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 997d5e0133..96241180c1 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
index 9dcd1de824..dfacf924d6 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
index 577b3d027a..a4eeed0da4 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index c8c1533dd5..681e1e448f 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index 9080b3eae4..a9f822e70f 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
index 8153ec391a..01879c8140 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
index b4d5cfe961..02e37038c1 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 169dd71f45..1e0fd92b05 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index a1b65d672a..0923936c69 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot
index ad6a3c18d9..17c1015abb 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot
index d8c9591e2a..3112cca147 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index 9c965f4cb2..b90d0fb20b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index 0aacb99356..bec8975e67 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes128gcm-ndrpdr.robot
index e3009129c5..dbb00b6db8 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot
index 8b3944d770..95070aab6d 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 5cfc119163..e802692e61 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index 737704da93..d5e3a0f22f 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index cff3234d24..1a24c6a3f1 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 43b0d667da..d0c235ee99 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 99c58b66dd..2b95b50535 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 8a4b7eafcb..f91e2b430c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index e0b6cac786..c1ff5766a7 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 7c8cea533f..ac103420d0 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index 9f69cb2f70..900d476cf1 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index 94f0a6ad39..b20bc06d0e 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
index 39f62e9a7f..f225511a9c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
index df5dfea272..cfd8aa17a5 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index c514bb69e2..c712e49fa2 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index 22e9c97044..9f6eda436b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index 6bdc7e1354..6fee5fb803 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index fe928d940d..ba0b6bcf24 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 4616e6f8c0..797ec06cb0 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index fdb19f8eb7..366684858e 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index f69a4530c5..54448105c7 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 2e8e3c566e..347a916210 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index c02a13773b..18ea04a2e9 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index 5a3215e451..83b8746530 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index c2c7a2b7d3..5d21180735 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 397f4b78ff..e4cfe4d478 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 8fa259806f..7d45056f0b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 6927b34fd9..8c981aac8f 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index c2f9aca310..735cdf9049 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 5173b510f1..6fcbacc22e 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index e4c3996f6c..2e234745bc 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index 394b66ecfd..bbdb57f9f7 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index 302dd8e0c0..aa27e1c337 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index c5875a8b39..08da271ac3 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 483524f86f..58df85574c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index ab3a14d037..9caa35be96 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 86ee98626b..ba8f2f3ea0 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index dbb30f65e1..2c2557e331 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index dc9466e72e..b387a4e131 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index 0a0832e6ca..1d89410bf9 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index 6ca8a1e23b..97a7842348 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index bd4edd5195..368c758924 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 73408d568a..9e1b6b83b9 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 65cdfc7efb..65a2ae55a7 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 84ac3e3b23..3268ab595b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 24c89b2ba0..b2b80c6d87 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 64f056fb29..f325c53ade 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 1408b9c40e..c4129c4060 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot
index fa2f84c63a..e424b1e1a9 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes128gcm-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot
index 9b40af3e3a..2858a309ea 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlhwasync-ip4base-int-aes256gcm-ndrpdr.robot
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 3ad46ca1a5..2c16245e9f 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index 3417ca3226..122e24e699 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index 976a2f8e26..f2c4319287 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 1a68f781f9..39752a9b12 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 59975d1f8a..60f5f2fb33 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 5c32a13ed8..741d38e887 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 425a13299c..76293751da 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 4e63ed6847..38e1eb0b02 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 8826cd9ce7..ab49221762 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index efe5550a7d..6d76d08d8c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index 70898facf4..d009ad6f23 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 0ce32c207c..a5a15da372 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 122b67ec6c..7346affb00 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index eb4c050d0c..89331cf111 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 2efd932b4d..6cda1c7239 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 2a9eaab631..2386612c68 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 6e11c11490..fbfb631984 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index c5a59e93e7..f3569b8d46 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index 07b8a2d057..08fba2fa13 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 988e736e5e..6afea0d023 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 416f5fc3f0..c4e2a4cb20 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 995e12b964..e3eb5c470b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index aaf79b1665..f23e3c6f8e 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index a0280eabc3..93ab652954 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_sa
 |
 | Test Template | Local Template
 |
-- 
2.16.6