diff options
| author | Don Slice <dslice@cumulusnetworks.com> | 2019-11-11 21:45:32 +0100 |
|---|---|---|
| committer | Don Slice <dslice@cumulusnetworks.com> | 2019-11-13 16:19:36 +0100 |
| commit | c32ab5cfef8899198dbb0bb4e391f09884d737b7 (patch) | |
| tree | 7bdaed8dfa2bfa176ea3197fcd78f21d220923bf /tools/frr-reload.py | |
| parent | Merge pull request #5307 from ton31337/fix/bgp_dampening_per_afi_safi (diff) | |
| download | frr-c32ab5cfef8899198dbb0bb4e391f09884d737b7.tar.xz frr-c32ab5cfef8899198dbb0bb4e391f09884d737b7.zip | |
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 <dslice@cumulusnetworks.com>
Diffstat (limited to 'tools/frr-reload.py')
| -rwxr-xr-x | tools/frr-reload.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/frr-reload.py b/tools/frr-reload.py index e182c77c7..f5784b7ec 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) |