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

Merge pull request #13541 from LabNConsulting/chopps/fixtestdefconf

Browse Source 
tests: fix implicit config file and recently added logic error
This commit is contained in:
Donatas Abraitis 2023-05-18 09:44:38 +03:00 committed by GitHub
commit c374605ecb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/topotests/bgp_auth/test_bgp_auth1.py
View File

@ -158,8 +158,8 @@ def setup_module(mod):
# For all registered routers, load the zebra configuration file # For all registered routers, load the zebra configuration file
for rname, router in router_list.items(): for rname, router in router_list.items():
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, "")
router.load_config(TopoRouter.RD_BGP) router.load_config(TopoRouter.RD_BGP, "")
# After copying the configurations, this function loads configured daemons. # After copying the configurations, this function loads configured daemons.
tgen.start_router() tgen.start_router()

4
tests/topotests/bgp_auth/test_bgp_auth2.py
View File

@ -158,8 +158,8 @@ def setup_module(mod):
# For all registered routers, load the zebra configuration file # For all registered routers, load the zebra configuration file
for rname, router in router_list.items(): for rname, router in router_list.items():
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, "")
router.load_config(TopoRouter.RD_BGP) router.load_config(TopoRouter.RD_BGP, "")
# After copying the configurations, this function loads configured daemons. # After copying the configurations, this function loads configured daemons.
tgen.start_router() tgen.start_router()

4
tests/topotests/bgp_auth/test_bgp_auth3.py
View File

@ -157,8 +157,8 @@ def setup_module(mod):
# For all registered routers, load the zebra configuration file # For all registered routers, load the zebra configuration file
for rname, router in router_list.items(): for rname, router in router_list.items():
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, "")
router.load_config(TopoRouter.RD_BGP) router.load_config(TopoRouter.RD_BGP, "")
# After copying the configurations, this function loads configured daemons. # After copying the configurations, this function loads configured daemons.
tgen.start_router() tgen.start_router()

4
tests/topotests/bgp_auth/test_bgp_auth4.py
View File

@ -157,8 +157,8 @@ def setup_module(mod):
# For all registered routers, load the zebra configuration file # For all registered routers, load the zebra configuration file
for rname, router in router_list.items(): for rname, router in router_list.items():
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, "")
router.load_config(TopoRouter.RD_BGP) router.load_config(TopoRouter.RD_BGP, "")
# After copying the configurations, this function loads configured daemons. # After copying the configurations, this function loads configured daemons.
tgen.start_router() tgen.start_router()

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

@ -1527,6 +1527,9 @@ class Router(Node):
""" """
# Unfortunately this API allowsfor source to not exist for any and all routers. # Unfortunately this API allowsfor source to not exist for any and all routers.
if source is None:
source = f"{daemon}.conf"
if source: if source:
head, tail = os.path.split(source) head, tail = os.path.split(source)
if not head and not self.path_exists(tail): if not head and not self.path_exists(tail):
@ -1558,7 +1561,7 @@ class Router(Node):
self.cmd_raises("cp {} {}".format(source, conf_file_mgmt)) self.cmd_raises("cp {} {}".format(source, conf_file_mgmt))
self.cmd_raises("cp {} {}".format(source, conf_file)) self.cmd_raises("cp {} {}".format(source, conf_file))
if not self.unified_config or daemon == "frr": if not (self.unified_config or daemon == "frr"):
self.cmd_raises("chown {0}:{0} {1}".format(self.routertype, conf_file)) self.cmd_raises("chown {0}:{0} {1}".format(self.routertype, conf_file))
self.cmd_raises("chmod 664 {}".format(conf_file)) self.cmd_raises("chmod 664 {}".format(conf_file))
@ -1952,7 +1955,7 @@ class Router(Node):
tail_log_files.append("{}/{}/frr.log".format(self.logdir, self.name)) tail_log_files.append("{}/{}/frr.log".format(self.logdir, self.name))
for tailf in tail_log_files: for tailf in tail_log_files:
self.run_in_window("tail -f " + tailf, title=tailf, background=True) self.run_in_window("tail -n10000 -F " + tailf, title=tailf, background=True)
return "" return ""

2
tests/topotests/pytest.ini
View File

@ -1,7 +1,7 @@
# Skip pytests example directory # Skip pytests example directory
[pytest] [pytest]
asyncio_mode = auto # asyncio_mode = auto
# We always turn this on inside conftest.py, default shown # We always turn this on inside conftest.py, default shown
# addopts = --junitxml=<rundir>/topotests.xml # addopts = --junitxml=<rundir>/topotests.xml