Merge pull request #16701 from Jafaral/unified-config

tests: detect all daemons correctly when using frr.conf
FRRouting · Aug 31, 2024 · 3bf359b · 3bf359b
2 parents 0c14da4 + 02256fd
commit 3bf359b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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, "")