]> git.proxmox.com Git - mirror_frr.git/commitdiff
tools: stop frr-reload squashing le 32 / le 128
authorWesley Coakley <wcoakley@nvidia.com>
Thu, 6 May 2021 16:31:37 +0000 (12:31 -0400)
committerWesley Coakley <wcoakley@nvidia.com>
Thu, 6 May 2021 16:31:37 +0000 (12:31 -0400)
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>
tools/frr-reload.py

index a617c0a9c5e1168ff4a1c263b8f94c2c0a2d853c..c28a971525aeaf76185db21e8b7c21a7b3f971bd 100755 (executable)
@@ -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),