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

topotests: Fix logging by redirecting it to correct file

Browse Source 
Fix lib to start loggin to correct daemon file on startup
Fix bgp-auth tests for the logging changes
Fixes Issue # 7545

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
This commit is contained in:
Martin Winter 2020-11-19 02:45:24 +01:00
parent d377cf01e7
commit ed827751d3
No known key found for this signature in database
GPG Key ID: 05A4ECF8C0102306
6 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/topotests/bgp-auth/R1/bgpd_multi_vrf.conf
View File

@ -1,4 +1,3 @@
log file /tmp/topotests/test_bgp_auth/R1/bgpd.log debugging
debug bgp neighbor-events
router bgp 65001 vrf blue

1
tests/topotests/bgp-auth/R1/bgpd_vrf.conf
View File

@ -1,4 +1,3 @@
log file /tmp/topotests/test_bgp_auth/R1/bgpd.log debugging
debug bgp neighbor-events
router bgp 65001 vrf blue

3
tests/topotests/bgp-auth/R1/zebra.conf
View File

@ -1,4 +1,3 @@
log file zebra.log
!
interface lo
ip address 1.1.1.1/32
@ -18,4 +17,4 @@ interface R1-eth4 vrf red
ip address 10.10.0.1/24
interface R1-eth5 vrf red
ip address 10.20.0.1/24
!
!

3
tests/topotests/bgp-auth/R2/zebra.conf
View File

@ -1,4 +1,3 @@
log file zebra.log
!
interface lo
ip address 2.2.2.2/32
@ -18,4 +17,4 @@ interface R2-eth4 vrf red
ip address 10.10.0.2/24
interface R2-eth5 vrf red
ip address 10.30.0.2/24
!
!

3
tests/topotests/bgp-auth/R3/zebra.conf
View File

@ -1,4 +1,3 @@
log file zebra.log
!
interface lo
ip address 3.3.3.3/32
@ -18,4 +17,4 @@ interface R3-eth4 vrf red
ip address 10.20.0.3/24
interface R3-eth5 vrf red
ip address 10.30.0.3/24
!
!

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

@ -1353,7 +1353,7 @@ class Router(Node):
zebra_path = os.path.join(self.daemondir, "zebra")
zebra_option = self.daemons_options["zebra"]
self.cmd(
"{0} {1} --log stdout --log-level debug -s 90000000 -d > zebra.out 2> zebra.err".format(
"{0} {1} --log file:zebra.log --log-level debug -s 90000000 -d > zebra.out 2> zebra.err".format(
zebra_path, zebra_option, self.logdir, self.name
)
)
@ -1368,7 +1368,7 @@ class Router(Node):
staticd_path = os.path.join(self.daemondir, "staticd")
staticd_option = self.daemons_options["staticd"]
self.cmd(
"{0} {1} --log stdout --log-level debug -d > staticd.out 2> staticd.err".format(
"{0} {1} --log file:staticd.log --log-level debug -d > staticd.out 2> staticd.err".format(
staticd_path, staticd_option, self.logdir, self.name
)
)
@ -1392,7 +1392,7 @@ class Router(Node):
daemon_path = os.path.join(self.daemondir, daemon)
self.cmd(
"{0} {1} --log stdout --log-level debug -d > {2}.out 2> {2}.err".format(
"{0} {1} --log file:{2}.log --log-level debug -d > {2}.out 2> {2}.err".format(
daemon_path, self.daemons_options.get(daemon, ""), daemon
)
)