Merge pull request #14713 from chiragshah6/mdev1

tools: fix frr-reload route-map desc cmd
This commit is contained in:
Donatas Abraitis 2023-11-02 13:38:23 +02:00 committed by GitHub
commit 94bb396811
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1094,9 +1094,22 @@ def ignore_delete_re_add_lines(lines_to_add, lines_to_del):
lines_to_add_to_del = []
lines_to_del_to_del = []
index = 0
for (ctx_keys, line) in lines_to_del:
deleted = False
# no form of route-map description command only
# accept 'no description', replace 'no description blah'
# to just 'no description'.
index = index + 1
if (
ctx_keys[0].startswith("route-map")
and line
and line.startswith("description ")
):
lines_to_del.remove((ctx_keys, line))
lines_to_del.insert(index, (ctx_keys, "description"))
# If there is a change in the segment routing block ranges, do it
# in-place, to avoid requesting spurious label chunks which might fail
if line and "segment-routing global-block" in line: