*: convert startup logs to use per node directories also have startup and running...

Signed-off-by: Lou Berger <lberger@labn.net>

diff --git a/tests/topotests/all-protocol-startup/r1/bgpd.conf b/tests/topotests/all-protocol-startup/r1/bgpd.conf
index 9ef8695896fb7362d91bfafb55ec80c552536c31..4614287f27f9fb4b53f98c4b8d4ab0b7441be744 100644 (file)
--- a/tests/topotests/all-protocol-startup/r1/bgpd.conf
+++ b/tests/topotests/all-protocol-startup/r1/bgpd.conf
@@ -1,4 +1,4 @@
-log file /tmp/r1-bgpd.log
+log file bgpd.log
 !
 !
 router bgp 100

diff --git a/tests/topotests/all-protocol-startup/r1/isisd.conf b/tests/topotests/all-protocol-startup/r1/isisd.conf
index b63bc3f8d33500883b1c52e1b54e6f7fbd585895..413f8d15a9c2c0b4f955a7571e61dd96bb2f4f0e 100644 (file)
--- a/tests/topotests/all-protocol-startup/r1/isisd.conf
+++ b/tests/topotests/all-protocol-startup/r1/isisd.conf
@@ -1,4 +1,4 @@
-log file /tmp/r1-isisd.log
+log file isisd.log
 !
 debug isis events
 !

diff --git a/tests/topotests/all-protocol-startup/r1/ldpd.conf b/tests/topotests/all-protocol-startup/r1/ldpd.conf
index b69007181e8a715762cb6861a8c511a58f73d1a9..02332a4e75bca44b0a11dd73886d6a1f4042eeb4 100644 (file)
--- a/tests/topotests/all-protocol-startup/r1/ldpd.conf
+++ b/tests/topotests/all-protocol-startup/r1/ldpd.conf
@@ -1,4 +1,4 @@
-log file /tmp/r1-ldpd.log
+log file ldpd.log
 !
 debug mpls ldp event
 debug mpls ldp zebra

diff --git a/tests/topotests/all-protocol-startup/r1/ospf6d.conf b/tests/topotests/all-protocol-startup/r1/ospf6d.conf
index 1a14eaac77cf77e9f205bad0b93efc476bfcf622..6d870f355f927be3a5db22938dadf39f6c2a23e1 100644 (file)
--- a/tests/topotests/all-protocol-startup/r1/ospf6d.conf
+++ b/tests/topotests/all-protocol-startup/r1/ospf6d.conf
@@ -1,4 +1,4 @@
-log file /tmp/r1-ospf6d.log
+log file ospf6d.log
 !
 debug ospf6 lsa unknown
 debug ospf6 zebra

diff --git a/tests/topotests/all-protocol-startup/r1/ospfd.conf b/tests/topotests/all-protocol-startup/r1/ospfd.conf
index 1a901b96432946801fa85a40f09e42059efe7c56..549f36fab430efa412dce3f79456924da2ab511d 100644 (file)
--- a/tests/topotests/all-protocol-startup/r1/ospfd.conf
+++ b/tests/topotests/all-protocol-startup/r1/ospfd.conf
@@ -1,4 +1,4 @@
-log file /tmp/r1-ospfd.log
+log file ospfd.log
 !
 debug ospf event
 debug ospf zebra

diff --git a/tests/topotests/all-protocol-startup/r1/ripd.conf b/tests/topotests/all-protocol-startup/r1/ripd.conf
index 899bfda984785427459c8bf35bd73348bf4484be..4b35630b3664b7b8cb63bbb6b8e72c0b65857d08 100644 (file)
--- a/tests/topotests/all-protocol-startup/r1/ripd.conf
+++ b/tests/topotests/all-protocol-startup/r1/ripd.conf
@@ -1,4 +1,4 @@
-log file /tmp/r1-ripd.log
+log file ripd.log
 !
 debug rip events
 debug rip zebra

diff --git a/tests/topotests/all-protocol-startup/r1/ripngd.conf b/tests/topotests/all-protocol-startup/r1/ripngd.conf
index 9b1f55627727d417ef3f361b48ab950dde62ac67..199fe15ab9cd1c8573be5247d6b9cdb27174032c 100644 (file)
--- a/tests/topotests/all-protocol-startup/r1/ripngd.conf
+++ b/tests/topotests/all-protocol-startup/r1/ripngd.conf
@@ -1,4 +1,4 @@
-log file /tmp/r1-ripngd.log
+log file ripngd.log
 !
 debug ripng events
 debug ripng zebra

diff --git a/tests/topotests/all-protocol-startup/r1/zebra.conf b/tests/topotests/all-protocol-startup/r1/zebra.conf
index afb28e076825881ab78510cb3e899883b47613e1..164104da7efbbea686e958265a87a9616f2530bb 100644 (file)
--- a/tests/topotests/all-protocol-startup/r1/zebra.conf
+++ b/tests/topotests/all-protocol-startup/r1/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r1-zebra.log
+log file zebra.log
 !
 hostname r1
 !

diff --git a/tests/topotests/bgp-ecmp-topo1/r1/bgpd.conf b/tests/topotests/bgp-ecmp-topo1/r1/bgpd.conf
index 1488fe93812af13ccdca440837447bacb98bfde6..627dc76c1b0798a0d35ec08d9272fa43fa51b81e 100644 (file)
--- a/tests/topotests/bgp-ecmp-topo1/r1/bgpd.conf
+++ b/tests/topotests/bgp-ecmp-topo1/r1/bgpd.conf
@@ -1,6 +1,6 @@
 !
 hostname r1
-log file /tmp/r1-bgpd.log
+log file bgpd.log
 !
 router bgp 100
  bgp router-id 10.0.255.1

diff --git a/tests/topotests/bgp-ecmp-topo1/r1/zebra.conf b/tests/topotests/bgp-ecmp-topo1/r1/zebra.conf
index 3022913dd17e9e25bcba63ec4e79017d3f32b6cd..77c76cd4907a9d33ccf10b2a71fac65fcf59577b 100644 (file)
--- a/tests/topotests/bgp-ecmp-topo1/r1/zebra.conf
+++ b/tests/topotests/bgp-ecmp-topo1/r1/zebra.conf
@@ -1,6 +1,6 @@
 !
 hostname r1
-log file /tmp/r1-zebra.log
+log file zebra.log
 !
 interface r1-eth0
  ip address 10.0.1.1/24

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/zebra.conf
index 41cce5e6f43789f841903bbf1762e86c520cdb2f..46831bb7111d4200e6f47330fc4596c0fa04b1ec 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/zebra.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/ce1-zebra.log
+log file zebra.log
 !
 hostname ce1
 !

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/zebra.conf
index b12a9d6e688a49113a287361b5593f6b5c3af50f..fb4d8cc9c426e65817d9d7567acc378d76daebdb 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/zebra.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/ce2-zebra.log
+log file zebra.log
 !
 hostname ce2
 !

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/zebra.conf
index 65a5bfc86f42d32b869e0ccf39b9e69bbfbc14d8..77a1163a4be1f55bceea8d75436632dfae90f122 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/zebra.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/ce3-zebra.log
+log file zebra.log
 !
 hostname ce3
 !

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ldpd.conf
index 428b674106b3b4db40bfbf4697d1f892a47ac8c6..3c6cbddc2a2a16b3e1a1280fbac7e521d7ee9cc9 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ldpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ldpd.conf
@@ -1,5 +1,5 @@
 hostname r1
-log file /tmp/r1-ldpd.log
+log file ldpd.log
 !
 debug mpls ldp zebra
 debug mpls ldp event

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ospfd.conf
index d05e7c9406e40dd1f8672d6354cf9b0992f5718f..c5097e214f737f986b278a599119ee99e001eb03 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ospfd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ospfd.conf
@@ -1,5 +1,5 @@
 hostname r1
-log file /tmp/r1-ospfd.log
+log file ospfd.log
 !
 router ospf
  router-id 1.1.1.1

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/zebra.conf
index cddc7b679a797c3548ff1a577880af1c6a4c28af..18f61e0c54c51e5d8db1bc77e5c5424475a1eec8 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/zebra.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r1-zebra.log
+log file zebra.log
 !
 hostname r1
 !

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ldpd.conf
index 9bba8d8387dfa30357652a0b02bff5b11a865150..bfdef21b7598b397f9f51a8865ea48cce59fd1d6 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ldpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ldpd.conf
@@ -1,5 +1,5 @@
 hostname r2
-log file /tmp/r2-ldpd.log
+log file ldpd.log
 !
 debug mpls ldp zebra
 debug mpls ldp event

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ospfd.conf
index c58914a7fa7e4eb8a66b16fdfe32803b56c68643..8678813665013ff81bc167cb2f79e165655c9361 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ospfd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ospfd.conf
@@ -1,5 +1,5 @@
 hostname r2
-log file /tmp/r2-ospfd.log
+log file ospfd.log
 !
 router ospf
  router-id 2.2.2.2

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/zebra.conf
index b74ce318e49c8cd3d33f1af741055ade94a06ad5..dd1dbac32b8aba7ca95ec7e68c6d3d89f393cef8 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/zebra.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r2-zebra.log
+log file zebra.log
 !
 hostname r2
 !

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ldpd.conf
index 53ccf9ed178ece29ccce7c2c1a313d5655f3dd1f..dbf1d72b5f646e3244007a7b59d4cf2146fffbc1 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ldpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ldpd.conf
@@ -1,5 +1,5 @@
 hostname r3
-log file /tmp/r3-ldpd.log
+log file ldpd.log
 !
 debug mpls ldp zebra
 debug mpls ldp event

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ospfd.conf
index bbd9487532debac7fabc68f586c8cabb3828e53e..c7c358f9dc4912fe650b7defe52f51006876ca82 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ospfd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ospfd.conf
@@ -1,6 +1,6 @@
 hostname r3
 password 1
-log file /tmp/r3-ospfd.log
+log file ospfd.log
 !
 router ospf
  router-id 3.3.3.3

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/zebra.conf
index eff266bcfa265b1e43de8259588823e05ab3e9a0..9dbc29024378a212d8570839e26fb0b61643e4f8 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/zebra.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r3-zebra.log
+log file zebra.log
 !
 hostname r3
 !

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ldpd.conf
index 7bfdf7f3a81f5c393c86cb1720a29ce0d1a67cf8..8f3533527da578b23e582c826b448f5ee9e553bd 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ldpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ldpd.conf
@@ -1,5 +1,5 @@
 hostname r4
-log file /tmp/r4-ldpd.log
+log file ldpd.log
 !
 debug mpls ldp zebra
 debug mpls ldp event

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ospfd.conf
index c2355d2b26a197d27db2fe61210bd20a2fd05a8d..83d09c09a48bbab1e14fa0ae9ff62473a1da4eb0 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ospfd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ospfd.conf
@@ -1,5 +1,5 @@
 hostname r4
-log file /tmp/r4-ospfd.log
+log file ospfd.log
 !
 router ospf
  router-id 4.4.4.4

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/zebra.conf
index 6bcb30233637503f74d72f73dfc761969f233877..415f03df51250e02db08e3d4cd870b0f32298d6e 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/zebra.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r4-zebra.log
+log file zebra.log
 !
 hostname r4
 !

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf
index 90d4eeb74958961932470f713988653241967136..4bd0f95f2c813bc2d3ff8112aef20072c9497b17 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf
@@ -5,7 +5,7 @@ password zebra
 log stdout notifications
 log monitor notifications
 log commands
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/ce1-bgpd.log
+log file bgpd.log
 
 router bgp 5227
    bgp router-id 99.0.0.1

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/zebra.conf
index ae99139e974017f5665789f1d688fa2881442f07..46831bb7111d4200e6f47330fc4596c0fa04b1ec 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/zebra.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/ce1-zebra.log
+log file zebra.log
 !
 hostname ce1
 !

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf
index bf0e43121da3470ee6576276f2f828819f472dee..2115f08741392ae615280bed7df3da689753b921 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf
@@ -5,7 +5,7 @@ password zebra
 log stdout notifications
 log monitor notifications
 log commands
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/ce2-bgpd.log
+log file bgpd.log
 
 router bgp 5227
    bgp router-id 99.0.0.2

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/zebra.conf
index d86264baf08ad92006ff3453c203347f66078fea..fb4d8cc9c426e65817d9d7567acc378d76daebdb 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/zebra.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/ce2-zebra.log
+log file zebra.log
 !
 hostname ce2
 !

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf
index 1e5bc00a31106998f548214b0546922eda89b78a..a65b36f364e36736476f08676a0d2f16567174ee 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf
@@ -5,7 +5,7 @@ password zebra
 log stdout notifications
 log monitor notifications
 log commands
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/ce3-bgpd.log
+log file bgpd.log
 
 router bgp 5227
    bgp router-id 99.0.0.3

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/zebra.conf
index 0565414bdd4404ff4bedc98cb6af32a9de506fcb..77a1163a4be1f55bceea8d75436632dfae90f122 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/zebra.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/ce3-zebra.log
+log file zebra.log
 !
 hostname ce3
 !

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf
index d5e15c896981c85a739f1fec28d93252aaebc3eb..274eceaf0ffa467f55b37cc696d1e9557d0c61b6 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf
@@ -5,7 +5,7 @@ password zebra
 log stdout notifications
 log monitor notifications
 log commands
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/ce4-bgpd.log
+log file bgpd.log
 
 router bgp 5228
    bgp router-id 99.0.0.4

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/zebra.conf
index af3b6b4f3991d14a1ff3d436def60d9902c3c765..bfd8ba84356f6a145ad5d30a8187ee9844c35d2b 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/zebra.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/ce4-zebra.log
+log file zebra.log
 !
 hostname ce4
 !

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf
index 5866ef94c8297c08fbe6af497b8805900279175a..c1bad0b7c6c6fece8786bd6fe66f13588aaaae61 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf
@@ -6,7 +6,7 @@ log stdout notifications
 log monitor notifications
 log commands
 
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r1-bgpd.log debugging
+log file bgpd.log debugging
 
 #debug bgp vpn leak-to-vrf
 #debug bgp vpn leak-from-vrf

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ldpd.conf
index 322fdac5767685427f28ff9946552ead4ec604b4..de84f2bc3f359e686d9134b018332505decfc130 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ldpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ldpd.conf
@@ -1,5 +1,5 @@
 hostname r1
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r1-ldpd.log
+log file ldpd.log
 password zebra
 !
 debug mpls ldp zebra

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ospfd.conf
index 7d5fbb31147e8cd4709ff3d221054ed39efd64d8..c5097e214f737f986b278a599119ee99e001eb03 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ospfd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ospfd.conf
@@ -1,5 +1,5 @@
 hostname r1
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r1-ospfd.log
+log file ospfd.log
 !
 router ospf
  router-id 1.1.1.1

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/zebra.conf
index 3dbd202ba3034620e49941d13c12188ecc8753e3..221bc7a839c870f0c4030a422f289a455d8e334f 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/zebra.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r1-zebra.log
+log file zebra.log
 
 hostname r1
 password zebra

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/bgpd.conf
index ec0a51994b8d3b3289f2e3c895fc116334493dfe..4ccb0ca5c01f19e269003a1cff17739daf1c05dc 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/bgpd.conf
@@ -5,7 +5,7 @@ password zebra
 log stdout notifications
 log monitor notifications
 log commands
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r2-bgpd.log debugging
+log file bgpd.log debugging
 
 router bgp 5226
    bgp router-id 2.2.2.2

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ldpd.conf
index fe4cb67e30e166b8fe2235eaf9ad53adc26aec79..411ba85ef62cda27344f8c973586e84ed635a501 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ldpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ldpd.conf
@@ -1,5 +1,5 @@
 hostname r2
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r2-ldpd.log
+log file ldpd.log
 password zebra
 !
 debug mpls ldp zebra

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ospfd.conf
index 435eb06970d75c507022baabc51f61eb950e2a92..8678813665013ff81bc167cb2f79e165655c9361 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ospfd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ospfd.conf
@@ -1,5 +1,5 @@
 hostname r2
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r2-ospfd.log
+log file ospfd.log
 !
 router ospf
  router-id 2.2.2.2

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/zebra.conf
index d5f5cb8bc103115f4787bf632b2d1c76e782a220..dc4ef7ecc11b6d88ad5022d85461fcd94ab4731f 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/zebra.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r2-zebra.log
+log file zebra.log
 
 hostname r2
 password zebra

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf
index 38830ea6dbec56558881b611224a2caacc9fa98f..200461255710b049a1446252c917e6720d93164e 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf
@@ -5,7 +5,7 @@ password zebra
 log stdout notifications
 log monitor notifications
 log commands
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r3-bgpd.log
+log file bgpd.log
 
 debug bgp vpn label
 router bgp 5226

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ldpd.conf
index a40db1a9b2f5564c118959e0668e8e9ac2ae56fb..6002895f48f886fe5c2dbd7f8ab3fdac34629b87 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ldpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ldpd.conf
@@ -1,6 +1,6 @@
 hostname r3
 password zebra
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r3-ldpd.log
+log file ldpd.log
 !
 debug mpls ldp zebra
 debug mpls ldp event

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ospfd.conf
index bd4f1858b5e134cce304e6e70f15deb04fd9fc87..c7c358f9dc4912fe650b7defe52f51006876ca82 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ospfd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ospfd.conf
@@ -1,6 +1,6 @@
 hostname r3
 password 1
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r3-ospfd.log
+log file ospfd.log
 !
 router ospf
  router-id 3.3.3.3

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/zebra.conf
index d6dfbbe437a4503b342efda5d76054ccb55a54a5..9ffc84fe2da679fdbbca4966f65bd48337cbf967 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/zebra.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r3-zebra.log
+log file zebra.log
 
 hostname r3
 password zebra

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf
index f6951d46081df8824785dba5b748f2e248ca08f3..b2df5990ce3116175844e7b934c4b5c6469745ea 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf
@@ -5,7 +5,7 @@ password zebra
 log stdout notifications
 log monitor notifications
 log commands
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r4-bgpd.log debug
+log file bgpd.log debug
 
 debug bgp vpn label
 debug bgp nht

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ldpd.conf
index 2ed84e16e64b23ae7f485d00df573f0d6eea4245..292e9a718721887956cba3ae958a25325c1bbca4 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ldpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ldpd.conf
@@ -1,6 +1,6 @@
 hostname r4
 password zebra
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r4-ldpd.log
+log file ldpd.log
 !
 debug mpls ldp zebra
 debug mpls ldp event

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ospfd.conf
index 6b16aa953ca2e2a272dda9a6078621356320c59b..83d09c09a48bbab1e14fa0ae9ff62473a1da4eb0 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ospfd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ospfd.conf
@@ -1,5 +1,5 @@
 hostname r4
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r4-ospfd.log
+log file ospfd.log
 !
 router ospf
  router-id 4.4.4.4

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/zebra.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/zebra.conf
index fa2ed0b5ab75868cc9c71688d30abcf70c581381..4f01a27b404c59e7bf01ec3f6daafdb493674b81 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/zebra.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r4-zebra.log
+log file zebra.log
 
 hostname r4
 password zebra

diff --git a/tests/topotests/bgp_multiview_topo1/r1/bgpd.conf b/tests/topotests/bgp_multiview_topo1/r1/bgpd.conf
index 7cfcb6c9aa7891b05e336d0d7bb03174c22e7ae6..0c24942f4304e826c0c8bd30d96ef770a7fbda16 100644 (file)
--- a/tests/topotests/bgp_multiview_topo1/r1/bgpd.conf
+++ b/tests/topotests/bgp_multiview_topo1/r1/bgpd.conf
@@ -2,7 +2,7 @@
 ! Zebra configuration saved from vty
 !   2015/12/24 21:46:33
 !
-log file /tmp/r1-bgpd.log
+log file bgpd.log
 !
 !debug bgp events
 !debug bgp keepalives

diff --git a/tests/topotests/bgp_multiview_topo1/r1/zebra.conf b/tests/topotests/bgp_multiview_topo1/r1/zebra.conf
index 6aebf56f03f995340139d9dd415feb6fdb01ebce..86343f56e48ffda7ebb16ce66fbdce722efd9900 100644 (file)
--- a/tests/topotests/bgp_multiview_topo1/r1/zebra.conf
+++ b/tests/topotests/bgp_multiview_topo1/r1/zebra.conf
@@ -2,7 +2,7 @@
 ! Zebra configuration saved from vty
 !   2015/12/24 16:48:27
 !
-log file /tmp/r1-zebra.log
+log file zebra.log
 !
 hostname r1
 !

diff --git a/tests/topotests/eigrp-topo1/r1/eigrpd.conf b/tests/topotests/eigrp-topo1/r1/eigrpd.conf
index 9994a634e472e6676ba54b49c984c56ff8918175..6c800abd9b4db833d5042ba3b87e39598d65909b 100644 (file)
--- a/tests/topotests/eigrp-topo1/r1/eigrpd.conf
+++ b/tests/topotests/eigrp-topo1/r1/eigrpd.conf
@@ -1,4 +1,4 @@
-log file /tmp/r1-eigrpd.log
+log file eigrpd.log
 !
 router eigrp 1
  network 0.0.0.0/0

diff --git a/tests/topotests/eigrp-topo1/r1/zebra.conf b/tests/topotests/eigrp-topo1/r1/zebra.conf
index 4dc46c2c8bf6f6bab19dc37b4d04652efcd322c8..8537f6dd80edadc79aa35b5c5165b5035f94ad89 100644 (file)
--- a/tests/topotests/eigrp-topo1/r1/zebra.conf
+++ b/tests/topotests/eigrp-topo1/r1/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r1-zebra.log
+log file zebra.log
 !
 hostname r1
 !

diff --git a/tests/topotests/eigrp-topo1/r2/eigrpd.conf b/tests/topotests/eigrp-topo1/r2/eigrpd.conf
index 3713b3d5784113d132db8c20031df5dcfecf4346..56c747d97c703b12390581127c2567b8cc0fe234 100644 (file)
--- a/tests/topotests/eigrp-topo1/r2/eigrpd.conf
+++ b/tests/topotests/eigrp-topo1/r2/eigrpd.conf
@@ -1,4 +1,4 @@
-log file /tmp/r2-eigrpd.log
+log file eigrpd.log
 !
 !
 router eigrp 1

diff --git a/tests/topotests/eigrp-topo1/r2/zebra.conf b/tests/topotests/eigrp-topo1/r2/zebra.conf
index 74f7bfec0617f3e8055cacab6ed567474d3a73e8..c440f3a350ab46ec22fce31490ef82feabf0b99d 100644 (file)
--- a/tests/topotests/eigrp-topo1/r2/zebra.conf
+++ b/tests/topotests/eigrp-topo1/r2/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r2-zebra.log
+log file zebra.log
 !
 hostname r2
 !

diff --git a/tests/topotests/eigrp-topo1/r3/eigrpd.conf b/tests/topotests/eigrp-topo1/r3/eigrpd.conf
index 460b9f0133c3fd7df52b1000b436f02fd093951d..53ad1bb6a1d4789a1390e94b1bb3c0eb64e486f8 100644 (file)
--- a/tests/topotests/eigrp-topo1/r3/eigrpd.conf
+++ b/tests/topotests/eigrp-topo1/r3/eigrpd.conf
@@ -1,4 +1,4 @@
-log file /tmp/r3-eigrpd.log
+log file eigrpd.log
 !
 !
 router eigrp 1 

diff --git a/tests/topotests/eigrp-topo1/r3/zebra.conf b/tests/topotests/eigrp-topo1/r3/zebra.conf
index 1c79b36b3e2cb9f2b7a63d310fb4e7aaadbc0bb3..7f145b458313e82b4cb20e8da7d7d543a31f4b8b 100644 (file)
--- a/tests/topotests/eigrp-topo1/r3/zebra.conf
+++ b/tests/topotests/eigrp-topo1/r3/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r3-zebra.log
+log file zebra.log
 !
 hostname r3
 !

diff --git a/tests/topotests/ldp-topo1/r1/ldpd.conf b/tests/topotests/ldp-topo1/r1/ldpd.conf
index 428b674106b3b4db40bfbf4697d1f892a47ac8c6..3c6cbddc2a2a16b3e1a1280fbac7e521d7ee9cc9 100644 (file)
--- a/tests/topotests/ldp-topo1/r1/ldpd.conf
+++ b/tests/topotests/ldp-topo1/r1/ldpd.conf
@@ -1,5 +1,5 @@
 hostname r1
-log file /tmp/r1-ldpd.log
+log file ldpd.log
 !
 debug mpls ldp zebra
 debug mpls ldp event

diff --git a/tests/topotests/ldp-topo1/r1/ospfd.conf b/tests/topotests/ldp-topo1/r1/ospfd.conf
index 8d12ea4446636a0e814475cc3d16b723c8f73bd6..6daf034d18125c88999442ce3a5655f3ba4b5bf5 100644 (file)
--- a/tests/topotests/ldp-topo1/r1/ospfd.conf
+++ b/tests/topotests/ldp-topo1/r1/ospfd.conf
@@ -1,5 +1,5 @@
 hostname r1
-log file /tmp/r1-ospfd.log
+log file ospfd.log
 !
 router ospf
  router-id 1.1.1.1

diff --git a/tests/topotests/ldp-topo1/r1/zebra.conf b/tests/topotests/ldp-topo1/r1/zebra.conf
index 61fb7dc058b5075b9192b17a8eb8f288abfe8800..55b4b0e9c656bbf812fbce30f933841428f47fe0 100644 (file)
--- a/tests/topotests/ldp-topo1/r1/zebra.conf
+++ b/tests/topotests/ldp-topo1/r1/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r1-zebra.log
+log file zebra.log
 !
 hostname r1
 !

diff --git a/tests/topotests/ldp-topo1/r2/ldpd.conf b/tests/topotests/ldp-topo1/r2/ldpd.conf
index 9bba8d8387dfa30357652a0b02bff5b11a865150..bfdef21b7598b397f9f51a8865ea48cce59fd1d6 100644 (file)
--- a/tests/topotests/ldp-topo1/r2/ldpd.conf
+++ b/tests/topotests/ldp-topo1/r2/ldpd.conf
@@ -1,5 +1,5 @@
 hostname r2
-log file /tmp/r2-ldpd.log
+log file ldpd.log
 !
 debug mpls ldp zebra
 debug mpls ldp event

diff --git a/tests/topotests/ldp-topo1/r2/ospfd.conf b/tests/topotests/ldp-topo1/r2/ospfd.conf
index c58914a7fa7e4eb8a66b16fdfe32803b56c68643..8678813665013ff81bc167cb2f79e165655c9361 100644 (file)
--- a/tests/topotests/ldp-topo1/r2/ospfd.conf
+++ b/tests/topotests/ldp-topo1/r2/ospfd.conf
@@ -1,5 +1,5 @@
 hostname r2
-log file /tmp/r2-ospfd.log
+log file ospfd.log
 !
 router ospf
  router-id 2.2.2.2

diff --git a/tests/topotests/ldp-topo1/r2/zebra.conf b/tests/topotests/ldp-topo1/r2/zebra.conf
index b74ce318e49c8cd3d33f1af741055ade94a06ad5..dd1dbac32b8aba7ca95ec7e68c6d3d89f393cef8 100644 (file)
--- a/tests/topotests/ldp-topo1/r2/zebra.conf
+++ b/tests/topotests/ldp-topo1/r2/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r2-zebra.log
+log file zebra.log
 !
 hostname r2
 !

diff --git a/tests/topotests/ldp-topo1/r3/ldpd.conf b/tests/topotests/ldp-topo1/r3/ldpd.conf
index 53ccf9ed178ece29ccce7c2c1a313d5655f3dd1f..dbf1d72b5f646e3244007a7b59d4cf2146fffbc1 100644 (file)
--- a/tests/topotests/ldp-topo1/r3/ldpd.conf
+++ b/tests/topotests/ldp-topo1/r3/ldpd.conf
@@ -1,5 +1,5 @@
 hostname r3
-log file /tmp/r3-ldpd.log
+log file ldpd.log
 !
 debug mpls ldp zebra
 debug mpls ldp event

diff --git a/tests/topotests/ldp-topo1/r3/ospfd.conf b/tests/topotests/ldp-topo1/r3/ospfd.conf
index c784bd745ab9cb8a97589ce0f2c9df61cb9f6a90..202be238ec4c08953e46ce364f44aae0b78c958d 100644 (file)
--- a/tests/topotests/ldp-topo1/r3/ospfd.conf
+++ b/tests/topotests/ldp-topo1/r3/ospfd.conf
@@ -1,6 +1,6 @@
 hostname r3
 password 1
-log file /tmp/r3-ospfd.log
+log file ospfd.log
 !
 router ospf
  router-id 3.3.3.3

diff --git a/tests/topotests/ldp-topo1/r3/zebra.conf b/tests/topotests/ldp-topo1/r3/zebra.conf
index 62d1f3a83abd87e18e4908f6a940b9de62a1c158..456820fdb48ac7a6b7d36267c9ad1490d491e50a 100644 (file)
--- a/tests/topotests/ldp-topo1/r3/zebra.conf
+++ b/tests/topotests/ldp-topo1/r3/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r3-zebra.log
+log file zebra.log
 !
 hostname r3
 !

diff --git a/tests/topotests/ldp-topo1/r4/ldpd.conf b/tests/topotests/ldp-topo1/r4/ldpd.conf
index 7bfdf7f3a81f5c393c86cb1720a29ce0d1a67cf8..8f3533527da578b23e582c826b448f5ee9e553bd 100644 (file)
--- a/tests/topotests/ldp-topo1/r4/ldpd.conf
+++ b/tests/topotests/ldp-topo1/r4/ldpd.conf
@@ -1,5 +1,5 @@
 hostname r4
-log file /tmp/r4-ldpd.log
+log file ldpd.log
 !
 debug mpls ldp zebra
 debug mpls ldp event

diff --git a/tests/topotests/ldp-topo1/r4/ospfd.conf b/tests/topotests/ldp-topo1/r4/ospfd.conf
index 9f0784a9f25d1d0544269490226638f86419d30d..569dbc54e2310224a9ea44524e9f65d8cecd41de 100644 (file)
--- a/tests/topotests/ldp-topo1/r4/ospfd.conf
+++ b/tests/topotests/ldp-topo1/r4/ospfd.conf
@@ -1,5 +1,5 @@
 hostname r4
-log file /tmp/r4-ospfd.log
+log file ospfd.log
 !
 router ospf
  router-id 4.4.4.4

diff --git a/tests/topotests/ldp-topo1/r4/zebra.conf b/tests/topotests/ldp-topo1/r4/zebra.conf
index ecec23ee58f7953d4e2f4743f8af673f0bdae193..4a270af578f6e025668bddb397bf7e09d5ab3420 100644 (file)
--- a/tests/topotests/ldp-topo1/r4/zebra.conf
+++ b/tests/topotests/ldp-topo1/r4/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r4-zebra.log
+log file zebra.log
 !
 hostname r4
 !

diff --git a/tests/topotests/ldp-vpls-topo1/ce1/zebra.conf b/tests/topotests/ldp-vpls-topo1/ce1/zebra.conf
index f520fae11310c8c8f43997cc54747f3149251b1f..6f165e27243920617ba3282ec337c3afc879bc04 100644 (file)
--- a/tests/topotests/ldp-vpls-topo1/ce1/zebra.conf
+++ b/tests/topotests/ldp-vpls-topo1/ce1/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/ce1-zebra.log
+log file zebra.log
 !
 hostname ce1
 !

diff --git a/tests/topotests/ldp-vpls-topo1/ce2/zebra.conf b/tests/topotests/ldp-vpls-topo1/ce2/zebra.conf
index 737f30b9e793fd00b6592f30c936119477ec2924..ac02d0f9a4f756abcd279509701ba1c91a9822ad 100644 (file)
--- a/tests/topotests/ldp-vpls-topo1/ce2/zebra.conf
+++ b/tests/topotests/ldp-vpls-topo1/ce2/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/ce2-zebra.log
+log file zebra.log
 !
 hostname ce2
 !

diff --git a/tests/topotests/ldp-vpls-topo1/ce3/zebra.conf b/tests/topotests/ldp-vpls-topo1/ce3/zebra.conf
index 9e6b6b09e0855d68d6edac3b15627077981d0e94..c6a5824d15c5d04218f5618d59869662400cc07c 100644 (file)
--- a/tests/topotests/ldp-vpls-topo1/ce3/zebra.conf
+++ b/tests/topotests/ldp-vpls-topo1/ce3/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/ce3-zebra.log
+log file zebra.log
 !
 hostname ce3
 !

diff --git a/tests/topotests/ldp-vpls-topo1/r1/ldpd.conf b/tests/topotests/ldp-vpls-topo1/r1/ldpd.conf
index 2ab7895bdb467e65754427942e7fa99eff3990a1..a1c0c822d67600df92da1bcf9e2171d1785a37a5 100644 (file)
--- a/tests/topotests/ldp-vpls-topo1/r1/ldpd.conf
+++ b/tests/topotests/ldp-vpls-topo1/r1/ldpd.conf
@@ -1,5 +1,5 @@
 hostname r1
-log file /tmp/r1-ldpd.log
+log file ldpd.log
 !
 debug mpls ldp zebra
 debug mpls ldp event

diff --git a/tests/topotests/ldp-vpls-topo1/r1/ospfd.conf b/tests/topotests/ldp-vpls-topo1/r1/ospfd.conf
index 8d12ea4446636a0e814475cc3d16b723c8f73bd6..6daf034d18125c88999442ce3a5655f3ba4b5bf5 100644 (file)
--- a/tests/topotests/ldp-vpls-topo1/r1/ospfd.conf
+++ b/tests/topotests/ldp-vpls-topo1/r1/ospfd.conf
@@ -1,5 +1,5 @@
 hostname r1
-log file /tmp/r1-ospfd.log
+log file ospfd.log
 !
 router ospf
  router-id 1.1.1.1

diff --git a/tests/topotests/ldp-vpls-topo1/r1/zebra.conf b/tests/topotests/ldp-vpls-topo1/r1/zebra.conf
index b7ccccbd16a3a772be8cd95fc8ac317af9a82a59..d0ec9f5d75988210e2780389116b85f2686ed91c 100644 (file)
--- a/tests/topotests/ldp-vpls-topo1/r1/zebra.conf
+++ b/tests/topotests/ldp-vpls-topo1/r1/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r1-zebra.log
+log file zebra.log
 !
 hostname r1
 !

diff --git a/tests/topotests/ldp-vpls-topo1/r2/ldpd.conf b/tests/topotests/ldp-vpls-topo1/r2/ldpd.conf
index 843f1601635ec4815c649a82f526a7437bd2abe9..06e59730407906d9fc8b0ec00e0c54f898ffee88 100644 (file)
--- a/tests/topotests/ldp-vpls-topo1/r2/ldpd.conf
+++ b/tests/topotests/ldp-vpls-topo1/r2/ldpd.conf
@@ -1,5 +1,5 @@
 hostname r2
-log file /tmp/r2-ldpd.log
+log file ldpd.log
 !
 debug mpls ldp zebra
 debug mpls ldp event

diff --git a/tests/topotests/ldp-vpls-topo1/r2/ospfd.conf b/tests/topotests/ldp-vpls-topo1/r2/ospfd.conf
index c58914a7fa7e4eb8a66b16fdfe32803b56c68643..8678813665013ff81bc167cb2f79e165655c9361 100644 (file)
--- a/tests/topotests/ldp-vpls-topo1/r2/ospfd.conf
+++ b/tests/topotests/ldp-vpls-topo1/r2/ospfd.conf
@@ -1,5 +1,5 @@
 hostname r2
-log file /tmp/r2-ospfd.log
+log file ospfd.log
 !
 router ospf
  router-id 2.2.2.2

diff --git a/tests/topotests/ldp-vpls-topo1/r2/zebra.conf b/tests/topotests/ldp-vpls-topo1/r2/zebra.conf
index e5ecd69798307d5d6d8f93a65a9dfd4489950416..8bd800714c2a6af8e2f3f464e588bc44b881c05d 100644 (file)
--- a/tests/topotests/ldp-vpls-topo1/r2/zebra.conf
+++ b/tests/topotests/ldp-vpls-topo1/r2/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r2-zebra.log
+log file zebra.log
 !
 hostname r2
 !

diff --git a/tests/topotests/ldp-vpls-topo1/r3/ldpd.conf b/tests/topotests/ldp-vpls-topo1/r3/ldpd.conf
index 7a9995d1b267a542186554307a8d7b25edfef0ed..57a203bce382f34d4f5a0dce83026c686e787734 100644 (file)
--- a/tests/topotests/ldp-vpls-topo1/r3/ldpd.conf
+++ b/tests/topotests/ldp-vpls-topo1/r3/ldpd.conf
@@ -1,5 +1,5 @@
 hostname r3
-log file /tmp/r3-ldpd.log
+log file ldpd.log
 !
 debug mpls ldp zebra
 debug mpls ldp event

diff --git a/tests/topotests/ldp-vpls-topo1/r3/ospfd.conf b/tests/topotests/ldp-vpls-topo1/r3/ospfd.conf
index 8a58d95976253cd533984d3f9a81bba1115e983c..b6bafba205b3af4f08e8ca9ec1433fab547fab4f 100644 (file)
--- a/tests/topotests/ldp-vpls-topo1/r3/ospfd.conf
+++ b/tests/topotests/ldp-vpls-topo1/r3/ospfd.conf
@@ -1,5 +1,5 @@
 hostname r3
-log file /tmp/r3-ospfd.log
+log file ospfd.log
 !
 router ospf
  router-id 3.3.3.3

diff --git a/tests/topotests/ldp-vpls-topo1/r3/zebra.conf b/tests/topotests/ldp-vpls-topo1/r3/zebra.conf
index 6e4d0ce555b89b7c7b5aff561acfcae01da13b80..2ff61365b5e20084ebac6a1202d3e9d33542539e 100644 (file)
--- a/tests/topotests/ldp-vpls-topo1/r3/zebra.conf
+++ b/tests/topotests/ldp-vpls-topo1/r3/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r3-zebra.log
+log file zebra.log
 !
 hostname r3
 !

diff --git a/tests/topotests/ospf6-topo1/r1/ospf6d.conf b/tests/topotests/ospf6-topo1/r1/ospf6d.conf
index 8fc431fc4a14731d08edccd1bd54012d80ee2e36..c4b382171d61c02836571843a6af266a91d64cc4 100644 (file)
--- a/tests/topotests/ospf6-topo1/r1/ospf6d.conf
+++ b/tests/topotests/ospf6-topo1/r1/ospf6d.conf
@@ -1,5 +1,5 @@
 hostname r1
-log file /tmp/r1-ospf6d.log
+log file ospf6d.log
 !
 debug ospf6 message all
 debug ospf6 lsa unknown

diff --git a/tests/topotests/ospf6-topo1/r1/zebra.conf b/tests/topotests/ospf6-topo1/r1/zebra.conf
index 3de7882c5d24bac22b7928b90835a20479b8c6e8..de298f40e159073062eebb917d93d28187f39cf5 100644 (file)
--- a/tests/topotests/ospf6-topo1/r1/zebra.conf
+++ b/tests/topotests/ospf6-topo1/r1/zebra.conf
@@ -1,6 +1,6 @@
 !
 hostname r1
-log file /tmp/r1-zebra.log
+log file zebra.log
 !
 interface r1-stubnet
  ipv6 address fc00:1:1:1::1/64

diff --git a/tests/topotests/ospf6-topo1/r2/ospf6d.conf b/tests/topotests/ospf6-topo1/r2/ospf6d.conf
index e98ed292245821f2343c182b0b2f6af5a2653428..bb9958d17387ac588c9193a8ff9e90800bef609a 100644 (file)
--- a/tests/topotests/ospf6-topo1/r2/ospf6d.conf
+++ b/tests/topotests/ospf6-topo1/r2/ospf6d.conf
@@ -1,5 +1,5 @@
 hostname r2
-log file /tmp/r2-ospf6d.log
+log file ospf6d.log
 !
 debug ospf6 message all
 debug ospf6 lsa unknown

diff --git a/tests/topotests/ospf6-topo1/r2/zebra.conf b/tests/topotests/ospf6-topo1/r2/zebra.conf
index 23bd2f73a8f8813208b3663187b25a217169a9dc..d5345fede679450c2142667c34dfab53b875885b 100644 (file)
--- a/tests/topotests/ospf6-topo1/r2/zebra.conf
+++ b/tests/topotests/ospf6-topo1/r2/zebra.conf
@@ -1,6 +1,6 @@
 !
 hostname r2
-log file /tmp/r2-zebra.log
+log file zebra.log
 !
 interface r2-stubnet
  ipv6 address fc00:2:2:2::2/64

diff --git a/tests/topotests/ospf6-topo1/r3/ospf6d.conf b/tests/topotests/ospf6-topo1/r3/ospf6d.conf
index e9ce6a5303c6dd6f838edb401d65cc87bcb80841..d2dbc4a41c433cb1a91dc86b69e63d41a1d8c856 100644 (file)
--- a/tests/topotests/ospf6-topo1/r3/ospf6d.conf
+++ b/tests/topotests/ospf6-topo1/r3/ospf6d.conf
@@ -1,5 +1,5 @@
 hostname r3
-log file /tmp/r3-ospf6d.log
+log file ospf6d.log
 !
 debug ospf6 message all
 debug ospf6 lsa unknown

diff --git a/tests/topotests/ospf6-topo1/r3/zebra.conf b/tests/topotests/ospf6-topo1/r3/zebra.conf
index d63489be94f55b642754a3dbd2b27c985d18e0a2..11f1ff59f24268d95192155552ce70304853cdd5 100644 (file)
--- a/tests/topotests/ospf6-topo1/r3/zebra.conf
+++ b/tests/topotests/ospf6-topo1/r3/zebra.conf
@@ -1,6 +1,6 @@
 !
 hostname r3
-log file /tmp/r3-zebra.log
+log file zebra.log
 !
 interface r3-stubnet
  ipv6 address fc00:3:3:3::3/64

diff --git a/tests/topotests/ospf6-topo1/r4/ospf6d.conf b/tests/topotests/ospf6-topo1/r4/ospf6d.conf
index 71f72a9c9913c37c91282bb2474d396d37d0a7fe..6f9c30d75a73adde0700ed10ec9a804fb1cf2ff2 100644 (file)
--- a/tests/topotests/ospf6-topo1/r4/ospf6d.conf
+++ b/tests/topotests/ospf6-topo1/r4/ospf6d.conf
@@ -1,5 +1,5 @@
 hostname r4
-log file /tmp/r4-ospf6d.log
+log file ospf6d.log
 !
 debug ospf6 message all
 debug ospf6 lsa unknown

diff --git a/tests/topotests/ospf6-topo1/r4/zebra.conf b/tests/topotests/ospf6-topo1/r4/zebra.conf
index 1434b08b3b82208fb06f56398df646f7160c39cf..4b0a8a1f92012a3dc3b4f07a5f71c33765eaad8a 100644 (file)
--- a/tests/topotests/ospf6-topo1/r4/zebra.conf
+++ b/tests/topotests/ospf6-topo1/r4/zebra.conf
@@ -1,6 +1,6 @@
 !
 hostname r4
-log file /tmp/r4-zebra.log
+log file zebra.log
 !
 interface r4-stubnet
  ipv6 address fc00:4:4:4::4/64

diff --git a/tests/topotests/rip-topo1/r1/ripd.conf b/tests/topotests/rip-topo1/r1/ripd.conf
index 7448f58634c9071cee4bb2bfacbeb3bcbf7d7ca6..70e70d3590b6047deb34753b31ab41446ba830eb 100644 (file)
--- a/tests/topotests/rip-topo1/r1/ripd.conf
+++ b/tests/topotests/rip-topo1/r1/ripd.conf
@@ -1,4 +1,4 @@
-log file /tmp/r1-ripd.log
+log file ripd.log
 !
 router rip
  version 2

diff --git a/tests/topotests/rip-topo1/r1/zebra.conf b/tests/topotests/rip-topo1/r1/zebra.conf
index 4dc46c2c8bf6f6bab19dc37b4d04652efcd322c8..8537f6dd80edadc79aa35b5c5165b5035f94ad89 100644 (file)
--- a/tests/topotests/rip-topo1/r1/zebra.conf
+++ b/tests/topotests/rip-topo1/r1/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r1-zebra.log
+log file zebra.log
 !
 hostname r1
 !

diff --git a/tests/topotests/rip-topo1/r2/ripd.conf b/tests/topotests/rip-topo1/r2/ripd.conf
index d4e3065cfe05f3de563ff8e432b888669caf7272..179a1ebd0fe937dbb9a217c3e1b2d3e660467ac3 100644 (file)
--- a/tests/topotests/rip-topo1/r2/ripd.conf
+++ b/tests/topotests/rip-topo1/r2/ripd.conf
@@ -1,4 +1,4 @@
-log file /tmp/r2-ripd.log
+log file ripd.log
 !
 !
 router rip

diff --git a/tests/topotests/rip-topo1/r2/zebra.conf b/tests/topotests/rip-topo1/r2/zebra.conf
index 74f7bfec0617f3e8055cacab6ed567474d3a73e8..c440f3a350ab46ec22fce31490ef82feabf0b99d 100644 (file)
--- a/tests/topotests/rip-topo1/r2/zebra.conf
+++ b/tests/topotests/rip-topo1/r2/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r2-zebra.log
+log file zebra.log
 !
 hostname r2
 !

diff --git a/tests/topotests/rip-topo1/r3/ripd.conf b/tests/topotests/rip-topo1/r3/ripd.conf
index e9918c975ff7263316240cf73663c7f74a3ac2f5..363b91b33a55aee49c3177588f5ba57b309a001c 100644 (file)
--- a/tests/topotests/rip-topo1/r3/ripd.conf
+++ b/tests/topotests/rip-topo1/r3/ripd.conf
@@ -1,4 +1,4 @@
-log file /tmp/r3-ripd.log
+log file ripd.log
 !
 !
 router rip

diff --git a/tests/topotests/rip-topo1/r3/zebra.conf b/tests/topotests/rip-topo1/r3/zebra.conf
index 1c79b36b3e2cb9f2b7a63d310fb4e7aaadbc0bb3..7f145b458313e82b4cb20e8da7d7d543a31f4b8b 100644 (file)
--- a/tests/topotests/rip-topo1/r3/zebra.conf
+++ b/tests/topotests/rip-topo1/r3/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r3-zebra.log
+log file zebra.log
 !
 hostname r3
 !

diff --git a/tests/topotests/ripng-topo1/r1/ripngd.conf b/tests/topotests/ripng-topo1/r1/ripngd.conf
index 64a6f84e3bc18e6788fc469d1dd1cfc9beda6a4f..5eb78eafe24b93c447a9111f09d3338cf3bfc47a 100644 (file)
--- a/tests/topotests/ripng-topo1/r1/ripngd.conf
+++ b/tests/topotests/ripng-topo1/r1/ripngd.conf
@@ -1,4 +1,4 @@
-log file /tmp/r1-ripngd.log
+log file ripngd.log
 !
 debug ripng events
 debug ripng packet

diff --git a/tests/topotests/ripng-topo1/r1/zebra.conf b/tests/topotests/ripng-topo1/r1/zebra.conf
index f315e90ea006c3b0a773a71865fba413d65d3952..1a103430445e54fea59298cd666448c3453fd3c3 100644 (file)
--- a/tests/topotests/ripng-topo1/r1/zebra.conf
+++ b/tests/topotests/ripng-topo1/r1/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r1-zebra.log
+log file zebra.log
 !
 hostname r1
 !

diff --git a/tests/topotests/ripng-topo1/r2/ripngd.conf b/tests/topotests/ripng-topo1/r2/ripngd.conf
index 919a64fae88d3f66182a3c07efa659b9057ef86f..a25a3cd490d70d2784594748a25d95f1f3b45f60 100644 (file)
--- a/tests/topotests/ripng-topo1/r2/ripngd.conf
+++ b/tests/topotests/ripng-topo1/r2/ripngd.conf
@@ -1,4 +1,4 @@
-log file /tmp/r2-ripngd.log
+log file ripngd.log
 !
 debug ripng events
 debug ripng packet

diff --git a/tests/topotests/ripng-topo1/r2/zebra.conf b/tests/topotests/ripng-topo1/r2/zebra.conf
index 0e90c2810ee635f010a76d54431f322605bc4b13..59006317d39ca351301a6fe78b25cbf9375d9a98 100644 (file)
--- a/tests/topotests/ripng-topo1/r2/zebra.conf
+++ b/tests/topotests/ripng-topo1/r2/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r2-zebra.log
+log file zebra.log
 !
 hostname r2
 !

diff --git a/tests/topotests/ripng-topo1/r3/ripngd.conf b/tests/topotests/ripng-topo1/r3/ripngd.conf
index ad49464fae6bd094c404543172e40bf4113cccd7..dfa5700adb1e250ea0af3819edec736d2cccac7c 100644 (file)
--- a/tests/topotests/ripng-topo1/r3/ripngd.conf
+++ b/tests/topotests/ripng-topo1/r3/ripngd.conf
@@ -1,4 +1,4 @@
-log file /tmp/r3-ripngd.log
+log file ripngd.log
 !
 debug ripng events
 debug ripng packet

diff --git a/tests/topotests/ripng-topo1/r3/zebra.conf b/tests/topotests/ripng-topo1/r3/zebra.conf
index cedb6ca48ad9fd33ac18f095b470dce90e92c44c..b43ba698343074a9f72b680bd9031fac18bfc400 100644 (file)
--- a/tests/topotests/ripng-topo1/r3/zebra.conf
+++ b/tests/topotests/ripng-topo1/r3/zebra.conf
@@ -1,4 +1,4 @@
-log file /tmp/r3-zebra.log
+log file zebra.log
 !
 hostname r3
 !