From b325983a4461dd806e86a31abc47533b09482157 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Fri, 27 Sep 2019 13:32:02 +0000 Subject: ipsec: support 4o6 and 6o4 for tunnel protect Type: feature Change-Id: Ib2352ca4c7abf4645f21fa16aaaf27408890a2bf Signed-off-by: Neale Ranns --- test/test_ipsec_tun_if_esp.py | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) (limited to 'test/test_ipsec_tun_if_esp.py') diff --git a/test/test_ipsec_tun_if_esp.py b/test/test_ipsec_tun_if_esp.py index 00c1d143c30..28854cefa99 100644 --- a/test/test_ipsec_tun_if_esp.py +++ b/test/test_ipsec_tun_if_esp.py @@ -785,11 +785,17 @@ class TemplateIpsec4TunProtect(object): p.tun_if.add_vpp_config() p.tun_if.admin_up() p.tun_if.config_ip4() + p.tun_if.config_ip6() p.route = VppIpRoute(self, p.remote_tun_if_host, 32, [VppRoutePath(p.tun_if.remote_ip4, 0xffffffff)]) p.route.add_vpp_config() + r = VppIpRoute(self, p.remote_tun_if_host6, 128, + [VppRoutePath(p.tun_if.remote_ip6, + 0xffffffff, + proto=DpoProto.DPO_PROTO_IP6)]) + r.add_vpp_config() def unconfig_network(self, p): p.route.remove_vpp_config() @@ -831,6 +837,13 @@ class TestIpsec4TunProtect(TemplateIpsec, c = p.tun_if.get_tx_stats() self.assertEqual(c['packets'], 127) + self.vapi.cli("clear ipsec sa") + self.verify_tun_64(p, count=127) + c = p.tun_if.get_rx_stats() + self.assertEqual(c['packets'], 254) + c = p.tun_if.get_tx_stats() + self.assertEqual(c['packets'], 254) + # rekey - create new SAs and update the tunnel protection np = copy.copy(p) np.crypt_key = 'X' + p.crypt_key[1:] @@ -847,9 +860,9 @@ class TestIpsec4TunProtect(TemplateIpsec, self.verify_tun_44(np, count=127) c = p.tun_if.get_rx_stats() - self.assertEqual(c['packets'], 254) + self.assertEqual(c['packets'], 381) c = p.tun_if.get_tx_stats() - self.assertEqual(c['packets'], 254) + self.assertEqual(c['packets'], 381) # teardown self.unconfig_protect(np) @@ -1052,12 +1065,17 @@ class TemplateIpsec6TunProtect(object): p.tun_if.add_vpp_config() p.tun_if.admin_up() p.tun_if.config_ip6() + p.tun_if.config_ip4() p.route = VppIpRoute(self, p.remote_tun_if_host, 128, [VppRoutePath(p.tun_if.remote_ip6, 0xffffffff, proto=DpoProto.DPO_PROTO_IP6)]) p.route.add_vpp_config() + r = VppIpRoute(self, p.remote_tun_if_host4, 32, + [VppRoutePath(p.tun_if.remote_ip4, + 0xffffffff)]) + r.add_vpp_config() def unconfig_network(self, p): p.route.remove_vpp_config() @@ -1167,6 +1185,26 @@ class TestIpsec6TunProtect(TemplateIpsec, self.unconfig_sa(np3) self.unconfig_network(p) + def test_tun_46(self): + """IPSEC tunnel protect""" + + p = self.ipv6_params + + self.config_network(p) + self.config_sa_tra(p) + self.config_protect(p) + + self.verify_tun_46(p, count=127) + c = p.tun_if.get_rx_stats() + self.assertEqual(c['packets'], 127) + c = p.tun_if.get_tx_stats() + self.assertEqual(c['packets'], 127) + + # teardown + self.unconfig_protect(p) + self.unconfig_sa(p) + self.unconfig_network(p) + class TestIpsec6TunProtectTun(TemplateIpsec, TemplateIpsec6TunProtect, -- cgit 1.2.3-korg