proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 20:22:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16952 from anlancs/fix/tools-pim-interface-wrong

Browse Source 
tools: fix missing check interfaces for reloading pim
This commit is contained in:
Jafar Al-Gharaibeh 2024-10-01 14:30:35 -05:00 committed by GitHub
commit 65f27f2998
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/frr-reload.py
View File

@ -1140,14 +1140,14 @@ def pim_delete_move_lines(lines_to_add, lines_to_del):
# they are implicitly deleted by 'no ip pim'. # they are implicitly deleted by 'no ip pim'.
# Remove all such depdendent options from delete # Remove all such depdendent options from delete
# pending list. # pending list.
pim_disable = False pim_disable = []
lines_to_del_to_del = [] lines_to_del_to_del = []
index = -1 index = -1
for ctx_keys, line in lines_to_del: for ctx_keys, line in lines_to_del:
index = index + 1 index = index + 1
if ctx_keys[0].startswith("interface") and line and line == "ip pim": if ctx_keys[0].startswith("interface") and line and line == "ip pim":
pim_disable = True pim_disable.append(ctx_keys[0])
# no ip msdp peer <> does not accept source so strip it off. # no ip msdp peer <> does not accept source so strip it off.
if line and line.startswith("ip msdp peer "): if line and line.startswith("ip msdp peer "):
@ -1158,14 +1158,14 @@ def pim_delete_move_lines(lines_to_add, lines_to_del):
lines_to_del.remove((ctx_keys, line)) lines_to_del.remove((ctx_keys, line))
lines_to_del.insert(index, (ctx_keys, new_line)) lines_to_del.insert(index, (ctx_keys, new_line))
if pim_disable: for ctx_keys, line in lines_to_del:
for ctx_keys, line in lines_to_del: if (
if ( ctx_keys[0] in pim_disable
ctx_keys[0].startswith("interface") and ctx_keys[0].startswith("interface")
and line and line
and (line.startswith("ip pim ") or line.startswith("ip multicast ")) and (line.startswith("ip pim ") or line.startswith("ip multicast "))
): ):
lines_to_del_to_del.append((ctx_keys, line)) lines_to_del_to_del.append((ctx_keys, line))
for ctx_keys, line in lines_to_del_to_del: for ctx_keys, line in lines_to_del_to_del:
lines_to_del.remove((ctx_keys, line)) lines_to_del.remove((ctx_keys, line))