diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2024-08-31 08:56:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-31 08:56:55 -0400 |
| commit | 3bf359b04eb214fcc88df37a855d6abde5b07271 (patch) | |
| tree | 1148cfb509aec81f0faba319c5fdbc6063254380 | |
| parent | 0c14da41211860862fca41a6ce173cf882af0148 (diff) | |
| parent | 02256fd23bb58280e0b057e2e269d5a97ad43ce9 (diff) | |
Merge pull request #16701 from Jafaral/unified-config
tests: detect all daemons correctly when using frr.conf
| -rw-r--r-- | tests/topotests/lib/topogen.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/topotests/lib/topogen.py b/tests/topotests/lib/topogen.py index f49e30ea5f..7941e5c1d2 100644 --- a/tests/topotests/lib/topogen.py +++ b/tests/topotests/lib/topogen.py @@ -832,10 +832,10 @@ class TopoRouter(TopoGear): 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, "") |