From: Don Slice Date: Mon, 11 Nov 2019 20:45:32 +0000 (-0500) Subject: tools: stop repeating lines to delete for multiple bfd timer changes X-Git-Tag: base_7.3~171^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c32ab5cfef8899198dbb0bb4e391f09884d737b7;p=matthieu%2Ffrr.git tools: stop repeating lines to delete for multiple bfd timer changes Problem reported with tracebacks seen when making multiple bfd timer changes in frr.conf and applying via frr-reload.py. Found that when multiple bfd timer changes are made, the same line can be added for deletion more than once, causing the traceback when the deletion is performed. This fix verifies the correct line is being appended for deletion. Ticket: CM-27233 Signed-off-by: Don Slice --- diff --git a/tools/frr-reload.py b/tools/frr-reload.py index e182c77c78..f5784b7ecd 100755 --- a/tools/frr-reload.py +++ b/tools/frr-reload.py @@ -757,7 +757,7 @@ def ignore_delete_re_add_lines(lines_to_add, lines_to_del): bfd_nbr = "neighbor %s" % nbr for (ctx_keys, add_line) in lines_to_add: - re_add_nbr_bfd_timers = re.search(r'neighbor (\S+) bfd (\S+) (\S+) (\S+)', add_line) + re_add_nbr_bfd_timers = re.search(r'neighbor bfd_nbr bfd (\S+) (\S+) (\S+)', add_line) if re_add_nbr_bfd_timers: found_add_bfd_nbr = line_exist(lines_to_add, ctx_keys, bfd_nbr, False)