summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas@opensourcerouting.org>2025-01-21 16:28:28 +0200
committerGitHub <noreply@github.com>2025-01-21 16:28:28 +0200
commit5f231287a31c48d5a1dd873b0688f9177bb507cb (patch)
treef2f39e4623f7246750f2ddaa302cc3fd69290b0c /tools
parent4f65107d20901b136aa158b18e484a15df166cf0 (diff)
parentf1a1703a0a2c2ecd81f50ccd384dcdb7e0c1a793 (diff)
Merge pull request #16723 from jklaiber/fix-reload-interface-deletion
tools: fix reload interface deletion
Diffstat (limited to 'tools')
-rwxr-xr-xtools/frr-reload.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/frr-reload.py b/tools/frr-reload.py
index 3ea63ce2a3..a138e4e239 100755
--- a/tools/frr-reload.py
+++ b/tools/frr-reload.py
@@ -1757,12 +1757,13 @@ def compare_context_objects(newconf, running):
delete_bgpd = True
lines_to_del.append((running_ctx_keys, None))
- # We cannot do 'no interface' or 'no vrf' in FRR, and so deal with it
- elif (
- running_ctx_keys[0].startswith("interface")
- or running_ctx_keys[0].startswith("vrf")
- or running_ctx_keys[0].startswith("router pim")
- ):
+ elif running_ctx_keys[0].startswith("interface"):
+ lines_to_del.append((running_ctx_keys, None))
+
+ # We cannot do 'no vrf' in FRR, and so deal with it
+ elif running_ctx_keys[0].startswith("vrf") or running_ctx_keys[
+ 0
+ ].startswith("router pim"):
for line in running_ctx.lines:
lines_to_del.append((running_ctx_keys, line))