]> git.puffer.fish Git - mirror/frr.git/commitdiff
pimd: skip displaying pim config on the vxlan termination device ipmr-lo
authorAnuradha Karuppiah <anuradhak@cumulusnetworks.com>
Thu, 18 Jun 2020 22:55:02 +0000 (15:55 -0700)
committerAnuradha Karuppiah <anuradhak@nvidia.com>
Mon, 30 Nov 2020 20:50:33 +0000 (12:50 -0800)
pim is enabled internally/implicitly on the vxlan termination device
and displaying that can confuse the admin and tools (such as
frr-reload).

Ticket: CM-30180

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
pimd/pim_vty.c

index 1f2ca11db3bd373cc74620279114221d2a9b1bc3..57a0c691661a18664aa0a2ec4cab1242e064e5ed 100644 (file)
@@ -275,6 +275,13 @@ int pim_interface_config_write(struct vty *vty)
                        continue;
 
                FOR_ALL_INTERFACES (pim->vrf, ifp) {
+                       /* pim is enabled internally/implicitly on the vxlan
+                        * termination device ipmr-lo. skip displaying that
+                        * config to avoid confusion
+                        */
+                       if (pim_vxlan_is_term_dev_cfg(pim, ifp))
+                               continue;
+
                        /* IF name */
                        if (vrf->vrf_id == VRF_DEFAULT)
                                vty_frame(vty, "interface %s\n", ifp->name);