From 02256fd23bb58280e0b057e2e269d5a97ad43ce9 Mon Sep 17 00:00:00 2001 From: Jafar Al-Gharaibeh Date: Fri, 30 Aug 2024 14:35:31 -0500 Subject: [PATCH] tests: detect all daemons correctly when using frr.conf Signed-off-by: Jafar Al-Gharaibeh --- tests/topotests/lib/topogen.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/topotests/lib/topogen.py b/tests/topotests/lib/topogen.py index f49e30ea5f9c..7941e5c1d233 100644 --- a/tests/topotests/lib/topogen.py +++ b/tests/topotests/lib/topogen.py @@ -832,10 +832,10 @@ def load_frr_config(self, source, daemons=None): for daemon in self.RD: # This will not work for all daemons daemonstr = self.RD.get(daemon).rstrip("d") - if daemonstr == "pim": - grep_cmd = "grep 'ip {}' {}".format(daemonstr, source_path) + if daemonstr == "path": + grep_cmd = "grep 'candidate-path' {}".format(source_path) else: - grep_cmd = "grep 'router {}' {}".format(daemonstr, source_path) + grep_cmd = "grep -w '{}' {}".format(daemonstr, source_path) result = self.run(grep_cmd, warn=False).strip() if result: self.load_config(daemon, "")