proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 22:10:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16534 from opensourcerouting/fix/start_ldpd_if_unified

Browse Source 
doc: Document on how to start specific daemons with unified config in topotests
This commit is contained in:
Donald Sharp 2024-08-12 10:25:54 -04:00 committed by GitHub
commit c4fdc837c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/developer/topotests.rst
View File

@ -1332,6 +1332,15 @@ Example:
router.load_config(TopoRouter.RD_ZEBRA, "zebra.conf") router.load_config(TopoRouter.RD_ZEBRA, "zebra.conf")
router.load_config(TopoRouter.RD_OSPF) router.load_config(TopoRouter.RD_OSPF)
or using unified config (specifying which daemons to run is optional):
.. code:: py
for _, (rname, router) in enumerate(router_list.items(), 1):
router.load_frr_config(os.path.join(CWD, "{}/frr.conf".format(rname)), [
TopoRouter.RD_ZEBRA
TopoRouter.RD_MGMTD,
TopoRouter.RD_BGP])
- The topology definition or build function - The topology definition or build function

4
tests/topotests/lib/topotest.py
View File

@ -1430,7 +1430,7 @@ class Router(Node):
self.daemondir = None self.daemondir = None
self.hasmpls = False self.hasmpls = False
self.routertype = "frr" self.routertype = "frr"
self.unified_config = None self.unified_config = False
self.daemons = { self.daemons = {
"zebra": 0, "zebra": 0,
"ripd": 0, "ripd": 0,
@ -1653,7 +1653,7 @@ class Router(Node):
# print "Daemons before:", self.daemons # print "Daemons before:", self.daemons
if daemon in self.daemons.keys() or daemon == "frr": if daemon in self.daemons.keys() or daemon == "frr":
if daemon == "frr": if daemon == "frr":
self.unified_config = 1 self.unified_config = True
else: else:
self.daemons[daemon] = 1 self.daemons[daemon] = 1
if param is not None: if param is not None: