summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas@opensourcerouting.org>2025-01-14 08:07:14 +0100
committerGitHub <noreply@github.com>2025-01-14 08:07:14 +0100
commit1e1c70faac61b5e449cb4cee2ee0389ab39c9ddb (patch)
treedc22d4fb79ad645dfee896f5d0b0d059298f5aa8
parentMerge pull request #17843 from LabNConsulting/chopps/new-docker-and-doc (diff)
parenttools: fix frr-reload for nbr deletion of no form cmds (diff)
downloadfrr-1e1c70faac61b5e449cb4cee2ee0389ab39c9ddb.tar.xz
frr-1e1c70faac61b5e449cb4cee2ee0389ab39c9ddb.zip
Merge pull request #17847 from chiragshah6/freloadfix
tools: fix frr-reload for nbr deletion of no form cmds
-rwxr-xr-xtools/frr-reload.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/frr-reload.py b/tools/frr-reload.py
index dba50b3c5..3ea63ce2a 100755
--- a/tools/frr-reload.py
+++ b/tools/frr-reload.py
@@ -948,10 +948,14 @@ def bgp_remove_neighbor_cfg(lines_to_del, del_nbr_dict):
lines_to_del_to_del = []
for ctx_keys, line in lines_to_del:
+ # lines_to_del has following
+ # (('router bgp 100',), 'neighbor swp1.10 interface peer-group dpeergrp_2'),
+ # (('router bgp 100',), 'neighbor swp1.10 advertisement-interval 1'),
+ # (('router bgp 100',), 'no neighbor swp1.10 capability dynamic'),
if (
ctx_keys[0].startswith("router bgp")
and line
- and line.startswith("neighbor ")
+ and ((line.startswith("neighbor ") or line.startswith("no neighbor ")))
):
if ctx_keys[0] in del_nbr_dict:
for nbr in del_nbr_dict[ctx_keys[0]]: