Skip to content

Commit

Permalink
tests: Start ldpd if unified config is used in topotests
Browse files Browse the repository at this point in the history
E.g.:

```
for _, (rname, router) in enumerate(router_list.items(), 1):
    router.load_frr_config(os.path.join(CWD, "{}/frr.conf".format(rname)))
```

Signed-off-by: Donatas Abraitis <[email protected]>
  • Loading branch information
ton31337 committed Aug 9, 2024
1 parent 536d478 commit b367664
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion tests/topotests/lib/topotest.py
Original file line number Diff line number Diff line change
Expand Up @@ -1749,7 +1749,8 @@ def startRouter(self, tgen=None):
self.removeIPs()
# If ldp is used, check for LDP to be compiled and Linux Kernel to be 4.5 or higher
# No error - but return message and skip all the tests
if self.daemons["ldpd"] == 1:
if self.daemons["ldpd"] == 1 or self.unified_config:
self.daemons["ldpd"] = 1
ldpd_path = os.path.join(self.daemondir, "ldpd")
if not os.path.isfile(ldpd_path):
logger.info("LDP Test, but no ldpd compiled or installed")
Expand Down

0 comments on commit b367664

Please sign in to comment.