From 9dee14bdb82bb4abb08d2accb3d461f26336bfef Mon Sep 17 00:00:00 2001 From: anlan_cs Date: Fri, 31 Dec 2021 00:58:52 -0500 Subject: [PATCH] tools: cleanup route convertion from null0/Null0 to blackhole Signed-off-by: anlan_cs --- tools/frr-reload.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/frr-reload.py b/tools/frr-reload.py index 7de87eb869..acf8161235 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) -- 2.39.5