From 2b0e32967cf5cd144b57646576294ecd43bd4fc4 Mon Sep 17 00:00:00 2001 From: Lou Berger Date: Thu, 10 May 2018 17:38:29 -0400 Subject: [PATCH] *: convert startup logs to use per node directories also have startup and running log files match Signed-off-by: Lou Berger --- tests/topotests/all-protocol-startup/r1/bgpd.conf | 2 +- tests/topotests/all-protocol-startup/r1/isisd.conf | 2 +- tests/topotests/all-protocol-startup/r1/ldpd.conf | 2 +- tests/topotests/all-protocol-startup/r1/ospf6d.conf | 2 +- tests/topotests/all-protocol-startup/r1/ospfd.conf | 2 +- tests/topotests/all-protocol-startup/r1/ripd.conf | 2 +- tests/topotests/all-protocol-startup/r1/ripngd.conf | 2 +- tests/topotests/all-protocol-startup/r1/zebra.conf | 2 +- tests/topotests/bgp-ecmp-topo1/r1/bgpd.conf | 2 +- tests/topotests/bgp-ecmp-topo1/r1/zebra.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/zebra.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/zebra.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/zebra.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ldpd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ospfd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_direct/r1/zebra.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ldpd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ospfd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_direct/r2/zebra.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ldpd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ospfd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_direct/r3/zebra.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ldpd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ospfd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_direct/r4/zebra.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/zebra.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/zebra.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/zebra.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/zebra.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ldpd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ospfd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/zebra.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/bgpd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ldpd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ospfd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/zebra.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ldpd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ospfd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/zebra.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ldpd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ospfd.conf | 2 +- tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/zebra.conf | 2 +- tests/topotests/bgp_multiview_topo1/r1/bgpd.conf | 2 +- tests/topotests/bgp_multiview_topo1/r1/zebra.conf | 2 +- tests/topotests/eigrp-topo1/r1/eigrpd.conf | 2 +- tests/topotests/eigrp-topo1/r1/zebra.conf | 2 +- tests/topotests/eigrp-topo1/r2/eigrpd.conf | 2 +- tests/topotests/eigrp-topo1/r2/zebra.conf | 2 +- tests/topotests/eigrp-topo1/r3/eigrpd.conf | 2 +- tests/topotests/eigrp-topo1/r3/zebra.conf | 2 +- tests/topotests/ldp-topo1/r1/ldpd.conf | 2 +- tests/topotests/ldp-topo1/r1/ospfd.conf | 2 +- tests/topotests/ldp-topo1/r1/zebra.conf | 2 +- tests/topotests/ldp-topo1/r2/ldpd.conf | 2 +- tests/topotests/ldp-topo1/r2/ospfd.conf | 2 +- tests/topotests/ldp-topo1/r2/zebra.conf | 2 +- tests/topotests/ldp-topo1/r3/ldpd.conf | 2 +- tests/topotests/ldp-topo1/r3/ospfd.conf | 2 +- tests/topotests/ldp-topo1/r3/zebra.conf | 2 +- tests/topotests/ldp-topo1/r4/ldpd.conf | 2 +- tests/topotests/ldp-topo1/r4/ospfd.conf | 2 +- tests/topotests/ldp-topo1/r4/zebra.conf | 2 +- tests/topotests/ldp-vpls-topo1/ce1/zebra.conf | 2 +- tests/topotests/ldp-vpls-topo1/ce2/zebra.conf | 2 +- tests/topotests/ldp-vpls-topo1/ce3/zebra.conf | 2 +- tests/topotests/ldp-vpls-topo1/r1/ldpd.conf | 2 +- tests/topotests/ldp-vpls-topo1/r1/ospfd.conf | 2 +- tests/topotests/ldp-vpls-topo1/r1/zebra.conf | 2 +- tests/topotests/ldp-vpls-topo1/r2/ldpd.conf | 2 +- tests/topotests/ldp-vpls-topo1/r2/ospfd.conf | 2 +- tests/topotests/ldp-vpls-topo1/r2/zebra.conf | 2 +- tests/topotests/ldp-vpls-topo1/r3/ldpd.conf | 2 +- tests/topotests/ldp-vpls-topo1/r3/ospfd.conf | 2 +- tests/topotests/ldp-vpls-topo1/r3/zebra.conf | 2 +- tests/topotests/ospf6-topo1/r1/ospf6d.conf | 2 +- tests/topotests/ospf6-topo1/r1/zebra.conf | 2 +- tests/topotests/ospf6-topo1/r2/ospf6d.conf | 2 +- tests/topotests/ospf6-topo1/r2/zebra.conf | 2 +- tests/topotests/ospf6-topo1/r3/ospf6d.conf | 2 +- tests/topotests/ospf6-topo1/r3/zebra.conf | 2 +- tests/topotests/ospf6-topo1/r4/ospf6d.conf | 2 +- tests/topotests/ospf6-topo1/r4/zebra.conf | 2 +- tests/topotests/rip-topo1/r1/ripd.conf | 2 +- tests/topotests/rip-topo1/r1/zebra.conf | 2 +- tests/topotests/rip-topo1/r2/ripd.conf | 2 +- tests/topotests/rip-topo1/r2/zebra.conf | 2 +- tests/topotests/rip-topo1/r3/ripd.conf | 2 +- tests/topotests/rip-topo1/r3/zebra.conf | 2 +- tests/topotests/ripng-topo1/r1/ripngd.conf | 2 +- tests/topotests/ripng-topo1/r1/zebra.conf | 2 +- tests/topotests/ripng-topo1/r2/ripngd.conf | 2 +- tests/topotests/ripng-topo1/r2/zebra.conf | 2 +- tests/topotests/ripng-topo1/r3/ripngd.conf | 2 +- tests/topotests/ripng-topo1/r3/zebra.conf | 2 +- 101 files changed, 101 insertions(+), 101 deletions(-) diff --git a/tests/topotests/all-protocol-startup/r1/bgpd.conf b/tests/topotests/all-protocol-startup/r1/bgpd.conf index 9ef8695896..4614287f27 100644 --- 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 b63bc3f8d3..413f8d15a9 100644 --- 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 b69007181e..02332a4e75 100644 --- 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 1a14eaac77..6d870f355f 100644 --- 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 1a901b9643..549f36fab4 100644 --- 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 899bfda984..4b35630b36 100644 --- 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 9b1f556277..199fe15ab9 100644 --- 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 afb28e0768..164104da7e 100644 --- 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 1488fe9381..627dc76c1b 100644 --- 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 3022913dd1..77c76cd490 100644 --- 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 41cce5e6f4..46831bb711 100644 --- 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 b12a9d6e68..fb4d8cc9c4 100644 --- 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 65a5bfc86f..77a1163a4b 100644 --- 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 428b674106..3c6cbddc2a 100644 --- 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 d05e7c9406..c5097e214f 100644 --- 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 cddc7b679a..18f61e0c54 100644 --- 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 9bba8d8387..bfdef21b75 100644 --- 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 c58914a7fa..8678813665 100644 --- 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 b74ce318e4..dd1dbac32b 100644 --- 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 53ccf9ed17..dbf1d72b5f 100644 --- 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 bbd9487532..c7c358f9dc 100644 --- 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 eff266bcfa..9dbc290243 100644 --- 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 7bfdf7f3a8..8f3533527d 100644 --- 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 c2355d2b26..83d09c09a4 100644 --- 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 6bcb302336..415f03df51 100644 --- 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 90d4eeb749..4bd0f95f2c 100644 --- 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 ae99139e97..46831bb711 100644 --- 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 bf0e43121d..2115f08741 100644 --- 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 d86264baf0..fb4d8cc9c4 100644 --- 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 1e5bc00a31..a65b36f364 100644 --- 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 0565414bdd..77a1163a4b 100644 --- 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 d5e15c8969..274eceaf0f 100644 --- 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 af3b6b4f39..bfd8ba8435 100644 --- 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 5866ef94c8..c1bad0b7c6 100644 --- 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 322fdac576..de84f2bc3f 100644 --- 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 7d5fbb3114..c5097e214f 100644 --- 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 3dbd202ba3..221bc7a839 100644 --- 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 ec0a51994b..4ccb0ca5c0 100644 --- 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 fe4cb67e30..411ba85ef6 100644 --- 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 435eb06970..8678813665 100644 --- 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 d5f5cb8bc1..dc4ef7ecc1 100644 --- 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 38830ea6db..2004612557 100644 --- 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 a40db1a9b2..6002895f48 100644 --- 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 bd4f1858b5..c7c358f9dc 100644 --- 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 d6dfbbe437..9ffc84fe2d 100644 --- 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 f6951d4608..b2df5990ce 100644 --- 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 2ed84e16e6..292e9a7187 100644 --- 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 6b16aa953c..83d09c09a4 100644 --- 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 fa2ed0b5ab..4f01a27b40 100644 --- 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 7cfcb6c9aa..0c24942f43 100644 --- 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 6aebf56f03..86343f56e4 100644 --- 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 9994a634e4..6c800abd9b 100644 --- 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 4dc46c2c8b..8537f6dd80 100644 --- 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 3713b3d578..56c747d97c 100644 --- 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 74f7bfec06..c440f3a350 100644 --- 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 460b9f0133..53ad1bb6a1 100644 --- 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 1c79b36b3e..7f145b4583 100644 --- 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 428b674106..3c6cbddc2a 100644 --- 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 8d12ea4446..6daf034d18 100644 --- 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 61fb7dc058..55b4b0e9c6 100644 --- 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 9bba8d8387..bfdef21b75 100644 --- 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 c58914a7fa..8678813665 100644 --- 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 b74ce318e4..dd1dbac32b 100644 --- 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 53ccf9ed17..dbf1d72b5f 100644 --- 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 c784bd745a..202be238ec 100644 --- 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 62d1f3a83a..456820fdb4 100644 --- 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 7bfdf7f3a8..8f3533527d 100644 --- 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 9f0784a9f2..569dbc54e2 100644 --- 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 ecec23ee58..4a270af578 100644 --- 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 f520fae113..6f165e2724 100644 --- 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 737f30b9e7..ac02d0f9a4 100644 --- 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 9e6b6b09e0..c6a5824d15 100644 --- 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 2ab7895bdb..a1c0c822d6 100644 --- 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 8d12ea4446..6daf034d18 100644 --- 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 b7ccccbd16..d0ec9f5d75 100644 --- 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 843f160163..06e5973040 100644 --- 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 c58914a7fa..8678813665 100644 --- 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 e5ecd69798..8bd800714c 100644 --- 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 7a9995d1b2..57a203bce3 100644 --- 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 8a58d95976..b6bafba205 100644 --- 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 6e4d0ce555..2ff61365b5 100644 --- 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 8fc431fc4a..c4b382171d 100644 --- 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 3de7882c5d..de298f40e1 100644 --- 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 e98ed29224..bb9958d173 100644 --- 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 23bd2f73a8..d5345fede6 100644 --- 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 e9ce6a5303..d2dbc4a41c 100644 --- 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 d63489be94..11f1ff59f2 100644 --- 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 71f72a9c99..6f9c30d75a 100644 --- 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 1434b08b3b..4b0a8a1f92 100644 --- 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 7448f58634..70e70d3590 100644 --- 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 4dc46c2c8b..8537f6dd80 100644 --- 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 d4e3065cfe..179a1ebd0f 100644 --- 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 74f7bfec06..c440f3a350 100644 --- 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 e9918c975f..363b91b33a 100644 --- 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 1c79b36b3e..7f145b4583 100644 --- 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 64a6f84e3b..5eb78eafe2 100644 --- 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 f315e90ea0..1a10343044 100644 --- 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 919a64fae8..a25a3cd490 100644 --- 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 0e90c2810e..59006317d3 100644 --- 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 ad49464fae..dfa5700adb 100644 --- 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 cedb6ca48a..b43ba69834 100644 --- 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 ! -- 2.39.5