Skip to content

Commit

Permalink
Merge pull request #14899 from FRRouting/mergify/bp/stable/9.1/pr-14897
Browse files Browse the repository at this point in the history
tools: fix frr-reload interface desc cmd (backport #14897)
  • Loading branch information
ton31337 authored Nov 29, 2023
2 parents 5cd2981 + 2e7a905 commit d0c3636
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions tools/frr-reload.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit d0c3636

Please sign in to comment.