tests: ospf_p2mp should not use /tmp

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

diff --git a/tests/topotests/ospf_p2mp/r1/frr-p2mp-non-broadcast.conf b/tests/topotests/ospf_p2mp/r1/frr-p2mp-non-broadcast.conf
index ca84349cdcf2dda3f1c8da867969fe3d0c184e8b..fdc75633b1a5108003aaaebf4f4b43e347156b8c 100644 (file)
--- a/tests/topotests/ospf_p2mp/r1/frr-p2mp-non-broadcast.conf
+++ b/tests/topotests/ospf_p2mp/r1/frr-p2mp-non-broadcast.conf
@@ -1,8 +1,5 @@
 !
 hostname r1
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r1-eth0
  ip address 10.1.0.1/24

diff --git a/tests/topotests/ospf_p2mp/r1/frr-p2mp.conf b/tests/topotests/ospf_p2mp/r1/frr-p2mp.conf
index 89f255bb44ea682bc3778771471db556f8891f6a..350c0de7baf61149caeed580ca5a279cc93d0813 100644 (file)
--- a/tests/topotests/ospf_p2mp/r1/frr-p2mp.conf
+++ b/tests/topotests/ospf_p2mp/r1/frr-p2mp.conf
@@ -1,13 +1,10 @@
 !
-!log file ospfd.log debug
 ! debug ospf event
 ! debug ospf client
 ! debug ospf lsa
 ! debug ospf packet all
 
 hostname r1
-password zebra
-log file /tmp/r1-frr.log
 ip forwarding
 !
 interface r1-eth0

diff --git a/tests/topotests/ospf_p2mp/r2/frr-p2mp-non-broadcast.conf b/tests/topotests/ospf_p2mp/r2/frr-p2mp-non-broadcast.conf
index 6e26897c494b72114faf07f682300a468a31fd60..c44e936f9d9946ff0d9642b6d6aea5fce095c5d7 100644 (file)
--- a/tests/topotests/ospf_p2mp/r2/frr-p2mp-non-broadcast.conf
+++ b/tests/topotests/ospf_p2mp/r2/frr-p2mp-non-broadcast.conf
@@ -1,8 +1,5 @@
 !
 hostname r2
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r2-eth0
  ip address 10.1.0.2/24

diff --git a/tests/topotests/ospf_p2mp/r2/frr-p2mp.conf b/tests/topotests/ospf_p2mp/r2/frr-p2mp.conf
index 429330987e06fed9b910f860c712c61cffa76b95..806914d814218455557e331815dc3e3ce338f95d 100644 (file)
--- a/tests/topotests/ospf_p2mp/r2/frr-p2mp.conf
+++ b/tests/topotests/ospf_p2mp/r2/frr-p2mp.conf
@@ -1,14 +1,10 @@
 !
-!log file ospfd.log debug
 ! debug ospf event
 ! debug ospf client
 ! debug ospf lsa
 ! debug ospf packet all
 !
 hostname r2
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r2-eth0
  ip address 10.1.0.2/24

diff --git a/tests/topotests/ospf_p2mp/r3/frr-p2mp-non-broadcast.conf b/tests/topotests/ospf_p2mp/r3/frr-p2mp-non-broadcast.conf
index a69e0557bee7030f86a89087a6807fbbe5b505fb..d89269b3244f9ed4652fc87ac75769c74c092673 100644 (file)
--- a/tests/topotests/ospf_p2mp/r3/frr-p2mp-non-broadcast.conf
+++ b/tests/topotests/ospf_p2mp/r3/frr-p2mp-non-broadcast.conf
@@ -1,8 +1,5 @@
 !
 hostname r3
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r3-eth0
  ip address 10.1.0.3/24

diff --git a/tests/topotests/ospf_p2mp/r3/frr-p2mp.conf b/tests/topotests/ospf_p2mp/r3/frr-p2mp.conf
index eada78450e81b4df291aefb98b9b2afd7c67fe20..343a9d0086279f5f5072c29d0c8fe40f3488dfb4 100644 (file)
--- a/tests/topotests/ospf_p2mp/r3/frr-p2mp.conf
+++ b/tests/topotests/ospf_p2mp/r3/frr-p2mp.conf
@@ -1,14 +1,10 @@
 !
-!log file ospfd.log debug
 ! debug ospf event
 ! debug ospf client
 ! debug ospf lsa
 ! debug ospf packet all
 !
 hostname r3
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r3-eth0
  ip address 10.1.0.3/24

diff --git a/tests/topotests/ospf_p2mp/r4/frr-p2mp-non-broadcast.conf b/tests/topotests/ospf_p2mp/r4/frr-p2mp-non-broadcast.conf
index 1b8388584b826093b93e0901cbcaad205bc0f173..aa6c80d41e2b4909122c32126fbbd104ca26f357 100644 (file)
--- a/tests/topotests/ospf_p2mp/r4/frr-p2mp-non-broadcast.conf
+++ b/tests/topotests/ospf_p2mp/r4/frr-p2mp-non-broadcast.conf
@@ -1,8 +1,5 @@
 !
 hostname r4
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r4-eth0
  ip address 10.1.0.4/24

diff --git a/tests/topotests/ospf_p2mp/r4/frr-p2mp.conf b/tests/topotests/ospf_p2mp/r4/frr-p2mp.conf
index 3146ea095762cfe1e96b0323afd169ac31a615c4..a1527f5aa9891e6ce93a2435321c5c4ceb484e47 100644 (file)
--- a/tests/topotests/ospf_p2mp/r4/frr-p2mp.conf
+++ b/tests/topotests/ospf_p2mp/r4/frr-p2mp.conf
@@ -1,14 +1,10 @@
 !
-!log file ospfd.log debug
 ! debug ospf event
 ! debug ospf client
 ! debug ospf lsa
 ! debug ospf packet all
 !
 hostname r4
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r4-eth0
  ip address 10.1.0.4/24