From: Rafael Zalamena <rzalamena@gmail.com>
Date: Fri, 21 Jul 2017 13:33:50 +0000 (-0300)
Subject: ospf-topo: remove log file specification
X-Git-Tag: frr-7.1-dev~151^2~257
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a61e85ab38bedc8bf82dd0fa529a665a0c83d882;p=mirror%2Ffrr.git

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 97779cf7c8..6a40f859db 100644
--- 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 f1b43b8214..1226b72f2b 100644
--- 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 fd3acbe7e3..f6e8efe7f2 100644
--- 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 d9039ce90a..7448b25327 100644
--- 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 11c416d574..78d980315d 100644
--- 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 e247d9e51b..407416cdc4 100644
--- 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 6ea308ba28..e853e0e2b2 100644
--- 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 00023e2ba9..dbb7215d10 100644
--- 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 49046a35cd..a635a889bb 100644
--- 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 35c046a9bd..dcc07a4fdc 100644
--- 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 6826808c52..01b29ca057 100644
--- 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 fec7e36d4f..39ecbb2401 100644
--- 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
-!