proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-29 19:47:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools: fix frr traceback on bgp neighbor bfd deletion

Browse Source 
Problem reported that with certain configs, when the user
deleted a "neighbor x.x.x.x bfd 4 100 100" statement from
frr.conf and then reloaded, a traceback was seen and the
deletion did not succeed.  Found that in some scenarios
it was possible to have something in lines_to_add that
was in a different context and when the re.search was
attempted, it found an empy line and was unhappy.  This
fix avoids trying to search in the wrong context.

Ticket: CM-29145
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
This commit is contained in:
Don Slice 2020-04-27 19:34:08 +00:00
parent 44fb33ee58
commit ca7f04961d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/frr-reload.py
View File

@ -779,13 +779,14 @@ def ignore_delete_re_add_lines(lines_to_add, lines_to_del):
bfd_search_string = bfd_nbr + r' bfd (\S+) (\S+) (\S+)' bfd_search_string = bfd_nbr + r' bfd (\S+) (\S+) (\S+)'
for (ctx_keys, add_line) in lines_to_add: for (ctx_keys, add_line) in lines_to_add:
re_add_nbr_bfd_timers = re.search(bfd_search_string, add_line) if ctx_keys[0].startswith('router bgp'):
re_add_nbr_bfd_timers = re.search(bfd_search_string, add_line)
if re_add_nbr_bfd_timers: if re_add_nbr_bfd_timers:
found_add_bfd_nbr = line_exist(lines_to_add, ctx_keys, bfd_nbr, False) found_add_bfd_nbr = line_exist(lines_to_add, ctx_keys, bfd_nbr, False)
if found_add_bfd_nbr: if found_add_bfd_nbr:
lines_to_del_to_del.append((ctx_keys, line)) lines_to_del_to_del.append((ctx_keys, line))
''' '''
We changed how we display the neighbor interface command. Older We changed how we display the neighbor interface command. Older