Merge pull request #14899 from FRRouting/mergify/bp/stable/9.1/pr-14897

tools: fix frr-reload interface desc cmd (backport #14897)
This commit is contained in:
Donatas Abraitis 2023-11-29 13:16:59 +02:00 committed by GitHub
commit d0c3636c4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1110,6 +1110,17 @@ def ignore_delete_re_add_lines(lines_to_add, lines_to_del):
lines_to_del.remove((ctx_keys, line))
lines_to_del.insert(index, (ctx_keys, "description"))
# interface x ; description blah
# no form of description does not accept any argument,
# strip arg before rendering
if (
ctx_keys[0].startswith("interface ")
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: