tests: ospf_metric_propagation do not use /tmp

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

diff --git a/tests/topotests/ospf_metric_propagation/h1/frr.conf b/tests/topotests/ospf_metric_propagation/h1/frr.conf
index 1196a192dd50b52438807e2f4d698cc2b9aa0e9f..b8d1834e24cad28fb1245de3ab8f101de5167bfd 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/h1/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/h1/frr.conf
@@ -1,10 +1,8 @@
 !
 hostname h1
-password zebra
-log file /tmp/h1-frr.log
 !
 ip route 0.0.0.0/0 10.0.91.1
 !
 interface h1-eth0
  ip address 10.0.91.2/24
-!
\ No newline at end of file
+!

diff --git a/tests/topotests/ospf_metric_propagation/h2/frr.conf b/tests/topotests/ospf_metric_propagation/h2/frr.conf
index f951fe6ba1d6b20641f73d5748fce0e51be68ac9..4377256261b3b1a3b5b27b725cf17c9f83a8997c 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/h2/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/h2/frr.conf
@@ -1,10 +1,8 @@
 !
 hostname h2
-password zebra
-log file /tmp/h2-frr.log
 !
 ip route 0.0.0.0/0 10.0.94.4
 !
 interface h2-eth0
  ip address 10.0.94.2/24
-!
\ No newline at end of file
+!

diff --git a/tests/topotests/ospf_metric_propagation/r1/frr.conf b/tests/topotests/ospf_metric_propagation/r1/frr.conf
index 4966e6a9da1bb1dfbf876418711bd068ee2fc66b..082f7df5193618e51a0ea1a86e567a60403f0489 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/r1/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/r1/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname r1
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r1-eth0
  ip address 10.0.1.1/24
@@ -93,4 +90,4 @@ route-map costplus permit 30
 route-map costplus permit 40
   set metric-type type-1
   set metric +1
-  exit
\ No newline at end of file
+  exit

diff --git a/tests/topotests/ospf_metric_propagation/r2/frr.conf b/tests/topotests/ospf_metric_propagation/r2/frr.conf
index 0ac5001b1b996e922f7345cab0d6d004492e5d93..e6ced31d876ed94cb19ec2deb10bd6857cbfbf2f 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/r2/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/r2/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname r2
-password zebra
-log file /tmp/r2-frr.log
-ip forwarding
 !
 interface r2-eth0
  ip address 10.0.1.2/24

diff --git a/tests/topotests/ospf_metric_propagation/r3/frr.conf b/tests/topotests/ospf_metric_propagation/r3/frr.conf
index 0859173f7971c2e741bbef8eff618010348eeaea..f6989057f66a5806533b6579a19b93fc311f1d68 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/r3/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/r3/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname r3
-password zebra
-log file /tmp/r3-frr.log
-ip forwarding
 !
 interface r3-eth0
  ip address 10.0.3.3/24

diff --git a/tests/topotests/ospf_metric_propagation/r4/frr.conf b/tests/topotests/ospf_metric_propagation/r4/frr.conf
index 743da272727f71de4d5a8762210388e51a44ddf5..b02ae18fc1476be8aab6203e9414163926669090 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/r4/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/r4/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname r4
-password zebra
-log file /tmp/r4-frr.log
-ip forwarding
 !
 interface r4-eth0
  ip address 10.0.3.4/24

diff --git a/tests/topotests/ospf_metric_propagation/ra/frr.conf b/tests/topotests/ospf_metric_propagation/ra/frr.conf
index 2434faeabc97a07c131cc0cec8c6d1af76ee5a7f..5ad819da01bb35182022b50c7e540f685ebf97a4 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/ra/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/ra/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname ra
-password zebra
-log file /tmp/ra-frr.log
-ip forwarding
 !
 interface ra-eth0
  ip address 10.0.50.5/24

diff --git a/tests/topotests/ospf_metric_propagation/rb/frr.conf b/tests/topotests/ospf_metric_propagation/rb/frr.conf
index b83532a8405a22a5557f063679828ed069ad85b9..21abefed2604620c483e69ef4d8081ed9909f59f 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/rb/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/rb/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname rb
-password zebra
-log file /tmp/rb-frr.log
-ip forwarding
 !
 interface rb-eth0
  ip address 10.0.50.6/24

diff --git a/tests/topotests/ospf_metric_propagation/rc/frr.conf b/tests/topotests/ospf_metric_propagation/rc/frr.conf
index dd8077c3949f1130fab83920825474d711b63270..0e6edd92a830ba70a47e7339f7d0647852a869d4 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/rc/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/rc/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname rc
-password zebra
-log file /tmp/rc-frr.log
-ip forwarding
 !
 interface rc-eth0
  ip address 10.0.70.7/24