topotests: Fix logging by redirecting it to correct file

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>

diff --git a/tests/topotests/bgp-auth/R1/bgpd_multi_vrf.conf b/tests/topotests/bgp-auth/R1/bgpd_multi_vrf.conf
index aab35073cf275ebc6ac85c2564dec3ea3bdf3a84..dde3c090b565756584afef7474d4a650c172fa62 100644 (file)
--- a/tests/topotests/bgp-auth/R1/bgpd_multi_vrf.conf
+++ b/tests/topotests/bgp-auth/R1/bgpd_multi_vrf.conf
@@ -1,4 +1,3 @@
-log file /tmp/topotests/test_bgp_auth/R1/bgpd.log debugging
 debug bgp neighbor-events
 
 router bgp 65001 vrf blue

diff --git a/tests/topotests/bgp-auth/R1/bgpd_vrf.conf b/tests/topotests/bgp-auth/R1/bgpd_vrf.conf
index 73aa8c1a0327416c269446a4670d499a5ea9b6a0..781f906d3a6e28520f33eb7e45fe989d74963cce 100644 (file)
--- a/tests/topotests/bgp-auth/R1/bgpd_vrf.conf
+++ b/tests/topotests/bgp-auth/R1/bgpd_vrf.conf
@@ -1,4 +1,3 @@
-log file /tmp/topotests/test_bgp_auth/R1/bgpd.log debugging
 debug bgp neighbor-events
 
 router bgp 65001 vrf blue

diff --git a/tests/topotests/bgp-auth/R1/zebra.conf b/tests/topotests/bgp-auth/R1/zebra.conf
index d39915335ae46e4699c1b0c37cf7f46f90569387..a0b062c44c070d7f64c1e6f9fe0eee9a38f3547e 100644 (file)
--- a/tests/topotests/bgp-auth/R1/zebra.conf
+++ b/tests/topotests/bgp-auth/R1/zebra.conf
@@ -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
-!
\ No newline at end of file
+!

diff --git a/tests/topotests/bgp-auth/R2/zebra.conf b/tests/topotests/bgp-auth/R2/zebra.conf
index fece68472a688fe7b64b2141751fc886237313e6..fed4c27c1625e3b46988a178070915706c8500bd 100644 (file)
--- a/tests/topotests/bgp-auth/R2/zebra.conf
+++ b/tests/topotests/bgp-auth/R2/zebra.conf
@@ -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
-!
\ No newline at end of file
+!

diff --git a/tests/topotests/bgp-auth/R3/zebra.conf b/tests/topotests/bgp-auth/R3/zebra.conf
index 0fe3acdfd0ab37cbee039b96e4aa068785b7cf12..d49c98b1689f5eebd1015473bace1f0bfb74e8d7 100644 (file)
--- a/tests/topotests/bgp-auth/R3/zebra.conf
+++ b/tests/topotests/bgp-auth/R3/zebra.conf
@@ -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
-!
\ No newline at end of file
+!

diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py
index 4b1886210161637ab88de7e6f9e54d05dee67406..79ccbcd3136acdad6bec9a481bd42b89b4dd7a0f 100644 (file)
--- a/tests/topotests/lib/topotest.py
+++ b/tests/topotests/lib/topotest.py
@@ -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
                 )
             )