proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-10-31 18:40:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8345 from dslicenc/frr-reload-vrf-static

Browse Source 
Frr reload vrf static
This commit is contained in:
Mark Stapp 2021-03-31 16:52:43 -04:00 committed by GitHub
commit d6cfe1b884
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 57 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
tools/frr-reload.py
View File

@ -108,7 +108,7 @@ class Vtysh(object):
stdout, stderr = proc.communicate()
if proc.wait() != 0:
if stdouts is not None:
stdouts.append(stdout.decode('UTF-8'))
stdouts.append(stdout.decode("UTF-8"))
raise VtyshException(
'vtysh returned status %d for command "%s"' % (proc.returncode, command)
)
@ -279,6 +279,35 @@ class Config(object):
if ":" in line:
line = get_normalized_mac_ip_line(line)
"""
vrf static routes can be added in two ways. The old way is:
"ip route x.x.x.x/x y.y.y.y vrf <vrfname>"
but it's rendered in the configuration as the new way::
vrf <vrf-name>
ip route x.x.x.x/x y.y.y.y
exit-vrf
this difference causes frr-reload to not consider them a
match and delete vrf static routes incorrectly.
fix the old way to match new "show running" output so a
proper match is found.
"""
if (
line.startswith("ip route ") or line.startswith("ipv6 route ")
) and " vrf " in line:
newline = line.split(" ")
vrf_index = newline.index("vrf")
vrf_ctx = newline[vrf_index] + " " + newline[vrf_index + 1]
del newline[vrf_index : vrf_index + 2]
newline = " ".join(newline)
self.lines.append(vrf_ctx)
self.lines.append(newline)
self.lines.append("exit-vrf")
line = "end"
self.lines.append(line)
self.load_contexts()
@ -460,6 +489,23 @@ class Config(object):
):
key[0] = re.sub(r"\s+null0(\s*$)", " Null0", key[0])
"""
Similar to above, but when the static is in a vrf, it turns into a
blackhole nexthop for both null0 and Null0. Fix it accordingly
"""
if lines and key[0].startswith("vrf "):
newlines = []
for line in lines:
if line.startswith("ip route ") or line.startswith("ipv6 route "):
if "null0" in line:
line = re.sub(r"\s+null0(\s*$)", " blackhole", line)
elif "Null0" in line:
line = re.sub(r"\s+Null0(\s*$)", " blackhole", line)
newlines.append(line)
else:
newlines.append(line)
lines = newlines
if lines:
if tuple(key) not in self.contexts:
ctx = Context(tuple(key), lines)
@ -582,11 +628,13 @@ end
if line.startswith("!") or line.startswith("#"):
continue
if (len(ctx_keys) == 2
and ctx_keys[0].startswith('bfd')
and ctx_keys[1].startswith('profile ')
and line == 'end'):
log.debug('LINE %-50s: popping from sub context, %-50s', line, ctx_keys)
if (
len(ctx_keys) == 2
and ctx_keys[0].startswith("bfd")
and ctx_keys[1].startswith("profile ")
and line == "end"
):
log.debug("LINE %-50s: popping from sub context, %-50s", line, ctx_keys)
if main_ctx_key:
self.save_contexts(ctx_keys, current_context_lines)
@ -907,9 +955,9 @@ end
ctx_keys.append(line)
elif (
line.startswith('profile ')
line.startswith("profile ")
and len(ctx_keys) == 1
and ctx_keys[0].startswith('bfd')
and ctx_keys[0].startswith("bfd")
):
# Save old context first
@ -918,7 +966,7 @@ end
main_ctx_key = copy.deepcopy(ctx_keys)
log.debug(
"LINE %-50s: entering BFD profile sub-context, append to ctx_keys",
line
line,
)
ctx_keys.append(line)