tools: stop frr-reload squashing le 32 / le 128

frr-reload no longer consolidates ip prefix-list "le 32" or "le 128"
rules when a "ge" is present, more accurately representing existing user
config and reflecting also what is accepted in CLI.

Signed-off-by: Wesley Coakley <wcoakley@nvidia.com>
This commit is contained in:
Wesley Coakley 2021-05-06 12:31:37 -04:00
parent 92046e6540
commit d7e594edd2
No known key found for this signature in database
GPG Key ID: 1812D90223E9C96D

View File

@ -423,17 +423,6 @@ class Config(object):
re_lege.group(2),
re_lege.group(4),
)
re_lege = re.search(r"(.*)ge\s+(\d+)\s+le\s+(\d+)(.*)", legestr)
if re_lege and (
(re_key_rt.group(1) == "ip" and re_lege.group(3) == "32")
or (re_key_rt.group(1) == "ipv6" and re_lege.group(3) == "128")
):
legestr = "%sge %s%s" % (
re_lege.group(1),
re_lege.group(2),
re_lege.group(4),
)
key[0] = "%s prefix-list%s%s %s%s" % (
re_key_rt.group(1),