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

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

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 1713ecd2093d07400b832780ce818270922d2a32..90d4eeb74958961932470f713988653241967136 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,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 41cce5e6f43789f841903bbf1762e86c520cdb2f..ae99139e974017f5665789f1d688fa2881442f07 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/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 6bfa411eddcf6a555eacf149bd0c2c0d0c6f93c5..bf0e43121da3470ee6576276f2f828819f472dee 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,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 b12a9d6e688a49113a287361b5593f6b5c3af50f..d86264baf08ad92006ff3453c203347f66078fea 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/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 1fe3a1a72805d940f4439f64258bd3587ab36413..1e5bc00a31106998f548214b0546922eda89b78a 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,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 65a5bfc86f42d32b869e0ccf39b9e69bbfbc14d8..0565414bdd4404ff4bedc98cb6af32a9de506fcb 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/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 6f7c7a2a396ac28060d9b299351b2a081dc02683..d5e15c896981c85a739f1fec28d93252aaebc3eb 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,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 540059eb26256aefd1ba6fc758e343f831b62973..af3b6b4f3991d14a1ff3d436def60d9902c3c765 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/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 5dc8201d56d75275db71192a83fc31b1f6e51c69..322fdac5767685427f28ff9946552ead4ec604b4 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/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 d05e7c9406e40dd1f8672d6354cf9b0992f5718f..7d5fbb31147e8cd4709ff3d221054ed39efd64d8 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/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 db3ffa2f5d397a2f546d72d5f2a912541442fa21..3dbd202ba3034620e49941d13c12188ecc8753e3 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/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 f027ad8620ca91b575cde693e8ce021070120361..fe4cb67e30e166b8fe2235eaf9ad53adc26aec79 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/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 c58914a7fa7e4eb8a66b16fdfe32803b56c68643..435eb06970d75c507022baabc51f61eb950e2a92 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/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 c5e4badccade319064e3151205d1928b53b69ea6..d5f5cb8bc103115f4787bf632b2d1c76e782a220 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/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 4a830d7b24d938cf2aa8e3f82f0ff3a57509e516..38830ea6dbec56558881b611224a2caacc9fa98f 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,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 e0caa9475f5473ffa851392c432f1638fe7e3859..a40db1a9b2f5564c118959e0668e8e9ac2ae56fb 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/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 bbd9487532debac7fabc68f586c8cabb3828e53e..bd4f1858b5e134cce304e6e70f15deb04fd9fc87 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/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 348753a2055b30f164212eae433ca32a1a82f437..d6dfbbe437a4503b342efda5d76054ccb55a54a5 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/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 14fa2e4df5ed54eeaf85285923b42682a0d3e252..2ed84e16e64b23ae7f485d00df573f0d6eea4245 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/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 c2355d2b26a197d27db2fe61210bd20a2fd05a8d..6b16aa953ca2e2a272dda9a6078621356320c59b 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/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 8420c78e85183408f17dac3ebb82b091fbb2ce3e..fa2ed0b5ab75868cc9c71688d30abcf70c581381 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/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