Skip to content

Commit

Permalink
Merge pull request #14713 from chiragshah6/mdev1
Browse files Browse the repository at this point in the history
tools: fix frr-reload route-map desc cmd
  • Loading branch information
ton31337 authored Nov 2, 2023
2 parents 081d1a4 + 989991c commit 94bb396
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions tools/frr-reload.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 94bb396

Please sign in to comment.