From: Donald Sharp <sharpd@nvidia.com>
Date: Mon, 2 Dec 2024 15:49:58 +0000 (-0500)
Subject: tests: ospf_p2mp should not use /tmp
X-Git-Tag: base_10.3~188^2~6
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=3b9db86e13e92a03329bc25982215acecfcce043;p=matthieu%2Ffrr.git

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 ca84349cdc..fdc75633b1 100644
--- 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 89f255bb44..350c0de7ba 100644
--- 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 6e26897c49..c44e936f9d 100644
--- 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 429330987e..806914d814 100644
--- 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 a69e0557be..d89269b324 100644
--- 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 eada78450e..343a9d0086 100644
--- 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 1b8388584b..aa6c80d41e 100644
--- 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 3146ea0957..a1527f5aa9 100644
--- 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