proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 08:32:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16425 from opensourcerouting/fix/do_not_prepend_an_empty_list_for_pim_vrfs

Browse Source 
tools: Do not append an empty list (pim_vrfs) to the config lines
This commit is contained in:
Jafar Al-Gharaibeh 2024-07-21 14:01:16 -04:00 committed by GitHub
commit 04b818dd4c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/frr-reload.py
View File

@ -328,7 +328,10 @@ class Config(object):
vrf_context = re_vrf.group(1) vrf_context = re_vrf.group(1)
# Detect legacy pim commands that need to move under the router pim context # Detect legacy pim commands that need to move under the router pim context
re_pim = re.match("^ip(v6)? pim ((ecmp|join|keep|mlag|packets|register|rp|send|spt|ssm).*)$", line) re_pim = re.match(
"^ip(v6)? pim ((ecmp|join|keep|mlag|packets|register|rp|send|spt|ssm).*)$",
line,
)
if re_pim and re_pim.group(2): if re_pim and re_pim.group(2):
router_pim = "router pim" router_pim = "router pim"
if re_pim.group(1): if re_pim.group(1):
@ -340,7 +343,7 @@ class Config(object):
pim_vrfs.append(router_pim) pim_vrfs.append(router_pim)
pim_vrfs.append(re_pim.group(2)) pim_vrfs.append(re_pim.group(2))
pim_vrfs.append("exit") pim_vrfs.append("exit")
line="# PIM VRF LINE MOVED TO ROUTER PIM" line = "# PIM VRF LINE MOVED TO ROUTER PIM"
else: else:
self.lines.append(router_pim) self.lines.append(router_pim)
self.lines.append(re_pim.group(2)) self.lines.append(re_pim.group(2))
@ -358,7 +361,7 @@ class Config(object):
pim_vrfs.append(router_pim) pim_vrfs.append(router_pim)
pim_vrfs.append(re_pim.group(2)) pim_vrfs.append(re_pim.group(2))
pim_vrfs.append("exit") pim_vrfs.append("exit")
line="# PIM VRF LINE MOVED TO ROUTER PIM" line = "# PIM VRF LINE MOVED TO ROUTER PIM"
else: else:
self.lines.append(router_pim) self.lines.append(router_pim)
self.lines.append(re_pim.group(2)) self.lines.append(re_pim.group(2))
@ -400,7 +403,8 @@ class Config(object):
self.lines.append(line) self.lines.append(line)
self.lines.append(pim_vrfs) if len(pim_vrfs) > 0:
self.lines.append(pim_vrfs)
self.load_contexts() self.load_contexts()