ospf-topo: remove log file specification

We don't need to set logging file per-daemon as topogen will already do
that for us. Also, remove hostname line as it seems to have no effect.

diff --git a/tests/topotests/ospf-topo1/r1/ospf6d.conf b/tests/topotests/ospf-topo1/r1/ospf6d.conf
index 97779cf7c810517e6248612d75dc12c479526f17..6a40f859dbada4265d2d5bc16eee9f8b4ccef479 100644 (file)
--- a/tests/topotests/ospf-topo1/r1/ospf6d.conf
+++ b/tests/topotests/ospf-topo1/r1/ospf6d.conf
@@ -1,4 +1,3 @@
-log file /tmp/r1-ospf6d.log
 !
 router ospf6
  router-id 10.0.255.1

diff --git a/tests/topotests/ospf-topo1/r1/ospfd.conf b/tests/topotests/ospf-topo1/r1/ospfd.conf
index f1b43b82145ed497e20929442701269e83589e98..1226b72f2b241424fb638ca85b8af932aeacf1e8 100644 (file)
--- a/tests/topotests/ospf-topo1/r1/ospfd.conf
+++ b/tests/topotests/ospf-topo1/r1/ospfd.conf
@@ -1,4 +1,3 @@
-log file /tmp/r1-ospfd.log
 !
 router ospf
   ospf router-id 10.0.255.1

diff --git a/tests/topotests/ospf-topo1/r1/zebra.conf b/tests/topotests/ospf-topo1/r1/zebra.conf
index fd3acbe7e36ea9965b2bc6a24338f51463ba2fad..f6e8efe7f2ca1872d3a92ff35c9f3fed9a61b8b6 100644 (file)
--- a/tests/topotests/ospf-topo1/r1/zebra.conf
+++ b/tests/topotests/ospf-topo1/r1/zebra.conf
@@ -1,7 +1,4 @@
 !
-hostname r1
-log file /tmp/r1-zebra.log
-!
 interface r1-eth0
  ip address 10.0.1.1/24
  ipv6 address 2001:db8:1::1/64
@@ -12,5 +9,3 @@ interface r1-eth1
 !
 ip forwarding
 !
-line vty
-!

diff --git a/tests/topotests/ospf-topo1/r2/ospf6d.conf b/tests/topotests/ospf-topo1/r2/ospf6d.conf
index d9039ce90a4ca6bc6db90e73c22d42ce37c3d6b9..7448b25327f38a3ae00546e395242c2edfe85872 100644 (file)
--- a/tests/topotests/ospf-topo1/r2/ospf6d.conf
+++ b/tests/topotests/ospf-topo1/r2/ospf6d.conf
@@ -1,4 +1,3 @@
-log file /tmp/r2-ospf6d.log
 !
 router ospf6
  router-id 10.0.255.2

diff --git a/tests/topotests/ospf-topo1/r2/ospfd.conf b/tests/topotests/ospf-topo1/r2/ospfd.conf
index 11c416d5744aa67cf364d32230f30c35ce13890f..78d980315d0139e8c2c985ea348842a6eca27fcc 100644 (file)
--- a/tests/topotests/ospf-topo1/r2/ospfd.conf
+++ b/tests/topotests/ospf-topo1/r2/ospfd.conf
@@ -1,4 +1,3 @@
-log file /tmp/r1-ospfd.log
 !
 router ospf
   ospf router-id 10.0.255.2

diff --git a/tests/topotests/ospf-topo1/r2/zebra.conf b/tests/topotests/ospf-topo1/r2/zebra.conf
index e247d9e51be365fea21a6a223d62149465dfb003..407416cdc4f353ae24c60066b3c048780596a7db 100644 (file)
--- a/tests/topotests/ospf-topo1/r2/zebra.conf
+++ b/tests/topotests/ospf-topo1/r2/zebra.conf
@@ -1,7 +1,4 @@
 !
-hostname r2
-log file /tmp/r2-zebra.log
-!
 interface r2-eth0
  ip address 10.0.2.1/24
  ipv6 address 2001:db8:2::1/64
@@ -12,5 +9,3 @@ interface r2-eth1
 !
 ip forwarding
 !
-line vty
-!

diff --git a/tests/topotests/ospf-topo1/r3/ospf6d.conf b/tests/topotests/ospf-topo1/r3/ospf6d.conf
index 6ea308ba282147202f0c473b39f856bdfed25d61..e853e0e2b2d12066049d8a9f448ef39041bf5b0e 100644 (file)
--- a/tests/topotests/ospf-topo1/r3/ospf6d.conf
+++ b/tests/topotests/ospf-topo1/r3/ospf6d.conf
@@ -1,4 +1,3 @@
-log file /tmp/r3-ospf6d.log
 !
 router ospf6
  router-id 10.0.255.3

diff --git a/tests/topotests/ospf-topo1/r3/ospfd.conf b/tests/topotests/ospf-topo1/r3/ospfd.conf
index 00023e2ba95e70bff65887e18cb8a3fb8c15c37b..dbb7215d1008f86b62cf1305577ee4cf1f829241 100644 (file)
--- a/tests/topotests/ospf-topo1/r3/ospfd.conf
+++ b/tests/topotests/ospf-topo1/r3/ospfd.conf
@@ -1,4 +1,3 @@
-log file /tmp/r3-ospfd.log
 !
 router ospf
   ospf router-id 10.0.255.3

diff --git a/tests/topotests/ospf-topo1/r3/zebra.conf b/tests/topotests/ospf-topo1/r3/zebra.conf
index 49046a35cd0634a94eb585c32d0e838eeb88d6d1..a635a889bb347bf770d422d399f4a9bb3805c0b7 100644 (file)
--- a/tests/topotests/ospf-topo1/r3/zebra.conf
+++ b/tests/topotests/ospf-topo1/r3/zebra.conf
@@ -1,7 +1,4 @@
 !
-hostname r3
-log file /tmp/r3-zebra.log
-!
 interface r3-eth0
  ip address 10.0.3.1/24
  ipv6 address 2001:db8:3::1/64
@@ -16,5 +13,3 @@ interface r3-eth2
 !
 ip forwarding
 !
-line vty
-!

diff --git a/tests/topotests/ospf-topo1/r4/ospf6d.conf b/tests/topotests/ospf-topo1/r4/ospf6d.conf
index 35c046a9bd9348cd88e6005bfcf2d8e4790b9008..dcc07a4fdcd96732b948ade81c63b7b40b06bd7d 100644 (file)
--- a/tests/topotests/ospf-topo1/r4/ospf6d.conf
+++ b/tests/topotests/ospf-topo1/r4/ospf6d.conf
@@ -1,4 +1,3 @@
-log file /tmp/r4-ospf6d.log
 !
 router ospf6
  router-id 10.0.255.4

diff --git a/tests/topotests/ospf-topo1/r4/ospfd.conf b/tests/topotests/ospf-topo1/r4/ospfd.conf
index 6826808c52fca9a1a6fc726fb5b6940a144fa46f..01b29ca057041b9a48867287f464623746a97dac 100644 (file)
--- a/tests/topotests/ospf-topo1/r4/ospfd.conf
+++ b/tests/topotests/ospf-topo1/r4/ospfd.conf
@@ -1,4 +1,3 @@
-log file /tmp/r4-ospfd.log
 !
 router ospf
   ospf router-id 10.0.255.4

diff --git a/tests/topotests/ospf-topo1/r4/zebra.conf b/tests/topotests/ospf-topo1/r4/zebra.conf
index fec7e36d4fa54d915af999857e44ba60ea3af43e..39ecbb240156e58b760fdbea6c28e69cd956f66c 100644 (file)
--- a/tests/topotests/ospf-topo1/r4/zebra.conf
+++ b/tests/topotests/ospf-topo1/r4/zebra.conf
@@ -1,7 +1,4 @@
 !
-hostname r4
-log file /tmp/r4-zebra.log
-!
 interface r4-eth0
  ip address 172.16.0.1/24
  ipv6 address 2001:db8:200::1/64
@@ -12,5 +9,3 @@ interface r4-eth1
 !
 ip forwarding
 !
-line vty
-!