summaryrefslogtreecommitdiffstats
path: root/tools/frr-reload.py
diff options
context:
space:
mode:
authoranlan_cs <anlan_cs@tom.com>2021-12-31 06:58:52 +0100
committeranlan_cs <anlan_cs@tom.com>2021-12-31 06:59:22 +0100
commit9dee14bdb82bb4abb08d2accb3d461f26336bfef (patch)
tree6ef69f472e2643b959b8636128a42b88d6633c76 /tools/frr-reload.py
parentMerge pull request #10219 from donaldsharp/l3vpn_to_bgp_vrf_fixes (diff)
downloadfrr-9dee14bdb82bb4abb08d2accb3d461f26336bfef.tar.xz
frr-9dee14bdb82bb4abb08d2accb3d461f26336bfef.zip
tools: cleanup route convertion from null0/Null0 to blackhole
Signed-off-by: anlan_cs <anlan_cs@tom.com>
Diffstat (limited to 'tools/frr-reload.py')
-rwxr-xr-xtools/frr-reload.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/frr-reload.py b/tools/frr-reload.py
index 7de87eb86..acf816123 100755
--- a/tools/frr-reload.py
+++ b/tools/frr-reload.py
@@ -430,16 +430,12 @@ 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)
+ line = re.sub(r"\s+null0(\s*$)", " Null0", line)
newlines.append(line)
else:
newlines.append(line)