fix(IPsec): fix policy tests
[csit.git] / resources / libraries / python / IPsecUtil.py
index 36e9849..e3b3c88 100644 (file)
@@ -1,4 +1,5 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
+# Copyright (c) 2022 PANTHEON.tech s.r.o.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -17,19 +18,25 @@ import os
 
 from enum import Enum, IntEnum
 from io import open
+from ipaddress import ip_network, ip_address
 from random import choice
 from string import ascii_letters
 
-from ipaddress import ip_network, ip_address
-
+from resources.libraries.python.Constants import Constants
+from resources.libraries.python.IncrementUtil import ObjIncrement
 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, NetworkIncrement
 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.topology import Topology, NodeType
 from resources.libraries.python.VatExecutor import VatExecutor
+from resources.libraries.python.VPPUtil import VPPUtil
+
+
+IPSEC_UDP_PORT_NONE = 0xffff
 
 
 def gen_key(length):
@@ -55,6 +62,12 @@ class PolicyAction(Enum):
         self.policy_name = policy_name
         self.policy_int_repr = policy_int_repr
 
+    def __str__(self):
+        return self.policy_name
+
+    def __int__(self):
+        return self.policy_int_repr
+
 
 class CryptoAlg(Enum):
     """Encryption algorithms."""
@@ -91,8 +104,42 @@ 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
+    # 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:
@@ -205,12 +252,14 @@ class IPsecUtil:
     def get_integ_alg_key_len(integ_alg):
         """Return integrity algorithm key length.
 
+        None argument is accepted, returning zero.
+
         :param integ_alg: Integrity algorithm.
-        :type integ_alg: IntegAlg
+        :type integ_alg: Optional[IntegAlg]
         :returns: Key length.
         :rtype: int
         """
-        return integ_alg.key_len
+        return 0 if integ_alg is None else integ_alg.key_len
 
     @staticmethod
     def get_integ_alg_scapy_name(integ_alg):
@@ -282,6 +331,60 @@ class IPsecUtil:
         with PapiSocketExecutor(node) as papi_exec:
             papi_exec.add(cmd, **args).get_reply(err_msg)
 
+    @staticmethod
+    def vpp_ipsec_crypto_sw_scheduler_set_worker(
+            node, workers, crypto_enable=False):
+        """Enable or disable crypto on specific vpp worker threads.
+
+        :param node: VPP node to enable or disable crypto for worker threads.
+        :param workers: List of VPP thread numbers.
+        :param crypto_enable: Disable or enable crypto work.
+        :type node: dict
+        :type workers: Iterable[int]
+        :type crypto_enable: bool
+        :raises RuntimeError: If failed to enable or disable crypto for worker
+            thread or if no API reply received.
+        """
+        for worker in workers:
+            cmd = u"crypto_sw_scheduler_set_worker"
+            err_msg = f"Failed to disable/enable crypto for worker thread " \
+                f"on host {node[u'host']}"
+            args = dict(
+                worker_index=worker - 1,
+                crypto_enable=crypto_enable
+            )
+            with PapiSocketExecutor(node) as papi_exec:
+                papi_exec.add(cmd, **args).get_reply(err_msg)
+
+    @staticmethod
+    def vpp_ipsec_crypto_sw_scheduler_set_worker_on_all_duts(
+            nodes, workers, crypto_enable=False):
+        """Enable or disable crypto on specific vpp worker threads.
+
+        :param node: VPP node to enable or disable crypto for worker threads.
+        :param workers: List of VPP thread numbers.
+        :param crypto_enable: Disable or enable crypto work.
+        :type node: dict
+        :type workers: Iterable[int]
+        :type crypto_enable: bool
+        :raises RuntimeError: If failed to enable or disable crypto for worker
+            thread or if no API reply received.
+        """
+        for node in nodes.values():
+            if node[u"type"] == NodeType.DUT:
+                thread_data = VPPUtil.vpp_show_threads(node)
+                worker_cnt = len(thread_data) - 1
+                if not worker_cnt:
+                    return None
+                worker_ids = list()
+                for item in thread_data:
+                    if str(item.cpu_id) in workers.split(u","):
+                        worker_ids.append(item.id)
+
+                IPsecUtil.vpp_ipsec_crypto_sw_scheduler_set_worker(
+                    node, workers=worker_ids, crypto_enable=crypto_enable
+                )
+
     @staticmethod
     def vpp_ipsec_add_sad_entry(
             node, sad_id, spi, crypto_alg, crypto_key, integ_alg=None,
@@ -304,7 +407,7 @@ class IPsecUtil:
         :type spi: int
         :type crypto_alg: CryptoAlg
         :type crypto_key: str
-        :type integ_alg: IntegAlg
+        :type integ_alg: Optional[IntegAlg]
         :type integ_key: str
         :type tunnel_src: str
         :type tunnel_dst: str
@@ -334,7 +437,7 @@ class IPsecUtil:
             src_addr = u""
             dst_addr = u""
 
-        cmd = u"ipsec_sad_entry_add_del"
+        cmd = u"ipsec_sad_entry_add_del_v3"
         err_msg = f"Failed to add Security Association Database entry " \
             f"on host {node[u'host']}"
         sad_entry = dict(
@@ -345,8 +448,15 @@ class IPsecUtil:
             integrity_algorithm=integ_alg.alg_int_repr if integ_alg else 0,
             integrity_key=ikey,
             flags=flags,
-            tunnel_src=str(src_addr),
-            tunnel_dst=str(dst_addr),
+            tunnel=dict(
+                src=str(src_addr),
+                dst=str(dst_addr),
+                table_id=0,
+                encap_decap_flags=int(
+                    TunnelEncpaDecapFlags.TUNNEL_API_ENCAP_DECAP_FLAG_NONE
+                ),
+                dscp=int(IpDscp.IP_API_DSCP_CS0),
+            ),
             protocol=int(IPsecProto.IPSEC_API_PROTO_ESP),
             udp_src_port=4500,  # default value in api
             udp_dst_port=4500  # default value in api
@@ -384,7 +494,7 @@ class IPsecUtil:
         :type spi: int
         :type crypto_alg: CryptoAlg
         :type crypto_key: str
-        :type integ_alg: IntegAlg
+        :type integ_alg: Optional[IntegAlg]
         :type integ_key: str
         :type tunnel_src: str
         :type tunnel_dst: str
@@ -411,8 +521,8 @@ class IPsecUtil:
                     integ = f"integ-alg {integ_alg.alg_name} " \
                         f"integ-key {integ_key.hex()}" \
                         if integ_alg else u""
-                    tunnel = f"tunnel-src {src_addr + i * addr_incr} " \
-                        f"tunnel-dst {dst_addr + i * addr_incr}" \
+                    tunnel = f"tunnel src {src_addr + i * addr_incr} " \
+                        f"tunnel dst {dst_addr + i * addr_incr}" \
                         if tunnel_src and tunnel_dst else u""
                     conf = f"exec ipsec sa add {sad_id + i} esp spi {spi + i} "\
                         f"crypto-alg {crypto_alg.alg_name} " \
@@ -444,7 +554,7 @@ class IPsecUtil:
                     IPsecSadFlags.IPSEC_API_SAD_FLAG_IS_TUNNEL_V6
                 )
 
-        cmd = u"ipsec_sad_entry_add_del"
+        cmd = u"ipsec_sad_entry_add_del_v3"
         err_msg = f"Failed to add Security Association Database entry " \
             f"on host {node[u'host']}"
 
@@ -456,8 +566,15 @@ class IPsecUtil:
             integrity_algorithm=integ_alg.alg_int_repr if integ_alg else 0,
             integrity_key=ikey,
             flags=flags,
-            tunnel_src=str(src_addr),
-            tunnel_dst=str(dst_addr),
+            tunnel=dict(
+                src=str(src_addr),
+                dst=str(dst_addr),
+                table_id=0,
+                encap_decap_flags=int(
+                    TunnelEncpaDecapFlags.TUNNEL_API_ENCAP_DECAP_FLAG_NONE
+                ),
+                dscp=int(IpDscp.IP_API_DSCP_CS0),
+            ),
             protocol=int(IPsecProto.IPSEC_API_PROTO_ESP),
             udp_src_port=4500,  # default value in api
             udp_dst_port=4500  # default value in api
@@ -470,10 +587,14 @@ class IPsecUtil:
             for i in range(n_entries):
                 args[u"entry"][u"sad_id"] = int(sad_id) + i
                 args[u"entry"][u"spi"] = int(spi) + i
-                args[u"entry"][u"tunnel_src"] = str(src_addr + i * addr_incr) \
+                args[u"entry"][u"tunnel"][u"src"] = (
+                    str(src_addr + i * addr_incr)
                     if tunnel_src and tunnel_dst else src_addr
-                args[u"entry"][u"tunnel_dst"] = str(dst_addr + i * addr_incr) \
+                )
+                args[u"entry"][u"tunnel"][u"dst"] = (
+                    str(dst_addr + i * addr_incr)
                     if tunnel_src and tunnel_dst else dst_addr
+                )
                 history = bool(not 1 < i < n_entries - 2)
                 papi_exec.add(cmd, history=history, **args)
             papi_exec.get_replies(err_msg)
@@ -481,7 +602,7 @@ class IPsecUtil:
     @staticmethod
     def vpp_ipsec_set_ip_route(
             node, n_tunnels, tunnel_src, traffic_addr, tunnel_dst, interface,
-            raddr_range):
+            raddr_range, dst_mac=None):
         """Set IP address and route on interface.
 
         :param node: VPP node to add config on.
@@ -493,6 +614,7 @@ class IPsecUtil:
         :param raddr_range: Mask specifying range of Policy selector Remote IP
             addresses. Valid values are from 1 to 32 in case of IPv4 and to 128
             in case of IPv6.
+        :param dst_mac: The MAC address of destination tunnels.
         :type node: dict
         :type n_tunnels: int
         :type tunnel_src: str
@@ -500,10 +622,12 @@ class IPsecUtil:
         :type tunnel_dst: str
         :type interface: str
         :type raddr_range: int
+        :type dst_mac: str
         """
         tunnel_src = ip_address(tunnel_src)
         tunnel_dst = ip_address(tunnel_dst)
         traffic_addr = ip_address(traffic_addr)
+        tunnel_dst_prefix = 128 if tunnel_dst.version == 6 else 32
         addr_incr = 1 << (128 - raddr_range) if tunnel_src.version == 6 \
             else 1 << (32 - raddr_range)
 
@@ -513,12 +637,20 @@ class IPsecUtil:
             with open(tmp_filename, 'w') as tmp_file:
                 if_name = Topology.get_interface_name(node, interface)
                 for i in range(n_tunnels):
+                    tunnel_dst_addr = tunnel_dst + i * addr_incr
                     conf = f"exec set interface ip address {if_name} " \
                         f"{tunnel_src + i * addr_incr}/{raddr_range}\n" \
                         f"exec ip route add {traffic_addr + i}/" \
-                        f"{128 if traffic_addr.version == 6 else 32} " \
-                        f"via {tunnel_dst + i * addr_incr} {if_name}\n"
+                        f"{tunnel_dst_prefix} " \
+                        f"via {tunnel_dst_addr} {if_name}\n" \
+                        f"exec ip route add {tunnel_dst_addr}/" \
+                        f"{tunnel_dst_prefix} " \
+                        f"via {tunnel_dst_addr} {if_name}\n"
+                    if dst_mac:
+                        conf = f"{conf}exec set ip neighbor {if_name} " \
+                               f"{tunnel_dst + i * addr_incr} {dst_mac}\n"
                     tmp_file.write(conf)
+
             VatExecutor().execute_script(
                 tmp_filename, node, timeout=300, json_out=False,
                 copy_on_execute=True
@@ -539,22 +671,49 @@ class IPsecUtil:
             is_multipath=0,
             route=None
         )
-        err_msg = f"Failed to configure IP addresses and IP routes " \
-            f"on interface {interface} on host {node[u'host']}"
+        cmd3 = u"ip_neighbor_add_del"
+        args3 = dict(
+            is_add=True,
+            neighbor=dict(
+                sw_if_index=Topology.get_interface_sw_index(node, interface),
+                flags=0,
+                mac_address=str(dst_mac),
+                ip_address=None
+            )
+        )
+        err_msg = f"Failed to configure IP addresses, IP routes and " \
+            f"IP neighbor on interface {interface} on host {node[u'host']}" \
+            if dst_mac \
+            else f"Failed to configure IP addresses and IP routes " \
+                 f"on interface {interface} on host {node[u'host']}"
 
         with PapiSocketExecutor(node) as papi_exec:
             for i in range(n_tunnels):
+                tunnel_dst_addr = tunnel_dst + i * addr_incr
                 args1[u"prefix"] = IPUtil.create_prefix_object(
                     tunnel_src + i * addr_incr, raddr_range
                 )
                 args2[u"route"] = IPUtil.compose_vpp_route_structure(
                     node, traffic_addr + i,
-                    prefix_len=128 if traffic_addr.version == 6 else 32,
-                    interface=interface, gateway=tunnel_dst + i * addr_incr
+                    prefix_len=tunnel_dst_prefix,
+                    interface=interface, gateway=tunnel_dst_addr
                 )
                 history = bool(not 1 < i < n_tunnels - 2)
                 papi_exec.add(cmd1, history=history, **args1).\
                     add(cmd2, history=history, **args2)
+
+                args2[u"route"] = IPUtil.compose_vpp_route_structure(
+                    node, tunnel_dst_addr,
+                    prefix_len=tunnel_dst_prefix,
+                    interface=interface, gateway=tunnel_dst_addr
+                )
+                papi_exec.add(cmd2, history=history, **args2)
+
+                if dst_mac:
+                    args3[u"neighbor"][u"ip_address"] = ip_address(
+                        tunnel_dst_addr
+                    )
+                    papi_exec.add(cmd3, history=history, **args3)
             papi_exec.get_replies(err_msg)
 
     @staticmethod
@@ -599,9 +758,128 @@ class IPsecUtil:
             papi_exec.add(cmd, **args).get_reply(err_msg)
 
     @staticmethod
-    def vpp_ipsec_policy_add(
+    def vpp_ipsec_create_spds_match_nth_entry(
+            node, dir1_interface, dir2_interface, entry_amount,
+            local_addr_range, remote_addr_range, action=PolicyAction.BYPASS,
+            inbound=False, bidirectional=True):
+        """Create one matching SPD entry for inbound or outbound traffic on
+        a DUT for each traffic direction and also create entry_amount - 1
+        non-matching SPD entries. Create a Security Policy Database on each
+        outbound interface where these entries will be configured.
+        The matching SPD entry will have the lowest priority, input action and
+        will be configured to match the IP flow. The non-matching entries will
+        be the same, except with higher priority and non-matching IP flows.
+
+        Action Protect is currently not supported.
+
+        :param node: VPP node to configured the SPDs and their entries.
+        :param dir1_interface: The interface in direction 1 where the entries
+            will be checked.
+        :param dir2_interface: The interface in direction 2 where the entries
+            will be checked.
+        :param entry_amount: The number of SPD entries to configure. If
+            entry_amount == 1, no non-matching entries will be configured.
+        :param local_addr_range: Matching local address range in direction 1
+            in format IP/prefix or IP/mask. If no mask is provided, it's
+            considered to be /32.
+        :param remote_addr_range: Matching remote address range in
+            direction 1 in format IP/prefix or IP/mask. If no mask is
+            provided, it's considered to be /32.
+        :param action: Policy action.
+        :param inbound: If True policy is for inbound traffic, otherwise
+            outbound.
+        :param bidirectional: When True, will create SPDs in both directions
+            of traffic. When False, only in one direction.
+        :type node: dict
+        :type dir1_interface: Union[string, int]
+        :type dir2_interface: Union[string, int]
+        :type entry_amount: int
+        :type local_addr_range:
+            Union[string, ipaddress.IPv4Address, ipaddress.IPv6Address]
+        :type remote_addr_range:
+            Union[string, ipaddress.IPv4Address, ipaddress.IPv6Address]
+        :type action: IPsecUtil.PolicyAction
+        :type inbound: bool
+        :type bidirectional: bool
+        :raises NotImplementedError: When the action is PolicyAction.PROTECT.
+        """
+
+        if action == PolicyAction.PROTECT:
+            raise NotImplementedError('Policy action PROTECT is not supported.')
+
+        spd_id_dir1 = 1
+        spd_id_dir2 = 2
+        matching_priority = 1
+
+        IPsecUtil.vpp_ipsec_add_spd(node, spd_id_dir1)
+        IPsecUtil.vpp_ipsec_spd_add_if(node, spd_id_dir1, dir1_interface)
+        # matching entry direction 1
+        IPsecUtil.vpp_ipsec_add_spd_entry(
+            node, spd_id_dir1, matching_priority, action,
+            inbound=inbound, laddr_range=local_addr_range,
+            raddr_range=remote_addr_range
+        )
+
+        if bidirectional:
+            IPsecUtil.vpp_ipsec_add_spd(node, spd_id_dir2)
+            IPsecUtil.vpp_ipsec_spd_add_if(node, spd_id_dir2, dir2_interface)
+
+            # matching entry direction 2, the address ranges are switched
+            IPsecUtil.vpp_ipsec_add_spd_entry(
+                node, spd_id_dir2, matching_priority, action,
+                inbound=inbound, laddr_range=remote_addr_range,
+                raddr_range=local_addr_range
+            )
+
+        # non-matching entries
+        no_match_entry_amount = entry_amount - 1
+        if no_match_entry_amount > 0:
+            # create a NetworkIncrement representation of the network,
+            # then skip the matching network
+            no_match_local_addr_range = NetworkIncrement(
+                ip_network(local_addr_range)
+            )
+            next(no_match_local_addr_range)
+
+            no_match_remote_addr_range = NetworkIncrement(
+                ip_network(remote_addr_range)
+            )
+            next(no_match_remote_addr_range)
+
+            # non-matching entries direction 1
+            IPsecUtil.vpp_ipsec_add_spd_entries(
+                node, no_match_entry_amount, spd_id_dir1,
+                ObjIncrement(matching_priority + 1, 1), action,
+                inbound=inbound, laddr_range=no_match_local_addr_range,
+                raddr_range=no_match_remote_addr_range
+            )
+
+            if bidirectional:
+                # reset the networks so that we're using a unified config
+                # the address ranges are switched
+                no_match_remote_addr_range = NetworkIncrement(
+                    ip_network(local_addr_range)
+                )
+                next(no_match_remote_addr_range)
+
+                no_match_local_addr_range = NetworkIncrement(
+                    ip_network(remote_addr_range)
+                )
+                next(no_match_local_addr_range)
+                # non-matching entries direction 2
+                IPsecUtil.vpp_ipsec_add_spd_entries(
+                    node, no_match_entry_amount, spd_id_dir2,
+                    ObjIncrement(matching_priority + 1, 1), action,
+                    inbound=inbound, laddr_range=no_match_local_addr_range,
+                    raddr_range=no_match_remote_addr_range
+                )
+
+        IPsecUtil.vpp_ipsec_show_all(node)
+
+    @staticmethod
+    def vpp_ipsec_add_spd_entry(
             node, spd_id, priority, action, inbound=True, sa_id=None,
-            laddr_range=None, raddr_range=None, proto=None, lport_range=None,
+            proto=None, laddr_range=None, raddr_range=None, lport_range=None,
             rport_range=None, is_ipv6=False):
         """Create Security Policy Database entry on the VPP node.
 
@@ -611,14 +889,14 @@ class IPsecUtil:
         :param action: Policy action.
         :param inbound: If True policy is for inbound traffic, otherwise
             outbound.
-        :param sa_id: SAD entry ID for protect action.
-        :param laddr_range: Policy selector local IPv4 or IPv6 address range in
-            format IP/prefix or IP/mask. If no mask is provided,
+        :param sa_id: SAD entry ID for action PolicyAction.PROTECT.
+        :param proto: Policy selector next layer protocol number.
+        :param laddr_range: Policy selector local IPv4 or IPv6 address range
+            in format IP/prefix or IP/mask. If no mask is provided,
             it's considered to be /32.
-        :param raddr_range: Policy selector remote IPv4 or IPv6 address range in
-            format IP/prefix or IP/mask. If no mask is provided,
+        :param raddr_range: Policy selector remote IPv4 or IPv6 address range
+            in format IP/prefix or IP/mask. If no mask is provided,
             it's considered to be /32.
-        :param proto: Policy selector next layer protocol number.
         :param lport_range: Policy selector local TCP/UDP port range in format
             <port_start>-<port_end>.
         :param rport_range: Policy selector remote TCP/UDP port range in format
@@ -628,12 +906,12 @@ class IPsecUtil:
         :type node: dict
         :type spd_id: int
         :type priority: int
-        :type action: PolicyAction
+        :type action: IPsecUtil.PolicyAction
         :type inbound: bool
         :type sa_id: int
+        :type proto: int
         :type laddr_range: string
         :type raddr_range: string
-        :type proto: int
         :type lport_range: string
         :type rport_range: string
         :type is_ipv6: bool
@@ -644,28 +922,31 @@ class IPsecUtil:
         if raddr_range is None:
             raddr_range = u"::/0" if is_ipv6 else u"0.0.0.0/0"
 
+        local_net = ip_network(laddr_range, strict=False)
+        remote_net = ip_network(raddr_range, strict=False)
+
         cmd = u"ipsec_spd_entry_add_del"
-        err_msg = f"Failed to add entry to Security Policy Database {spd_id} " \
-            f"on host {node[u'host']}"
+        err_msg = f"Failed to add entry to Security Policy Database " \
+                  f"{spd_id} on host {node[u'host']}"
 
         spd_entry = dict(
             spd_id=int(spd_id),
             priority=int(priority),
             is_outbound=not inbound,
             sa_id=int(sa_id) if sa_id else 0,
-            policy=action.policy_int_repr,
+            policy=int(action),
             protocol=int(proto) if proto else 0,
             remote_address_start=IPAddress.create_ip_address_object(
-                ip_network(raddr_range, strict=False).network_address
+                remote_net.network_address
             ),
             remote_address_stop=IPAddress.create_ip_address_object(
-                ip_network(raddr_range, strict=False).broadcast_address
+                remote_net.broadcast_address
             ),
             local_address_start=IPAddress.create_ip_address_object(
-                ip_network(laddr_range, strict=False).network_address
+                local_net.network_address
             ),
             local_address_stop=IPAddress.create_ip_address_object(
-                ip_network(laddr_range, strict=False).broadcast_address
+                local_net.broadcast_address
             ),
             remote_port_start=int(rport_range.split(u"-")[0]) if rport_range
             else 0,
@@ -684,47 +965,89 @@ class IPsecUtil:
             papi_exec.add(cmd, **args).get_reply(err_msg)
 
     @staticmethod
-    def vpp_ipsec_spd_add_entries(
-            node, n_entries, spd_id, priority, inbound, sa_id, raddr_ip,
-            raddr_range=0):
+    def vpp_ipsec_add_spd_entries(
+            node, n_entries, spd_id, priority, action, inbound, sa_id=None,
+            proto=None, laddr_range=None, raddr_range=None, lport_range=None,
+            rport_range=None, is_ipv6=False):
         """Create multiple Security Policy Database entries on the VPP node.
 
         :param node: VPP node to add SPD entries on.
         :param n_entries: Number of SPD entries to be added.
         :param spd_id: SPD ID to add entries on.
         :param priority: SPD entries priority, higher number = higher priority.
+        :param action: Policy action.
         :param inbound: If True policy is for inbound traffic, otherwise
             outbound.
-        :param sa_id: SAD entry ID for first entry. Each subsequent entry will
-            SAD entry ID incremented by 1.
-        :param raddr_ip: Policy selector remote IPv4 start address for the first
-            entry. Remote IPv4 end address will be calculated depending on
-            raddr_range parameter. Each subsequent entry will have start address
-            next after IPv4 end address of previous entry.
-        :param raddr_range: Required IP addres range.
+        :param sa_id: SAD entry ID for action PolicyAction.PROTECT.
+        :param proto: Policy selector next layer protocol number.
+        :param laddr_range: Policy selector local IPv4 or IPv6 address range
+            in format IP/prefix or IP/mask. If no mask is provided,
+            it's considered to be /32.
+        :param raddr_range: Policy selector remote IPv4 or IPv6 address range
+            in format IP/prefix or IP/mask. If no mask is provided,
+            it's considered to be /32.
+        :param lport_range: Policy selector local TCP/UDP port range in format
+            <port_start>-<port_end>.
+        :param rport_range: Policy selector remote TCP/UDP port range in format
+            <port_start>-<port_end>.
+        :param is_ipv6: True in case of IPv6 policy when IPv6 address range is
+            not defined so it will default to address ::/0, otherwise False.
         :type node: dict
         :type n_entries: int
         :type spd_id: int
-        :type priority: int
+        :type priority: IPsecUtil.ObjIncrement
+        :type action: IPsecUtil.PolicyAction
         :type inbound: bool
-        :type sa_id: int
-        :type raddr_ip: str
-        :type raddr_range: int
+        :type sa_id: IPsecUtil.ObjIncrement
+        :type proto: int
+        :type laddr_range: IPsecUtil.NetworkIncrement
+        :type raddr_range: IPsecUtil.NetworkIncrement
+        :type lport_range: string
+        :type rport_range: string
+        :type is_ipv6: bool
         """
-        raddr_ip = ip_address(raddr_ip)
+        if laddr_range is None:
+            laddr_range = u"::/0" if is_ipv6 else u"0.0.0.0/0"
+            laddr_range = NetworkIncrement(ip_network(laddr_range), 0)
+
+        if raddr_range is None:
+            raddr_range = u"::/0" if is_ipv6 else u"0.0.0.0/0"
+            raddr_range = NetworkIncrement(ip_network(raddr_range), 0)
+
+        lport_range_start = 0
+        lport_range_stop = 65535
+        if lport_range:
+            lport_range_start, lport_range_stop = lport_range.split('-')
+
+        rport_range_start = 0
+        rport_range_stop = 65535
+        if rport_range:
+            rport_range_start, rport_range_stop = rport_range.split('-')
+
         if int(n_entries) > 10:
-            tmp_filename = f"/tmp/ipsec_spd_{sa_id}_add_del_entry.script"
+            tmp_filename = f"/tmp/ipsec_spd_{spd_id}_add_del_entry.script"
 
             with open(tmp_filename, 'w') as tmp_file:
-                for i in range(n_entries):
+                for _ in range(n_entries):
                     direction = u'inbound' if inbound else u'outbound'
-                    tunnel = f"exec ipsec policy add spd {spd_id} " \
-                        f"priority {priority} {direction} " \
-                        f"action protect sa {sa_id+i} " \
-                        f"remote-ip-range {raddr_ip + i * (raddr_range + 1)} " \
-                        f"- {raddr_ip + (i  + 1) * raddr_range + i} " \
-                        f"local-ip-range 0.0.0.0 - 255.255.255.255\n"
-                    tmp_file.write(tunnel)
+                    sa = f' sa {sa_id.inc_fmt()}' if sa_id is not None else ''
+                    protocol = f' protocol {protocol}' if proto else ''
+                    local_port_range = f' local-port-range ' \
+                        f'{lport_range_start} - {lport_range_stop}' \
+                        if lport_range else ''
+                    remote_port_range = f' remote-port-range ' \
+                        f'{rport_range_start} - {rport_range_stop}' \
+                        if rport_range else ''
+
+                    spd_cfg = f"exec ipsec policy add spd {spd_id} " \
+                        f"priority {priority.inc_fmt()} {direction}" \
+                        f"{protocol} action {action}{sa} " \
+                        f"local-ip-range {laddr_range.inc_fmt()} " \
+                        f"remote-ip-range {raddr_range.inc_fmt()}" \
+                        f"{local_port_range}{remote_port_range}\n"
+
+                    tmp_file.write(spd_cfg)
+
             VatExecutor().execute_script(
                 tmp_filename, node, timeout=300, json_out=False,
                 copy_on_execute=True
@@ -732,46 +1055,13 @@ class IPsecUtil:
             os.remove(tmp_filename)
             return
 
-        laddr_range = u"::/0" if raddr_ip.version == 6 else u"0.0.0.0/0"
-
-        cmd = u"ipsec_spd_entry_add_del"
-        err_msg = f"ailed to add entry to Security Policy Database '{spd_id} " \
-            f"on host {node[u'host']}"
-
-        spd_entry = dict(
-            spd_id=int(spd_id),
-            priority=int(priority),
-            is_outbound=not inbound,
-            sa_id=int(sa_id) if sa_id else 0,
-            policy=getattr(PolicyAction.PROTECT, u"policy_int_repr"),
-            protocol=0,
-            remote_address_start=IPAddress.create_ip_address_object(raddr_ip),
-            remote_address_stop=IPAddress.create_ip_address_object(raddr_ip),
-            local_address_start=IPAddress.create_ip_address_object(
-                ip_network(laddr_range, strict=False).network_address
-            ),
-            local_address_stop=IPAddress.create_ip_address_object(
-                ip_network(laddr_range, strict=False).broadcast_address
-            ),
-            remote_port_start=0,
-            remote_port_stop=65535,
-            local_port_start=0,
-            local_port_stop=65535
-        )
-        args = dict(
-            is_add=True,
-            entry=spd_entry
-        )
-
-        with PapiSocketExecutor(node) as papi_exec:
-            for i in range(n_entries):
-                args[u"entry"][u"remote_address_start"][u"un"] = \
-                    IPAddress.union_addr(raddr_ip + i)
-                args[u"entry"][u"remote_address_stop"][u"un"] = \
-                    IPAddress.union_addr(raddr_ip + i)
-                history = bool(not 1 < i < n_entries - 2)
-                papi_exec.add(cmd, history=history, **args)
-            papi_exec.get_replies(err_msg)
+        for _ in range(n_entries):
+            IPsecUtil.vpp_ipsec_add_spd_entry(
+                node, spd_id, next(priority), action, inbound,
+                next(sa_id) if sa_id is not None else sa_id,
+                proto, next(laddr_range), next(raddr_range), lport_range,
+                rport_range, is_ipv6
+            )
 
     @staticmethod
     def _ipsec_create_tunnel_interfaces_dut1_vat(
@@ -779,6 +1069,8 @@ class IPsecUtil:
             raddr_ip2, addr_incr, spi_d, existing_tunnels=0):
         """Create multiple IPsec tunnel interfaces on DUT1 node using VAT.
 
+        Generate random keys and return them (so DUT2 or TG can decrypt).
+
         :param nodes: VPP nodes to create tunnel interfaces.
         :param tun_ips: Dictionary with VPP node 1 ipsec tunnel interface
             IPv4/IPv6 address (ip1) and VPP node 2 ipsec tunnel interface
@@ -801,11 +1093,13 @@ class IPsecUtil:
         :type if2_key: str
         :type n_tunnels: int
         :type crypto_alg: CryptoAlg
-        :type integ_alg: IntegAlg
+        :type integ_alg: Optional[IntegAlg]
         :type raddr_ip2: IPv4Address or IPv6Address
         :type addr_incr: int
         :type spi_d: dict
         :type existing_tunnels: int
+        :returns: Generated ckeys and ikeys.
+        :rtype: List[bytes], List[bytes]
         """
         tmp_fn1 = u"/tmp/ipsec_create_tunnel_dut1.config"
         if1_n = Topology.get_interface_name(nodes[u"DUT1"], if1_key)
@@ -832,28 +1126,37 @@ class IPsecUtil:
                 ckeys.append(
                     gen_key(IPsecUtil.get_crypto_alg_key_len(crypto_alg))
                 )
+                ikeys.append(
+                    gen_key(IPsecUtil.get_integ_alg_key_len(integ_alg))
+                )
                 if integ_alg:
-                    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,
@@ -886,6 +1189,9 @@ class IPsecUtil:
             ikeys, raddr_ip1, addr_incr, spi_d, existing_tunnels=0):
         """Create multiple IPsec tunnel interfaces on DUT2 node using VAT.
 
+        This method accesses keys generated by DUT1 method
+        and does not return anything.
+
         :param nodes: VPP nodes to create tunnel interfaces.
         :param tun_ips: Dictionary with VPP node 1 ipsec tunnel interface
             IPv4/IPv6 address (ip1) and VPP node 2 ipsec tunnel interface
@@ -906,9 +1212,9 @@ class IPsecUtil:
         :type if2_key: str
         :type n_tunnels: int
         :type crypto_alg: CryptoAlg
-        :type ckeys: list
-        :type integ_alg: IntegAlg
-        :type ikeys: list
+        :type ckeys: Sequence[bytes]
+        :type integ_alg: Optional[IntegAlg]
+        :type ikeys: Sequence[bytes]
         :type addr_incr: int
         :type spi_d: dict
         :type existing_tunnels: int
@@ -925,22 +1231,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,
@@ -989,9 +1304,11 @@ class IPsecUtil:
         """
         with PapiSocketExecutor(nodes[u"DUT1"]) as papi_exec:
             # Create loopback interface on DUT1, set it to up state
-            cmd = u"create_loopback"
+            cmd = u"create_loopback_instance"
             args = dict(
-                mac_address=0
+                mac_address=0,
+                is_specified=False,
+                user_instance=0,
             )
             err_msg = f"Failed to create loopback interface " \
                 f"on host {nodes[u'DUT1'][u'host']}"
@@ -1050,6 +1367,8 @@ class IPsecUtil:
             raddr_ip2, addr_incr, spi_d, existing_tunnels=0):
         """Create multiple IPsec tunnel interfaces on DUT1 node using PAPI.
 
+        Generate random keys and return them (so DUT2 or TG can decrypt).
+
         :param nodes: VPP nodes to create tunnel interfaces.
         :param tun_ips: Dictionary with VPP node 1 ipsec tunnel interface
             IPv4/IPv6 address (ip1) and VPP node 2 ipsec tunnel interface
@@ -1072,11 +1391,13 @@ class IPsecUtil:
         :type if2_key: str
         :type n_tunnels: int
         :type crypto_alg: CryptoAlg
-        :type integ_alg: IntegAlg
+        :type integ_alg: Optional[IntegAlg]
         :type raddr_ip2: IPv4Address or IPv6Address
         :type addr_incr: int
         :type spi_d: dict
         :type existing_tunnels: int
+        :returns: Generated ckeys and ikeys.
+        :rtype: List[bytes], List[bytes]
         """
         if not existing_tunnels:
             loop_sw_if_idx = IPsecUtil._ipsec_create_loopback_dut1_papi(
@@ -1103,66 +1424,149 @@ 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
             )
-            ipsec_tunnels = [None] * existing_tunnels
-            ckeys = [bytes()] * existing_tunnels
-            ikeys = [bytes()] * existing_tunnels
+            ipip_tunnels = [None] * existing_tunnels
             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))
-                    )
-                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(
+                args[u"tunnel"][u"src"] = IPAddress.create_ip_address_object(
                     tun_ips[u"ip1"] + i * addr_incr
                 )
-                args[u"remote_ip"] = IPAddress.create_ip_address_object(
+                args[u"tunnel"][u"dst"] = IPAddress.create_ip_address_object(
                     tun_ips[u"ip2"]
                 )
-                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 on host" \
+            err_msg = f"Failed to add IPIP tunnel interfaces on host" \
                 f" {nodes[u'DUT1'][u'host']}"
-            ipsec_tunnels.extend(
+            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
+            ckeys = [bytes()] * existing_tunnels
+            ikeys = [bytes()] * existing_tunnels
+            cmd = u"ipsec_sad_entry_add_del_v3"
+            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=dict(
+                    src=0,
+                    dst=0,
+                    table_id=0,
+                    encap_decap_flags=int(
+                        TunnelEncpaDecapFlags.TUNNEL_API_ENCAP_DECAP_FLAG_NONE
+                    ),
+                    dscp=int(IpDscp.IP_API_DSCP_CS0),
+                ),
+                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))
+                )
+                ikeys.append(
+                    gen_key(IPsecUtil.get_integ_alg_key_len(integ_alg))
+                )
+                # 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
+                )
+                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"] = 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 |
+                    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'DUT1'][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"] = 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 +1577,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 +1588,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 +1603,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
@@ -1216,6 +1620,9 @@ class IPsecUtil:
             ikeys, raddr_ip1, addr_incr, spi_d, existing_tunnels=0):
         """Create multiple IPsec tunnel interfaces on DUT2 node using PAPI.
 
+        This method accesses keys generated by DUT1 method
+        and does not return anything.
+
         :param nodes: VPP nodes to create tunnel interfaces.
         :param tun_ips: Dictionary with VPP node 1 ipsec tunnel interface
             IPv4/IPv6 address (ip1) and VPP node 2 ipsec tunnel interface
@@ -1236,9 +1643,9 @@ class IPsecUtil:
         :type if2_key: str
         :type n_tunnels: int
         :type crypto_alg: CryptoAlg
-        :type ckeys: list
-        :type integ_alg: IntegAlg
-        :type ikeys: list
+        :type ckeys: Sequence[bytes]
+        :type integ_alg: Optional[IntegAlg]
+        :type ikeys: Sequence[bytes]
         :type addr_incr: int
         :type spi_d: dict
         :type existing_tunnels: int
@@ -1261,57 +1668,147 @@ 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_v3"
+            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=dict(
+                    src=0,
+                    dst=0,
+                    table_id=0,
+                    encap_decap_flags=int(
+                        TunnelEncpaDecapFlags.TUNNEL_API_ENCAP_DECAP_FLAG_NONE
+                    ),
+                    dscp=int(IpDscp.IP_API_DSCP_CS0),
+                ),
+                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))
+                )
+                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 +1834,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 +1845,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 +1860,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
@@ -1376,9 +1873,13 @@ class IPsecUtil:
     def vpp_ipsec_create_tunnel_interfaces(
             nodes, tun_if1_ip_addr, tun_if2_ip_addr, if1_key, if2_key,
             n_tunnels, crypto_alg, integ_alg, raddr_ip1, raddr_ip2, raddr_range,
-            existing_tunnels=0):
+            existing_tunnels=0, return_keys=False):
         """Create multiple IPsec tunnel interfaces between two VPP nodes.
 
+        Some deployments (e.g. devicetest) need to know the generated keys.
+        But other deployments (e.g. scale perf test) would get spammed
+        if we returned keys every time.
+
         :param nodes: VPP nodes to create tunnel interfaces.
         :param tun_if1_ip_addr: VPP node 1 ipsec tunnel interface IPv4/IPv6
             address.
@@ -1399,6 +1900,7 @@ class IPsecUtil:
             and to 128 in case of IPv6.
         :param existing_tunnels: Number of tunnel interfaces before creation.
             Useful mainly for reconf tests. Default 0.
+        :param return_keys: Whether generated keys should be returned.
         :type nodes: dict
         :type tun_if1_ip_addr: str
         :type tun_if2_ip_addr: str
@@ -1406,11 +1908,14 @@ class IPsecUtil:
         :type if2_key: str
         :type n_tunnels: int
         :type crypto_alg: CryptoAlg
-        :type integ_alg: IntegAlg
+        :type integ_alg: Optonal[IntegAlg]
         :type raddr_ip1: string
         :type raddr_ip2: string
         :type raddr_range: int
         :type existing_tunnels: int
+        :type return_keys: bool
+        :returns: Ckeys, ikeys, spi_1, spi_2.
+        :rtype: Optional[List[bytes], List[bytes], int, int]
         """
         n_tunnels = int(n_tunnels)
         existing_tunnels = int(existing_tunnels)
@@ -1432,25 +1937,27 @@ class IPsecUtil:
                 nodes, tun_ips, if1_key, if2_key, n_tunnels, crypto_alg,
                 integ_alg, raddr_ip2, addr_incr, spi_d, existing_tunnels
             )
-            if u"DUT2" not in nodes.keys():
-                return ckeys[0], ikeys[0], spi_d[u"spi_1"], spi_d[u"spi_2"]
-            IPsecUtil._ipsec_create_tunnel_interfaces_dut2_vat(
-                nodes, tun_ips, if2_key, n_tunnels, crypto_alg, ckeys,
-                integ_alg, ikeys, raddr_ip1, addr_incr, spi_d, existing_tunnels
-            )
+            if u"DUT2" in nodes.keys():
+                IPsecUtil._ipsec_create_tunnel_interfaces_dut2_vat(
+                    nodes, tun_ips, if2_key, n_tunnels, crypto_alg, ckeys,
+                    integ_alg, ikeys, raddr_ip1, addr_incr, spi_d,
+                    existing_tunnels
+                )
         else:
             ckeys, ikeys = IPsecUtil._ipsec_create_tunnel_interfaces_dut1_papi(
                 nodes, tun_ips, if1_key, if2_key, n_tunnels, crypto_alg,
                 integ_alg, raddr_ip2, addr_incr, spi_d, existing_tunnels
             )
-            if u"DUT2" not in nodes.keys():
-                return ckeys[0], ikeys[0], spi_d[u"spi_1"], spi_d[u"spi_2"]
-            IPsecUtil._ipsec_create_tunnel_interfaces_dut2_papi(
-                nodes, tun_ips, if2_key, n_tunnels, crypto_alg, ckeys,
-                integ_alg, ikeys, raddr_ip1, addr_incr, spi_d, existing_tunnels
-            )
+            if u"DUT2" in nodes.keys():
+                IPsecUtil._ipsec_create_tunnel_interfaces_dut2_papi(
+                    nodes, tun_ips, if2_key, n_tunnels, crypto_alg, ckeys,
+                    integ_alg, ikeys, raddr_ip1, addr_incr, spi_d,
+                    existing_tunnels
+                )
 
-        return None, None, None, None
+        if return_keys:
+            return ckeys, ikeys, spi_d[u"spi_1"], spi_d[u"spi_2"]
+        return None
 
     @staticmethod
     def _create_ipsec_script_files(dut, instances):
@@ -1515,7 +2022,7 @@ class IPsecUtil:
         :type if2_ip_addr: str
         :type n_tunnels: int
         :type crypto_alg: CryptoAlg
-        :type integ_alg: IntegAlg
+        :type integ_alg: Optional[IntegAlg]
         :type raddr_ip1: string
         :type raddr_ip2: string
         :type raddr_range: int
@@ -1548,10 +2055,10 @@ class IPsecUtil:
                 gen_key(IPsecUtil.get_crypto_alg_key_len(crypto_alg)), u"hex"
             )
             integ = u""
+            ikey = getattr(
+                gen_key(IPsecUtil.get_integ_alg_key_len(integ_alg)), u"hex"
+            )
             if integ_alg:
-                ikey = getattr(
-                    gen_key(IPsecUtil.get_integ_alg_key_len(integ_alg)), u"hex"
-                )
                 integ = (
                     f"integ-alg {integ_alg.alg_name} "
                     f"local-integ-key {ikey} "
@@ -1629,7 +2136,7 @@ class IPsecUtil:
         :type interface2: str or int
         :type n_tunnels: int
         :type crypto_alg: CryptoAlg
-        :type integ_alg: IntegAlg
+        :type integ_alg: Optional[IntegAlg]
         :type tunnel_ip1: str
         :type tunnel_ip2: str
         :type raddr_ip1: string
@@ -1643,6 +2150,10 @@ class IPsecUtil:
         sa_id_2 = 200000
         spi_1 = 300000
         spi_2 = 400000
+        dut1_local_outbound_range = ip_network(f"{tunnel_ip1}/8", False).\
+            with_prefixlen
+        dut1_remote_outbound_range = ip_network(f"{tunnel_ip2}/8", False).\
+            with_prefixlen
 
         crypto_key = gen_key(
             IPsecUtil.get_crypto_alg_key_len(crypto_alg)
@@ -1651,74 +2162,109 @@ class IPsecUtil:
             IPsecUtil.get_integ_alg_key_len(integ_alg)
         ).decode() if integ_alg else u""
 
+        rmac = Topology.get_interface_mac(nodes[u"DUT2"], interface2) \
+            if u"DUT2" in nodes.keys() \
+            else Topology.get_interface_mac(nodes[u"TG"], interface2)
         IPsecUtil.vpp_ipsec_set_ip_route(
             nodes[u"DUT1"], n_tunnels, tunnel_ip1, raddr_ip2, tunnel_ip2,
-            interface1, raddr_range)
-        IPsecUtil.vpp_ipsec_set_ip_route(
-            nodes[u"DUT2"], n_tunnels, tunnel_ip2, raddr_ip1, tunnel_ip1,
-            interface2, raddr_range)
+            interface1, raddr_range, rmac)
 
         IPsecUtil.vpp_ipsec_add_spd(nodes[u"DUT1"], spd_id)
         IPsecUtil.vpp_ipsec_spd_add_if(nodes[u"DUT1"], spd_id, interface1)
-        IPsecUtil.vpp_ipsec_policy_add(
+        IPsecUtil.vpp_ipsec_add_spd_entry(
             nodes[u"DUT1"], spd_id, p_hi, PolicyAction.BYPASS, inbound=False,
-            proto=50, laddr_range=u"100.0.0.0/8", raddr_range=u"100.0.0.0/8"
+            proto=50, laddr_range=dut1_local_outbound_range,
+            raddr_range=dut1_remote_outbound_range
         )
-        IPsecUtil.vpp_ipsec_policy_add(
+        IPsecUtil.vpp_ipsec_add_spd_entry(
             nodes[u"DUT1"], spd_id, p_hi, PolicyAction.BYPASS, inbound=True,
-            proto=50, laddr_range=u"100.0.0.0/8", raddr_range=u"100.0.0.0/8"
-        )
-
-        IPsecUtil.vpp_ipsec_add_spd(nodes[u"DUT2"], spd_id)
-        IPsecUtil.vpp_ipsec_spd_add_if(nodes[u"DUT2"], spd_id, interface2)
-        IPsecUtil.vpp_ipsec_policy_add(
-            nodes[u"DUT2"], spd_id, p_hi, PolicyAction.BYPASS, inbound=False,
-            proto=50, laddr_range=u"100.0.0.0/8", raddr_range=u"100.0.0.0/8"
-        )
-        IPsecUtil.vpp_ipsec_policy_add(
-            nodes[u"DUT2"], spd_id, p_hi, PolicyAction.BYPASS, inbound=True,
-            proto=50, laddr_range=u"100.0.0.0/8", raddr_range=u"100.0.0.0/8"
+            proto=50, laddr_range=dut1_remote_outbound_range,
+            raddr_range=dut1_local_outbound_range
         )
 
         IPsecUtil.vpp_ipsec_add_sad_entries(
             nodes[u"DUT1"], n_tunnels, sa_id_1, spi_1, crypto_alg, crypto_key,
             integ_alg, integ_key, tunnel_ip1, tunnel_ip2
         )
-        IPsecUtil.vpp_ipsec_spd_add_entries(
-            nodes[u"DUT1"], n_tunnels, spd_id, p_lo, False, sa_id_1, raddr_ip2
-        )
 
-        IPsecUtil.vpp_ipsec_add_sad_entries(
-            nodes[u"DUT2"], n_tunnels, sa_id_1, spi_1, crypto_alg, crypto_key,
-            integ_alg, integ_key, tunnel_ip1, tunnel_ip2
-        )
-        IPsecUtil.vpp_ipsec_spd_add_entries(
-            nodes[u"DUT2"], n_tunnels, spd_id, p_lo, True, sa_id_1, raddr_ip2
+        IPsecUtil.vpp_ipsec_add_spd_entries(
+            nodes[u"DUT1"], n_tunnels, spd_id, priority=ObjIncrement(p_lo, 0),
+            action=PolicyAction.PROTECT, inbound=False,
+            sa_id=ObjIncrement(sa_id_1, 1),
+            raddr_range=NetworkIncrement(ip_network(raddr_ip2))
         )
 
         IPsecUtil.vpp_ipsec_add_sad_entries(
-            nodes[u"DUT2"], n_tunnels, sa_id_2, spi_2, crypto_alg, crypto_key,
+            nodes[u"DUT1"], n_tunnels, sa_id_2, spi_2, crypto_alg, crypto_key,
             integ_alg, integ_key, tunnel_ip2, tunnel_ip1
         )
-
-        IPsecUtil.vpp_ipsec_spd_add_entries(
-            nodes[u"DUT2"], n_tunnels, spd_id, p_lo, False, sa_id_2, raddr_ip1
+        IPsecUtil.vpp_ipsec_add_spd_entries(
+            nodes[u"DUT1"], n_tunnels, spd_id, priority=ObjIncrement(p_lo, 0),
+            action=PolicyAction.PROTECT, inbound=True,
+            sa_id=ObjIncrement(sa_id_2, 1),
+            raddr_range=NetworkIncrement(ip_network(raddr_ip1))
         )
 
-        IPsecUtil.vpp_ipsec_add_sad_entries(
-            nodes[u"DUT1"], n_tunnels, sa_id_2, spi_2, crypto_alg, crypto_key,
-            integ_alg, integ_key, tunnel_ip2, tunnel_ip1
-        )
+        if u"DUT2" in nodes.keys():
+            rmac = Topology.get_interface_mac(nodes[u"DUT1"], interface1)
+            IPsecUtil.vpp_ipsec_set_ip_route(
+                nodes[u"DUT2"], n_tunnels, tunnel_ip2, raddr_ip1, tunnel_ip1,
+                interface2, raddr_range, rmac)
+
+            IPsecUtil.vpp_ipsec_add_spd(nodes[u"DUT2"], spd_id)
+            IPsecUtil.vpp_ipsec_spd_add_if(nodes[u"DUT2"], spd_id, interface2)
+            IPsecUtil.vpp_ipsec_add_spd_entry(
+                nodes[u"DUT2"], spd_id, p_hi, PolicyAction.BYPASS,
+                inbound=False, proto=50, laddr_range=dut1_remote_outbound_range,
+                raddr_range=dut1_local_outbound_range
+            )
+            IPsecUtil.vpp_ipsec_add_spd_entry(
+                nodes[u"DUT2"], spd_id, p_hi, PolicyAction.BYPASS,
+                inbound=True, proto=50, laddr_range=dut1_local_outbound_range,
+                raddr_range=dut1_remote_outbound_range
+            )
 
-        IPsecUtil.vpp_ipsec_spd_add_entries(
-            nodes[u"DUT1"], n_tunnels, spd_id, p_lo, True, sa_id_2, raddr_ip1
-        )
+            IPsecUtil.vpp_ipsec_add_sad_entries(
+                nodes[u"DUT2"], n_tunnels, sa_id_1, spi_1, crypto_alg,
+                crypto_key, integ_alg, integ_key, tunnel_ip1, tunnel_ip2
+            )
+            IPsecUtil.vpp_ipsec_add_spd_entries(
+                nodes[u"DUT2"], n_tunnels, spd_id,
+                priority=ObjIncrement(p_lo, 0),
+                action=PolicyAction.PROTECT, inbound=True,
+                sa_id=ObjIncrement(sa_id_1, 1),
+                raddr_range=NetworkIncrement(ip_network(raddr_ip2))
+            )
+
+            IPsecUtil.vpp_ipsec_add_sad_entries(
+                nodes[u"DUT2"], n_tunnels, sa_id_2, spi_2, crypto_alg,
+                crypto_key, integ_alg, integ_key, tunnel_ip2, tunnel_ip1
+            )
+            IPsecUtil.vpp_ipsec_add_spd_entries(
+                nodes[u"DUT2"], n_tunnels, spd_id,
+                priority=ObjIncrement(p_lo, 0),
+                action=PolicyAction.PROTECT, inbound=False,
+                sa_id=ObjIncrement(sa_id_2, 1),
+                raddr_range=NetworkIncrement(ip_network(raddr_ip1))
+            )
 
     @staticmethod
-    def vpp_ipsec_show(node):
-        """Run "show ipsec" debug CLI command.
+    def vpp_ipsec_show_all(node):
+        """Run "show ipsec all" debug CLI command.
 
         :param node: Node to run command on.
         :type node: dict
         """
-        PapiSocketExecutor.run_cli_cmd(node, u"show ipsec")
+        PapiSocketExecutor.run_cli_cmd(node, u"show ipsec all")
+
+    @staticmethod
+    def show_ipsec_security_association(node):
+        """Show IPSec security association.
+
+        :param node: DUT node.
+        :type node: dict
+        """
+        cmds = [
+            u"ipsec_sa_v3_dump"
+        ]
+        PapiSocketExecutor.dump_and_log(node, cmds)