Skip to content

tests: Allow bfdd to be part of the unified config world #22329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
donaldsharp wants to merge 1 commit into
base: stable/10.5
Choose a base branch
from
+6 −2
Open

tests: Allow bfdd to be part of the unified config world #22329

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions tests/topotests/lib/topogen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,8 +847,12 @@ def load_frr_config(self, source, daemons=None):
# Always add zebra
self.load_config(self.RD_ZEBRA, "")
for daemon in self.RD:
# This will not work for all daemons
daemonstr = self.RD.get(daemon).rstrip("d")
# Special case for bfdd - search for 'bfd' in config files, not 'bf' which is too generic
if daemon == self.RD_BFD:
daemonstr = "bfd"
else:
daemonstr = self.RD.get(daemon).rstrip("d")

if daemonstr == "path":
grep_cmd = "grep 'candidate-path' {}".format(source_path)
else:
Expand Down
Loading