Merge pull request #5377 from dslicenc/tools-bfd-timer-fix

tools: resolve issue with bfd timer change fix in frr-reload.py
This commit is contained in:
Sri Mohana Singamsetty 2019-11-19 10:35:35 -08:00 committed by GitHub
commit 247c9ef645
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -755,9 +755,10 @@ def ignore_delete_re_add_lines(lines_to_add, lines_to_del):
if re_nbr_bfd_timers:
nbr = re_nbr_bfd_timers.group(1)
bfd_nbr = "neighbor %s" % nbr
bfd_search_string = bfd_nbr + r' bfd (\S+) (\S+) (\S+)'
for (ctx_keys, add_line) in lines_to_add:
re_add_nbr_bfd_timers = re.search(r'neighbor bfd_nbr bfd (\S+) (\S+) (\S+)', add_line)
re_add_nbr_bfd_timers = re.search(bfd_search_string, add_line)
if re_add_nbr_bfd_timers:
found_add_bfd_nbr = line_exist(lines_to_add, ctx_keys, bfd_nbr, False)