summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas.abraitis@gmail.com>2020-05-08 18:56:01 +0300
committerGitHub <noreply@github.com>2020-05-08 18:56:01 +0300
commit555fc63c751d27aa3ee0e1b8190b2d059a42c0a0 (patch)
tree454be2c5fbea178e903b81abdf51385ceb89dc45
parenta6f1ad43f0939c2cbb6d68fd42b485eea520a144 (diff)
parentca7f04961d46b58952dde38d84a7483da53018cc (diff)
Merge pull request #6348 from dslicenc/frr-reload-bfd
tools: fix frr traceback on bgp neighbor bfd deletion
-rwxr-xr-xtools/frr-reload.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/frr-reload.py b/tools/frr-reload.py
index 1f9f425386..123c11db33 100755
--- a/tools/frr-reload.py
+++ b/tools/frr-reload.py
@@ -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+)'
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:
- found_add_bfd_nbr = line_exist(lines_to_add, ctx_keys, bfd_nbr, False)
+ if re_add_nbr_bfd_timers:
+ found_add_bfd_nbr = line_exist(lines_to_add, ctx_keys, bfd_nbr, False)
- if found_add_bfd_nbr:
- lines_to_del_to_del.append((ctx_keys, line))
+ if found_add_bfd_nbr:
+ lines_to_del_to_del.append((ctx_keys, line))
'''
We changed how we display the neighbor interface command. Older