ipsec: Tunnel SA DSCP behaviour
[vpp.git] / test / test_ipsec_ah.py
index fc19d78..d44492d 100644 (file)
@@ -1,27 +1,29 @@
 import socket
 import unittest
 
-from scapy.layers.inet import IP, ICMP
-from scapy.layers.l2 import Ether, Raw
-from scapy.layers.ipsec import SecurityAssociation, AH
+from scapy.layers.ipsec import AH
+from scapy.layers.inet import IP, UDP
+from scapy.layers.inet6 import IPv6
+from scapy.layers.l2 import Ether
+from scapy.packet import Raw
 
-from framework import VppTestCase, VppTestRunner
+from framework import VppTestRunner
+from template_ipsec import TemplateIpsec, IpsecTra46Tests, IpsecTun46Tests, \
+    config_tun_params, config_tra_params, IPsecIPv4Params, IPsecIPv6Params, \
+    IpsecTra4, IpsecTun4, IpsecTra6, IpsecTun6, \
+    IpsecTun6HandoffTests, IpsecTun4HandoffTests
+from template_ipsec import IpsecTcpTests
+from vpp_ipsec import VppIpsecSA, VppIpsecSpd, VppIpsecSpdEntry,\
+        VppIpsecSpdItfBinding
+from vpp_ip_route import VppIpRoute, VppRoutePath
+from vpp_ip import DpoProto
+from vpp_papi import VppEnum
 
 
-class TestIpsecAh(VppTestCase):
+class ConfigIpsecAH(TemplateIpsec):
     """
     Basic test for IPSEC using AH transport and Tunnel mode
 
-    Below 4 cases are covered as part of this test
-    1) ipsec ah v4 transport basic test  - IPv4 Transport mode
-     scenario using HMAC-SHA1-96 intergrity algo
-    2) ipsec ah v4 transport burst test
-     Above test for 257 pkts
-    3) ipsec ah 4o4 tunnel basic test    - IPv4 Tunnel mode
-     scenario using HMAC-SHA1-96 intergrity algo
-    4) ipsec ah 4o4 tunnel burst test
-     Above test for 257 pkts
-
     TRANSPORT MODE:
 
      ---   encrypt   ---
@@ -31,291 +33,451 @@ class TestIpsecAh(VppTestCase):
     TUNNEL MODE:
 
      ---   encrypt   ---   plain   ---
-    |pg0| ------->  |VPP| ------> |pg1|
+    |pg0| <-------  |VPP| <------ |pg1|
      ---             ---           ---
 
      ---   decrypt   ---   plain   ---
-    |pg0| <-------  |VPP| <------ |pg1|
+    |pg0| ------->  |VPP| ------> |pg1|
      ---             ---           ---
+    """
+    encryption_type = AH
+    net_objs = []
+    tra4_encrypt_node_name = "ah4-encrypt"
+    tra4_decrypt_node_name = "ah4-decrypt"
+    tra6_encrypt_node_name = "ah6-encrypt"
+    tra6_decrypt_node_name = "ah6-decrypt"
+    tun4_encrypt_node_name = "ah4-encrypt"
+    tun4_decrypt_node_name = "ah4-decrypt"
+    tun6_encrypt_node_name = "ah6-encrypt"
+    tun6_decrypt_node_name = "ah6-decrypt"
+
+    @classmethod
+    def setUpClass(cls):
+        super(ConfigIpsecAH, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(ConfigIpsecAH, cls).tearDownClass()
+
+    def setUp(self):
+        super(ConfigIpsecAH, self).setUp()
+
+    def tearDown(self):
+        super(ConfigIpsecAH, self).tearDown()
+
+    def config_network(self, params):
+        self.net_objs = []
+        self.tun_if = self.pg0
+        self.tra_if = self.pg2
+        self.logger.info(self.vapi.ppcli("show int addr"))
+
+        self.tra_spd = VppIpsecSpd(self, self.tra_spd_id)
+        self.tra_spd.add_vpp_config()
+        self.net_objs.append(self.tra_spd)
+        self.tun_spd = VppIpsecSpd(self, self.tun_spd_id)
+        self.tun_spd.add_vpp_config()
+        self.net_objs.append(self.tun_spd)
+
+        b = VppIpsecSpdItfBinding(self, self.tra_spd,
+                                  self.tra_if)
+        b.add_vpp_config()
+        self.net_objs.append(b)
+
+        b = VppIpsecSpdItfBinding(self, self.tun_spd,
+                                  self.tun_if)
+        b.add_vpp_config()
+        self.net_objs.append(b)
+
+        for p in params:
+            self.config_ah_tra(p)
+            config_tra_params(p, self.encryption_type)
+        for p in params:
+            self.config_ah_tun(p)
+            config_tun_params(p, self.encryption_type, self.tun_if)
+        for p in params:
+            d = DpoProto.DPO_PROTO_IP6 if p.is_ipv6 else DpoProto.DPO_PROTO_IP4
+            r = VppIpRoute(self,  p.remote_tun_if_host, p.addr_len,
+                           [VppRoutePath(self.tun_if.remote_addr[p.addr_type],
+                                         0xffffffff,
+                                         proto=d)])
+            r.add_vpp_config()
+            self.net_objs.append(r)
+        self.logger.info(self.vapi.ppcli("show ipsec all"))
+
+    def unconfig_network(self):
+        for o in reversed(self.net_objs):
+            o.remove_vpp_config()
+        self.net_objs = []
+
+    def config_ah_tun(self, params):
+        addr_type = params.addr_type
+        scapy_tun_sa_id = params.scapy_tun_sa_id
+        scapy_tun_spi = params.scapy_tun_spi
+        vpp_tun_sa_id = params.vpp_tun_sa_id
+        vpp_tun_spi = params.vpp_tun_spi
+        auth_algo_vpp_id = params.auth_algo_vpp_id
+        auth_key = params.auth_key
+        crypt_algo_vpp_id = params.crypt_algo_vpp_id
+        crypt_key = params.crypt_key
+        remote_tun_if_host = params.remote_tun_if_host
+        addr_any = params.addr_any
+        addr_bcast = params.addr_bcast
+        flags = params.flags
+        tun_flags = params.tun_flags
+        e = VppEnum.vl_api_ipsec_spd_action_t
+        objs = []
+
+        params.tun_sa_in = VppIpsecSA(self, scapy_tun_sa_id, scapy_tun_spi,
+                                      auth_algo_vpp_id, auth_key,
+                                      crypt_algo_vpp_id, crypt_key,
+                                      self.vpp_ah_protocol,
+                                      self.tun_if.local_addr[addr_type],
+                                      self.tun_if.remote_addr[addr_type],
+                                      tun_flags=tun_flags,
+                                      flags=flags,
+                                      dscp=params.dscp)
+
+        params.tun_sa_out = VppIpsecSA(self, vpp_tun_sa_id, vpp_tun_spi,
+                                       auth_algo_vpp_id, auth_key,
+                                       crypt_algo_vpp_id, crypt_key,
+                                       self.vpp_ah_protocol,
+                                       self.tun_if.remote_addr[addr_type],
+                                       self.tun_if.local_addr[addr_type],
+                                       tun_flags=tun_flags,
+                                       flags=flags,
+                                       dscp=params.dscp)
+
+        objs.append(params.tun_sa_in)
+        objs.append(params.tun_sa_out)
 
-    Note : IPv6 is not covered
+        params.spd_policy_in_any = VppIpsecSpdEntry(self, self.tun_spd,
+                                                    vpp_tun_sa_id,
+                                                    addr_any, addr_bcast,
+                                                    addr_any, addr_bcast,
+                                                    socket.IPPROTO_AH)
+        params.spd_policy_out_any = VppIpsecSpdEntry(self, self.tun_spd,
+                                                     vpp_tun_sa_id,
+                                                     addr_any, addr_bcast,
+                                                     addr_any, addr_bcast,
+                                                     socket.IPPROTO_AH,
+                                                     is_outbound=0)
+
+        objs.append(params.spd_policy_out_any)
+        objs.append(params.spd_policy_in_any)
+
+        e1 = VppIpsecSpdEntry(self, self.tun_spd, vpp_tun_sa_id,
+                              remote_tun_if_host,
+                              remote_tun_if_host,
+                              self.pg1.remote_addr[addr_type],
+                              self.pg1.remote_addr[addr_type],
+                              0, priority=10,
+                              policy=e.IPSEC_API_SPD_ACTION_PROTECT,
+                              is_outbound=0)
+        e2 = VppIpsecSpdEntry(self, self.tun_spd, scapy_tun_sa_id,
+                              self.pg1.remote_addr[addr_type],
+                              self.pg1.remote_addr[addr_type],
+                              remote_tun_if_host,
+                              remote_tun_if_host,
+                              0, policy=e.IPSEC_API_SPD_ACTION_PROTECT,
+                              priority=10)
+        e3 = VppIpsecSpdEntry(self, self.tun_spd, vpp_tun_sa_id,
+                              remote_tun_if_host,
+                              remote_tun_if_host,
+                              self.pg0.local_addr[addr_type],
+                              self.pg0.local_addr[addr_type],
+                              0, priority=20,
+                              policy=e.IPSEC_API_SPD_ACTION_PROTECT,
+                              is_outbound=0)
+        e4 = VppIpsecSpdEntry(self, self.tun_spd, scapy_tun_sa_id,
+                              self.pg0.local_addr[addr_type],
+                              self.pg0.local_addr[addr_type],
+                              remote_tun_if_host,
+                              remote_tun_if_host,
+                              0, policy=e.IPSEC_API_SPD_ACTION_PROTECT,
+                              priority=20)
+
+        objs = objs + [e1, e2, e3, e4]
+
+        for o in objs:
+            o.add_vpp_config()
+
+        self.net_objs = self.net_objs + objs
+
+    def config_ah_tra(self, params):
+        addr_type = params.addr_type
+        scapy_tra_sa_id = params.scapy_tra_sa_id
+        scapy_tra_spi = params.scapy_tra_spi
+        vpp_tra_sa_id = params.vpp_tra_sa_id
+        vpp_tra_spi = params.vpp_tra_spi
+        auth_algo_vpp_id = params.auth_algo_vpp_id
+        auth_key = params.auth_key
+        crypt_algo_vpp_id = params.crypt_algo_vpp_id
+        crypt_key = params.crypt_key
+        addr_any = params.addr_any
+        addr_bcast = params.addr_bcast
+        flags = params.flags | (VppEnum.vl_api_ipsec_sad_flags_t.
+                                IPSEC_API_SAD_FLAG_USE_ANTI_REPLAY)
+        e = VppEnum.vl_api_ipsec_spd_action_t
+        objs = []
+
+        params.tra_sa_in = VppIpsecSA(self, scapy_tra_sa_id, scapy_tra_spi,
+                                      auth_algo_vpp_id, auth_key,
+                                      crypt_algo_vpp_id, crypt_key,
+                                      self.vpp_ah_protocol,
+                                      flags=flags)
+        params.tra_sa_out = VppIpsecSA(self, vpp_tra_sa_id, vpp_tra_spi,
+                                       auth_algo_vpp_id, auth_key,
+                                       crypt_algo_vpp_id, crypt_key,
+                                       self.vpp_ah_protocol,
+                                       flags=flags)
+
+        objs.append(params.tra_sa_in)
+        objs.append(params.tra_sa_out)
+
+        objs.append(VppIpsecSpdEntry(self, self.tra_spd, vpp_tra_sa_id,
+                                     addr_any, addr_bcast,
+                                     addr_any, addr_bcast,
+                                     socket.IPPROTO_AH))
+        objs.append(VppIpsecSpdEntry(self, self.tra_spd, scapy_tra_sa_id,
+                                     addr_any, addr_bcast,
+                                     addr_any, addr_bcast,
+                                     socket.IPPROTO_AH,
+                                     is_outbound=0))
+        objs.append(VppIpsecSpdEntry(self, self.tra_spd, vpp_tra_sa_id,
+                                     self.tra_if.local_addr[addr_type],
+                                     self.tra_if.local_addr[addr_type],
+                                     self.tra_if.remote_addr[addr_type],
+                                     self.tra_if.remote_addr[addr_type],
+                                     0, priority=10,
+                                     policy=e.IPSEC_API_SPD_ACTION_PROTECT,
+                                     is_outbound=0))
+        objs.append(VppIpsecSpdEntry(self, self.tra_spd, scapy_tra_sa_id,
+                                     self.tra_if.local_addr[addr_type],
+                                     self.tra_if.local_addr[addr_type],
+                                     self.tra_if.remote_addr[addr_type],
+                                     self.tra_if.remote_addr[addr_type],
+                                     0, policy=e.IPSEC_API_SPD_ACTION_PROTECT,
+                                     priority=10))
+
+        for o in objs:
+            o.add_vpp_config()
+        self.net_objs = self.net_objs + objs
+
+
+class TemplateIpsecAh(ConfigIpsecAH):
     """
+    Basic test for IPSEC using AH transport and Tunnel mode
+
+    TRANSPORT MODE:
 
-    remote_pg0_lb_addr = '1.1.1.1'
-    remote_pg1_lb_addr = '2.2.2.2'
+     ---   encrypt   ---
+    |pg2| <-------> |VPP|
+     ---   decrypt   ---
 
+    TUNNEL MODE:
+
+     ---   encrypt   ---   plain   ---
+    |pg0| <-------  |VPP| <------ |pg1|
+     ---             ---           ---
+
+     ---   decrypt   ---   plain   ---
+    |pg0| ------->  |VPP| ------> |pg1|
+     ---             ---           ---
+    """
     @classmethod
     def setUpClass(cls):
-        super(TestIpsecAh, cls).setUpClass()
-        try:
-            cls.create_pg_interfaces(range(3))
-            cls.interfaces = list(cls.pg_interfaces)
-            for i in cls.interfaces:
-                i.admin_up()
-                i.config_ip4()
-                i.resolve_arp()
-            cls.logger.info(cls.vapi.ppcli("show int addr"))
-            cls.configAhTra()
-            cls.logger.info(cls.vapi.ppcli("show ipsec"))
-            cls.configAhTun()
-            cls.logger.info(cls.vapi.ppcli("show ipsec"))
-        except Exception:
-            super(TestIpsecAh, cls).tearDownClass()
-            raise
+        super(TemplateIpsecAh, cls).setUpClass()
 
     @classmethod
-    def configAhTun(cls):
-        try:
-            spd_id = 1
-            remote_sa_id = 10
-            local_sa_id = 20
-            remote_tun_spi = 1001
-            local_tun_spi = 1000
-            src4 = socket.inet_pton(socket.AF_INET, cls.remote_pg0_lb_addr)
-            cls.vapi.ip_add_del_route(src4, 32, cls.pg0.remote_ip4n)
-            dst4 = socket.inet_pton(socket.AF_INET, cls.remote_pg1_lb_addr)
-            cls.vapi.ip_add_del_route(dst4, 32, cls.pg1.remote_ip4n)
-            cls.vapi.ipsec_sad_add_del_entry(
-                remote_sa_id,
-                remote_tun_spi,
-                cls.pg0.local_ip4n,
-                cls.pg0.remote_ip4n,
-                integrity_key_length=20)
-            cls.vapi.ipsec_sad_add_del_entry(
-                local_sa_id,
-                local_tun_spi,
-                cls.pg0.remote_ip4n,
-                cls.pg0.local_ip4n,
-                integrity_key_length=20)
-            cls.vapi.ipsec_spd_add_del(spd_id)
-            cls.vapi.ipsec_interface_add_del_spd(spd_id, cls.pg0.sw_if_index)
-            l_startaddr = r_startaddr = socket.inet_pton(
-                socket.AF_INET, "0.0.0.0")
-            l_stopaddr = r_stopaddr = socket.inet_pton(
-                socket.AF_INET, "255.255.255.255")
-            cls.vapi.ipsec_spd_add_del_entry(
-                spd_id,
-                l_startaddr,
-                l_stopaddr,
-                r_startaddr,
-                r_stopaddr,
-                protocol=socket.IPPROTO_AH)
-            cls.vapi.ipsec_spd_add_del_entry(
-                spd_id,
-                l_startaddr,
-                l_stopaddr,
-                r_startaddr,
-                r_stopaddr,
-                protocol=socket.IPPROTO_AH,
-                is_outbound=0)
-            l_startaddr = l_stopaddr = socket.inet_pton(
-                socket.AF_INET, cls.remote_pg0_lb_addr)
-            r_startaddr = r_stopaddr = socket.inet_pton(
-                socket.AF_INET, cls.remote_pg1_lb_addr)
-            cls.vapi.ipsec_spd_add_del_entry(
-                spd_id,
-                l_startaddr,
-                l_stopaddr,
-                r_startaddr,
-                r_stopaddr,
-                priority=10,
-                policy=3,
-                is_outbound=0,
-                sa_id=local_sa_id)
-            cls.vapi.ipsec_spd_add_del_entry(
-                spd_id,
-                r_startaddr,
-                r_stopaddr,
-                l_startaddr,
-                l_stopaddr,
-                priority=10,
-                policy=3,
-                sa_id=remote_sa_id)
-        except Exception:
-            raise
+    def tearDownClass(cls):
+        super(TemplateIpsecAh, cls).tearDownClass()
 
-    @classmethod
-    def configAhTra(cls):
-        try:
-            spd_id = 2
-            remote_sa_id = 30
-            local_sa_id = 40
-            remote_tra_spi = 2001
-            local_tra_spi = 2000
-            cls.vapi.ipsec_sad_add_del_entry(
-                remote_sa_id,
-                remote_tra_spi,
-                integrity_key_length=20,
-                is_tunnel=0)
-            cls.vapi.ipsec_sad_add_del_entry(
-                local_sa_id,
-                local_tra_spi,
-                integrity_key_length=20,
-                is_tunnel=0)
-            cls.vapi.ipsec_spd_add_del(spd_id)
-            cls.vapi.ipsec_interface_add_del_spd(spd_id, cls.pg2.sw_if_index)
-            l_startaddr = r_startaddr = socket.inet_pton(
-                socket.AF_INET, "0.0.0.0")
-            l_stopaddr = r_stopaddr = socket.inet_pton(
-                socket.AF_INET, "255.255.255.255")
-            cls.vapi.ipsec_spd_add_del_entry(
-                spd_id,
-                l_startaddr,
-                l_stopaddr,
-                r_startaddr,
-                r_stopaddr,
-                protocol=socket.IPPROTO_AH)
-            cls.vapi.ipsec_spd_add_del_entry(
-                spd_id,
-                l_startaddr,
-                l_stopaddr,
-                r_startaddr,
-                r_stopaddr,
-                protocol=socket.IPPROTO_AH,
-                is_outbound=0)
-            l_startaddr = l_stopaddr = cls.pg2.local_ip4n
-            r_startaddr = r_stopaddr = cls.pg2.remote_ip4n
-            cls.vapi.ipsec_spd_add_del_entry(
-                spd_id,
-                l_startaddr,
-                l_stopaddr,
-                r_startaddr,
-                r_stopaddr,
-                priority=10,
-                policy=3,
-                is_outbound=0,
-                sa_id=local_sa_id)
-            cls.vapi.ipsec_spd_add_del_entry(
-                spd_id,
-                l_startaddr,
-                l_stopaddr,
-                r_startaddr,
-                r_stopaddr,
-                priority=10,
-                policy=3,
-                sa_id=remote_sa_id)
-        except Exception:
-            raise
-
-    def configScapySA(self, is_tun=False):
-        if is_tun:
-            self.remote_tun_sa = SecurityAssociation(
-                AH,
-                spi=0x000003e8,
-                auth_algo='HMAC-SHA1-96',
-                auth_key='C91KUR9GYMm5GfkEvNjX',
-                tunnel_header=IP(
-                    src=self.pg0.remote_ip4,
-                    dst=self.pg0.local_ip4))
-            self.local_tun_sa = SecurityAssociation(
-                AH,
-                spi=0x000003e9,
-                auth_algo='HMAC-SHA1-96',
-                auth_key='C91KUR9GYMm5GfkEvNjX',
-                tunnel_header=IP(
-                    dst=self.pg0.remote_ip4,
-                    src=self.pg0.local_ip4))
-        else:
-            self.remote_tra_sa = SecurityAssociation(
-                AH, spi=0x000007d0, auth_algo='HMAC-SHA1-96',
-                auth_key='C91KUR9GYMm5GfkEvNjX')
-            self.local_tra_sa = SecurityAssociation(
-                AH, spi=0x000007d1, auth_algo='HMAC-SHA1-96',
-                auth_key='C91KUR9GYMm5GfkEvNjX')
+    def setUp(self):
+        super(TemplateIpsecAh, self).setUp()
+        self.config_network(self.params.values())
 
     def tearDown(self):
-        super(TestIpsecAh, self).tearDown()
-        if not self.vpp_dead:
-            self.vapi.cli("show hardware")
-
-    def send_and_expect(self, input, pkts, output, count=1):
-        input.add_stream(pkts)
-        self.pg_enable_capture(self.pg_interfaces)
-        self.pg_start()
-        rx = output.get_capture(count)
-        return rx
-
-    def gen_encrypt_pkts(self, sa, sw_intf, src, dst, count=1):
+        self.unconfig_network()
+        super(TemplateIpsecAh, self).tearDown()
+
+
+class TestIpsecAh1(TemplateIpsecAh, IpsecTcpTests):
+    """ Ipsec AH - TCP tests """
+    pass
+
+
+class TestIpsecAh2(TemplateIpsecAh, IpsecTra46Tests, IpsecTun46Tests):
+    """ Ipsec AH w/ SHA1 """
+    pass
+
+
+class TestIpsecAhTun(TemplateIpsecAh, IpsecTun46Tests):
+    """ Ipsec AH - TUN encap tests """
+
+    def setUp(self):
+        self.ipv4_params = IPsecIPv4Params()
+        self.ipv6_params = IPsecIPv6Params()
+
+        c = (VppEnum.vl_api_tunnel_encap_decap_flags_t.
+             TUNNEL_API_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP)
+        c1 = c | (VppEnum.vl_api_tunnel_encap_decap_flags_t.
+                  TUNNEL_API_ENCAP_DECAP_FLAG_ENCAP_COPY_ECN)
+
+        self.ipv4_params.tun_flags = c
+        self.ipv6_params.tun_flags = c1
+
+        super(TestIpsecAhTun, self).setUp()
+
+    def gen_pkts(self, sw_intf, src, dst, count=1, payload_size=54):
+        # set the DSCP + ECN - flags are set to copy only DSCP
+        return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
+                IP(src=src, dst=dst, tos=5) /
+                UDP(sport=4444, dport=4444) /
+                Raw(b'X' * payload_size)
+                for i in range(count)]
+
+    def gen_pkts6(self, sw_intf, src, dst, count=1, payload_size=54):
+        # set the DSCP + ECN - flags are set to copy both
+        return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
+                IPv6(src=src, dst=dst, tc=5) /
+                UDP(sport=4444, dport=4444) /
+                Raw(b'X' * payload_size)
+                for i in range(count)]
+
+    def verify_encrypted(self, p, sa, rxs):
+        # just check that only the DSCP is copied
+        for rx in rxs:
+            self.assertEqual(rx[IP].tos, 4)
+
+    def verify_encrypted6(self, p, sa, rxs):
+        # just check that the DSCP & ECN are copied
+        for rx in rxs:
+            self.assertEqual(rx[IPv6].tc, 5)
+
+
+class TestIpsecAhTun2(TemplateIpsecAh, IpsecTun46Tests):
+    """ Ipsec AH - TUN encap tests """
+
+    def setUp(self):
+        self.ipv4_params = IPsecIPv4Params()
+        self.ipv6_params = IPsecIPv6Params()
+
+        self.ipv4_params.dscp = 3
+        self.ipv6_params.dscp = 4
+
+        super(TestIpsecAhTun2, self).setUp()
+
+    def gen_pkts(self, sw_intf, src, dst, count=1, payload_size=54):
+        # set the DSCP + ECN - flags are set to copy only DSCP
         return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
-                sa.encrypt(IP(src=src, dst=dst) / ICMP() /
-                "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
-                ] * count
+                IP(src=src, dst=dst, tos=0) /
+                UDP(sport=4444, dport=4444) /
+                Raw(b'X' * payload_size)
+                for i in range(count)]
 
-    def gen_pkts(self, sw_intf, src, dst, count=1):
+    def gen_pkts6(self, sw_intf, src, dst, count=1, payload_size=54):
+        # set the DSCP + ECN - flags are set to copy both
         return [Ether(src=sw_intf.remote_mac, dst=sw_intf.local_mac) /
-                IP(src=src, dst=dst) / ICMP() /
-                "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-                ] * count
-
-    def test_ipsec_ah_tra_basic(self, count=1):
-        """ ipsec ah v4 transport basic test """
-        try:
-            self.configScapySA()
-            send_pkts = self.gen_encrypt_pkts(
-                self.remote_tra_sa,
-                self.pg2,
-                src=self.pg2.remote_ip4,
-                dst=self.pg2.local_ip4,
-                count=count)
-            recv_pkts = self.send_and_expect(
-                self.pg2, send_pkts, self.pg2, count=count)
-            # ESP TRA VPP encryption/decryption verification
-            for Pkts in recv_pkts:
-                Pkts[AH].padding = Pkts[AH].icv[12:]
-                Pkts[AH].icv = Pkts[AH].icv[:12]
-                self.local_tra_sa.decrypt(Pkts[IP])
-        finally:
-            self.logger.info(self.vapi.ppcli("show error"))
-            self.logger.info(self.vapi.ppcli("show ipsec"))
-
-    def test_ipsec_ah_tra_burst(self):
-        """ ipsec ah v4 transport burst test """
-        try:
-            self.test_ipsec_ah_tra_basic(count=257)
-        finally:
-            self.logger.info(self.vapi.ppcli("show error"))
-            self.logger.info(self.vapi.ppcli("show ipsec"))
-
-    def test_ipsec_ah_tun_basic(self, count=1):
-        """ ipsec ah 4o4 tunnel basic test """
-        try:
-            self.configScapySA(is_tun=True)
-            send_pkts = self.gen_encrypt_pkts(
-                self.remote_tun_sa,
-                self.pg0,
-                src=self.remote_pg0_lb_addr,
-                dst=self.remote_pg1_lb_addr,
-                count=count)
-            recv_pkts = self.send_and_expect(
-                self.pg0, send_pkts, self.pg1, count=count)
-            # ESP TUN VPP decryption verification
-            for recv_pkt in recv_pkts:
-                self.assert_equal(recv_pkt[IP].src, self.remote_pg0_lb_addr)
-                self.assert_equal(recv_pkt[IP].dst, self.remote_pg1_lb_addr)
-            send_pkts = self.gen_pkts(
-                self.pg1,
-                src=self.remote_pg1_lb_addr,
-                dst=self.remote_pg0_lb_addr,
-                count=count)
-            recv_pkts = self.send_and_expect(
-                self.pg1, send_pkts, self.pg0, count=count)
-            # ESP TUN VPP encryption verification
-            for recv_pkt in recv_pkts:
-                decrypt_pkt = self.local_tun_sa.decrypt(recv_pkt[IP])
-                decrypt_pkt = IP(decrypt_pkt[Raw].load)
-                self.assert_equal(decrypt_pkt.src, self.remote_pg1_lb_addr)
-                self.assert_equal(decrypt_pkt.dst, self.remote_pg0_lb_addr)
-        finally:
-            self.logger.info(self.vapi.ppcli("show error"))
-            self.logger.info(self.vapi.ppcli("show ipsec"))
-
-    def test_ipsec_ah_tun_burst(self):
-        """ ipsec ah 4o4 tunnel burst test """
-        try:
-            self.test_ipsec_ah_tun_basic(count=257)
-        finally:
-            self.logger.info(self.vapi.ppcli("show error"))
-            self.logger.info(self.vapi.ppcli("show ipsec"))
+                IPv6(src=src, dst=dst, tc=0) /
+                UDP(sport=4444, dport=4444) /
+                Raw(b'X' * payload_size)
+                for i in range(count)]
+
+    def verify_encrypted(self, p, sa, rxs):
+        # just check that only the DSCP is copied
+        for rx in rxs:
+            self.assertEqual(rx[IP].tos, 0xc)
+
+    def verify_encrypted6(self, p, sa, rxs):
+        # just check that the DSCP & ECN are copied
+        for rx in rxs:
+            self.assertEqual(rx[IPv6].tc, 0x10)
+
+
+class TestIpsecAhHandoff(TemplateIpsecAh,
+                         IpsecTun6HandoffTests,
+                         IpsecTun4HandoffTests):
+    """ Ipsec AH Handoff """
+    pass
+
+
+class TestIpsecAhAll(ConfigIpsecAH,
+                     IpsecTra4, IpsecTra6,
+                     IpsecTun4, IpsecTun6):
+    """ Ipsec AH all Algos """
+
+    def setUp(self):
+        super(TestIpsecAhAll, self).setUp()
+
+    def tearDown(self):
+        super(TestIpsecAhAll, self).tearDown()
+
+    def test_integ_algs(self):
+        """All Engines SHA[1_96, 256, 384, 512] w/ & w/o ESN"""
+        # foreach VPP crypto engine
+        engines = ["ia32", "ipsecmb", "openssl"]
+
+        algos = [{'vpp': VppEnum.vl_api_ipsec_integ_alg_t.
+                  IPSEC_API_INTEG_ALG_SHA1_96,
+                  'scapy': "HMAC-SHA1-96"},
+                 {'vpp': VppEnum.vl_api_ipsec_integ_alg_t.
+                  IPSEC_API_INTEG_ALG_SHA_256_128,
+                  'scapy': "SHA2-256-128"},
+                 {'vpp': VppEnum.vl_api_ipsec_integ_alg_t.
+                  IPSEC_API_INTEG_ALG_SHA_384_192,
+                  'scapy': "SHA2-384-192"},
+                 {'vpp': VppEnum.vl_api_ipsec_integ_alg_t.
+                  IPSEC_API_INTEG_ALG_SHA_512_256,
+                  'scapy': "SHA2-512-256"}]
+
+        flags = [0, (VppEnum.vl_api_ipsec_sad_flags_t.
+                     IPSEC_API_SAD_FLAG_USE_ESN)]
+
+        #
+        # loop through the VPP engines
+        #
+        for engine in engines:
+            self.vapi.cli("set crypto handler all %s" % engine)
+            #
+            # loop through each of the algorithms
+            #
+            for algo in algos:
+                # with self.subTest(algo=algo['scapy']):
+                for flag in flags:
+                    #
+                    # setup up the config paramters
+                    #
+                    self.ipv4_params = IPsecIPv4Params()
+                    self.ipv6_params = IPsecIPv6Params()
+
+                    self.params = {self.ipv4_params.addr_type:
+                                   self.ipv4_params,
+                                   self.ipv6_params.addr_type:
+                                   self.ipv6_params}
+
+                    for _, p in self.params.items():
+                        p.auth_algo_vpp_id = algo['vpp']
+                        p.auth_algo = algo['scapy']
+                        p.flags = p.flags | flag
+
+                    #
+                    # configure the SPDs. SAs, etc
+                    #
+                    self.config_network(self.params.values())
+
+                    #
+                    # run some traffic.
+                    #  An exhautsive 4o6, 6o4 is not necessary for each algo
+                    #
+                    self.verify_tra_basic6(count=17)
+                    self.verify_tra_basic4(count=17)
+                    self.verify_tun_66(self.params[socket.AF_INET6], count=17)
+                    self.verify_tun_44(self.params[socket.AF_INET], count=17)
+
+                    #
+                    # remove the SPDs, SAs, etc
+                    #
+                    self.unconfig_network()
 
 
 if __name__ == '__main__':