bgp_l3vpn_to_bgp_vrf: Fixup topo test to write log files to same location at start of run

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

21 files changed, 26 insertions, 17 deletions

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 1713ecd209..90d4eeb749 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf
@@ -5,6 +5,8 @@ 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
+
 router bgp 5227
    bgp router-id 99.0.0.1
    neighbor 192.168.1.1 remote-as 5227
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 41cce5e6f4..ae99139e97 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/ce1-zebra.log
+log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/ce1-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 6bfa411edd..bf0e43121d 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf
@@ -5,6 +5,8 @@ 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
+
 router bgp 5227
    bgp router-id 99.0.0.2
    neighbor 192.168.1.1 remote-as 5227
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 b12a9d6e68..d86264baf0 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/ce2-zebra.log
+log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/ce2-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 1fe3a1a728..1e5bc00a31 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf
@@ -5,6 +5,8 @@ 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
+
 router bgp 5227
    bgp router-id 99.0.0.3
    neighbor 192.168.1.1 remote-as 5227
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 65a5bfc86f..0565414bdd 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/ce3-zebra.log
+log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/ce3-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 6f7c7a2a39..d5e15c8969 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf
@@ -5,6 +5,8 @@ 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
+
 router bgp 5228
    bgp router-id 99.0.0.4
    neighbor 192.168.2.1 remote-as 5228
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 540059eb26..af3b6b4f39 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/ce4-zebra.log
+log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/ce4-zebra.log
 !
 hostname ce4
 !
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 5dc8201d56..322fdac576 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/r1-ldpd.log
+log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r1-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 d05e7c9406..7d5fbb3114 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/r1-ospfd.log
+log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r1-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 db3ffa2f5d..3dbd202ba3 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/r1-zebra.log
+log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r1-zebra.log
 
 hostname r1
 password zebra
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 f027ad8620..fe4cb67e30 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/r2-ldpd.log
+log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r2-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 c58914a7fa..435eb06970 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/r2-ospfd.log
+log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r2-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 c5e4badcca..d5f5cb8bc1 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/r2-zebra.log
+log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r2-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 4a830d7b24..38830ea6db 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf
@@ -5,8 +5,9 @@ password zebra
 log stdout notifications
 log monitor notifications
 log commands
-debug bgp vpn label
+log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r3-bgpd.log
 
+debug bgp vpn label
 router bgp 5226
    bgp router-id 3.3.3.3
    bgp cluster-id 3.3.3.3
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 e0caa9475f..a40db1a9b2 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/r3-ldpd.log
+log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r3-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 bbd9487532..bd4f1858b5 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/r3-ospfd.log
+log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r3-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 348753a205..d6dfbbe437 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/r3-zebra.log
+log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r3-zebra.log
 
 hostname r3
 password zebra
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 14fa2e4df5..2ed84e16e6 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/r4-ldpd.log
+log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r4-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 c2355d2b26..6b16aa953c 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/r4-ospfd.log
+log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r4-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 8420c78e85..fa2ed0b5ab 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/r4-zebra.log
+log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r4-zebra.log
 
 hostname r4
 password zebra