From: Neale Ranns <nranns@cisco.com>
Date: Wed, 25 Nov 2020 19:35:38 +0000 (+0000)
Subject: ipsec: A P2MP ipsec interface is NBMA
X-Git-Tag: v21.06-rc0~116
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=cfe949dbf001d8fa18301ecc11c644f8cb39c5d7;p=vpp.git

ipsec: A P2MP ipsec interface is NBMA

Type: fix

Signed-off-by: Neale Ranns <nranns@cisco.com>
Change-Id: I1922463683201215933e9f85b587d7c7123f3bfd
---

diff --git a/src/vnet/ipsec/ipsec_itf.c b/src/vnet/ipsec/ipsec_itf.c
index 8fbb1c42ed6..97a43875989 100644
--- a/src/vnet/ipsec/ipsec_itf.c
+++ b/src/vnet/ipsec/ipsec_itf.c
@@ -208,6 +208,7 @@ VNET_HW_INTERFACE_CLASS(ipsec_p2mp_hw_interface_class) = {
   .name = "IPSec",
   .build_rewrite = ipsec_itf_build_rewrite_i,
   .update_adjacency = ipsec_itf_update_adj,
+  .flags = VNET_HW_INTERFACE_CLASS_FLAG_NBMA,
 };
 /* *INDENT-ON* */
 
diff --git a/test/test_ipsec_tun_if_esp.py b/test/test_ipsec_tun_if_esp.py
index ba421694d60..f505fa0ebc6 100644
--- a/test/test_ipsec_tun_if_esp.py
+++ b/test/test_ipsec_tun_if_esp.py
@@ -2869,6 +2869,8 @@ class TestIpsecMIfEsp4(TemplateIpsec, IpsecTun4):
         p.tun_if.add_vpp_config()
         p.tun_if.admin_up()
         p.tun_if.config_ip4()
+        p.tun_if.unconfig_ip4()
+        p.tun_if.config_ip4()
         p.tun_if.generate_remote_hosts(N_NHS)
         self.pg0.generate_remote_hosts(N_NHS)
         self.pg0.configure_ipv4_neighbors()