Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

tools: Fix frr-reload to support legacy pim configuration from file

Browse source 
Fix load from file in frr-reload to detect and convert legacy pim
configuration so that the tool can continue to be used with legacy
configurations.

Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
This commit is contained in:
Nathan Bahr 2024-06-17 12:58:30 -05:00
parent fd8edc3dfb
commit 98d47f43fb
1 changed files with 60 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
tools/frr-reload.py
View file

@ -94,7 +94,7 @@ class Vtysh(object):
output = self("configure")
if "VTY configuration is locked by other VTY" in output:
if "configuration is locked" in output.lower():
log.error("vtysh 'configure' returned\n%s\n" % (output))
return False
@ -261,6 +261,8 @@ ctx_keywords = {
"router ospf6": {},
"router eigrp ": {},
"router babel": {},
"router pim": {},
"router pim6": {},
"mpls ldp": {"address-family ": {"interface ": {}}},
"l2vpn ": {"member pseudowire ": {}},
"key chain ": {"key ": {}},
@ -306,12 +308,62 @@ class Config(object):
file_output = self.vtysh.mark_file(filename)
vrf_context = None
pim_vrfs = []
for line in file_output.split("\n"):
line = line.strip()
# Compress duplicate whitespaces
line = " ".join(line.split())
# Detect when we are within a vrf context for converting legacy PIM commands
if vrf_context:
re_vrf = re.match("^(exit-vrf|exit|end)$", line)
if re_vrf:
vrf_context = None
else:
re_vrf = re.match("^vrf ([a-z]+)$", line)
if re_vrf:
vrf_context = re_vrf.group(1)
# 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)
if re_pim and re_pim.group(2):
router_pim = "router pim"
if re_pim.group(1):
router_pim += "6"
if vrf_context:
router_pim += " vrf " + vrf_context
if vrf_context:
pim_vrfs.append(router_pim)
pim_vrfs.append(re_pim.group(2))
pim_vrfs.append("exit")
line="# PIM VRF LINE MOVED TO ROUTER PIM"
else:
self.lines.append(router_pim)
self.lines.append(re_pim.group(2))
line = "exit"
re_pim = re.match("^ip(v6)? ((ssmpingd|msdp).*)$", line)
if re_pim and re_pim.group(2):
router_pim = "router pim"
if re_pim.group(1):
router_pim += "6"
if vrf_context:
router_pim += " vrf " + vrf_context
if vrf_context:
pim_vrfs.append(router_pim)
pim_vrfs.append(re_pim.group(2))
pim_vrfs.append("exit")
line="# PIM VRF LINE MOVED TO ROUTER PIM"
else:
self.lines.append(router_pim)
self.lines.append(re_pim.group(2))
line = "exit"
# Remove 'vrf <vrf_name>' from 'interface <x> vrf <vrf_name>'
if line.startswith("interface ") and "vrf" in line:
line = get_normalized_interface_vrf(line)
@ -348,6 +400,8 @@ class Config(object):
self.lines.append(line)
self.lines.append(pim_vrfs)
self.load_contexts()
def load_from_show_running(self, daemon):
@ -1683,9 +1737,11 @@ def compare_context_objects(newconf, running):
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"):
elif (
running_ctx_keys[0].startswith("interface")
or 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))