]> git.puffer.fish Git - matthieu/frr.git/commitdiff
bgpd: Skip empty (auto created) VRF instances when deleting a default BGP instance
authorDonatas Abraitis <donatas@opensourcerouting.org>
Mon, 15 Jul 2024 13:20:31 +0000 (16:20 +0300)
committerMergify <37929162+mergify[bot]@users.noreply.github.com>
Tue, 16 Jul 2024 14:10:07 +0000 (14:10 +0000)
Auto created VRF instances does not have any config, so it's not relevant
depending on them.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit bfedb38110e8d3e5471718a0f9abe8836ffc7143)

bgpd/bgp_vty.c

index 082dcdeba53caf28dcf1d23985a888b02867947c..38c335f75a3fa21f21d0232b6263c99459d058c6 100644 (file)
@@ -1701,6 +1701,10 @@ DEFUN (no_router_bgp,
                        for (ALL_LIST_ELEMENTS_RO(bm->bgp, node, tmp_bgp)) {
                                if (tmp_bgp->inst_type != BGP_INSTANCE_TYPE_VRF)
                                        continue;
+
+                               if (CHECK_FLAG(tmp_bgp->vrf_flags, BGP_VRF_AUTO))
+                                       continue;
+
                                if (CHECK_FLAG(
                                            tmp_bgp->af_flags[AFI_IP]
                                                             [SAFI_UNICAST],