X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_ipsec_ah.py;h=bc539a2bd03cf22f3097e2684e7f9b8e0a6a95a0;hb=59f71132e;hp=38d97d584c546c4dbee5225601c3c22709dc47db;hpb=92e93844826fc080ea7f3495ba3e06de3f4d03f1;p=vpp.git

diff --git a/test/test_ipsec_ah.py b/test/test_ipsec_ah.py
index 38d97d584c5..bc539a2bd03 100644
--- a/test/test_ipsec_ah.py
+++ b/test/test_ipsec_ah.py
@@ -6,7 +6,8 @@ from scapy.layers.ipsec import AH
 from framework import VppTestRunner
 from template_ipsec import TemplateIpsec, IpsecTra46Tests, IpsecTun46Tests, \
     config_tun_params, config_tra_params, IPsecIPv4Params, IPsecIPv6Params, \
-    IpsecTra4, IpsecTun4, IpsecTra6, IpsecTun6
+    IpsecTra4, IpsecTun4, IpsecTra6, IpsecTun6, \
+    IpsecTun6HandoffTests, IpsecTun4HandoffTests
 from template_ipsec import IpsecTcpTests
 from vpp_ipsec import VppIpsecSA, VppIpsecSpd, VppIpsecSpdEntry,\
         VppIpsecSpdItfBinding
@@ -88,13 +89,13 @@ class ConfigIpsecAH(TemplateIpsec):
             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)],
-                           is_ip6=p.is_ipv6)
+                                         proto=d)])
             r.add_vpp_config()
             self.net_objs.append(r)
         self.logger.info(self.vapi.ppcli("show ipsec all"))
@@ -301,6 +302,13 @@ class TestIpsecAh2(TemplateIpsecAh, IpsecTra46Tests, IpsecTun46Tests):
     pass
 
 
+class TestIpsecAhHandoff(TemplateIpsecAh,
+                         IpsecTun6HandoffTests,
+                         IpsecTun4HandoffTests):
+    """ Ipsec AH Handoff """
+    pass
+
+
 class TestIpsecAhAll(ConfigIpsecAH,
                      IpsecTra4, IpsecTra6,
                      IpsecTun4, IpsecTun6):
@@ -313,7 +321,7 @@ class TestIpsecAhAll(ConfigIpsecAH,
         super(TestIpsecAhAll, self).tearDown()
 
     def test_integ_algs(self):
-        """All Engines SHA[1_96, 256, 394, 512] w/ & w/o ESN"""
+        """All Engines SHA[1_96, 256, 384, 512] w/ & w/o ESN"""
         # foreach VPP crypto engine
         engines = ["ia32", "ipsecmb", "openssl"]
 
@@ -337,7 +345,7 @@ class TestIpsecAhAll(ConfigIpsecAH,
         # loop through the VPP engines
         #
         for engine in engines:
-            self.vapi.cli("set crypto engine all %s" % engine)
+            self.vapi.cli("set crypto handler all %s" % engine)
             #
             # loop through each of the algorithms
             #