From: Donald Sharp Date: Wed, 19 Feb 2025 13:04:54 +0000 (-0500) Subject: tests: Remove warning about passive command X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d0a0e7061c7bf41803905da1d49656fe91b8007e;p=matthieu%2Ffrr.git tests: Remove warning about passive command Several tests have warnings about the passive command and how to use it. Let's address this. Signed-off-by: Donald Sharp --- diff --git a/tests/topotests/ospf_sr_te_topo1/rt1/ospfd.conf b/tests/topotests/ospf_sr_te_topo1/rt1/ospfd.conf index 064a4bf286..b7f0d3f40d 100644 --- a/tests/topotests/ospf_sr_te_topo1/rt1/ospfd.conf +++ b/tests/topotests/ospf_sr_te_topo1/rt1/ospfd.conf @@ -10,6 +10,7 @@ log file ospfd.log ! interface lo ip ospf area 0.0.0.0 + ip ospf passive ! interface eth-sw1 ip ospf network point-to-point @@ -27,7 +28,6 @@ router ospf mpls-te export mpls-te router-address 1.1.1.1 router-info area 0.0.0.0 - passive-interface lo segment-routing on segment-routing global-block 16000 23999 segment-routing node-msd 8 diff --git a/tests/topotests/ospf_sr_te_topo1/rt2/ospfd.conf b/tests/topotests/ospf_sr_te_topo1/rt2/ospfd.conf index 65b20f0e63..734a0a6a39 100644 --- a/tests/topotests/ospf_sr_te_topo1/rt2/ospfd.conf +++ b/tests/topotests/ospf_sr_te_topo1/rt2/ospfd.conf @@ -9,6 +9,7 @@ log file ospfd.log ! interface lo ip ospf area 0.0.0.0 + ip ospf passive ! interface eth-sw1 ip ospf network point-to-point @@ -38,7 +39,6 @@ router ospf !mpls-te export mpls-te router-address 2.2.2.2 router-info area 0.0.0.0 - passive-interface lo segment-routing on segment-routing global-block 16000 23999 segment-routing node-msd 8 diff --git a/tests/topotests/ospf_sr_te_topo1/rt4/ospfd.conf b/tests/topotests/ospf_sr_te_topo1/rt4/ospfd.conf index 7cdf032eaa..6e51513ea6 100644 --- a/tests/topotests/ospf_sr_te_topo1/rt4/ospfd.conf +++ b/tests/topotests/ospf_sr_te_topo1/rt4/ospfd.conf @@ -9,6 +9,7 @@ log file ospfd.log ! interface lo ip ospf area 0.0.0.0 + ip ospf passive ! interface eth-rt2-1 ip ospf network point-to-point @@ -44,7 +45,6 @@ router ospf !mpls-te export mpls-te router-address 4.4.4.4 router-info area 0.0.0.0 - passive-interface lo segment-routing on segment-routing global-block 16000 23999 segment-routing node-msd 8 diff --git a/tests/topotests/ospf_sr_te_topo1/rt5/ospfd.conf b/tests/topotests/ospf_sr_te_topo1/rt5/ospfd.conf index 8f71cda443..4cf0ae0ced 100644 --- a/tests/topotests/ospf_sr_te_topo1/rt5/ospfd.conf +++ b/tests/topotests/ospf_sr_te_topo1/rt5/ospfd.conf @@ -9,6 +9,7 @@ log file ospfd.log ! interface lo ip ospf area 0.0.0.0 + ip ospf passive ! interface eth-rt3-1 ip ospf network point-to-point @@ -44,7 +45,6 @@ router ospf ! mpls-te export mpls-te router-address 5.5.5.5 router-info area 0.0.0.0 - passive-interface lo segment-routing on segment-routing global-block 16000 23999 segment-routing node-msd 8 diff --git a/tests/topotests/ospf_sr_te_topo1/rt6/ospfd.conf b/tests/topotests/ospf_sr_te_topo1/rt6/ospfd.conf index 20c89757a8..77e50fb770 100644 --- a/tests/topotests/ospf_sr_te_topo1/rt6/ospfd.conf +++ b/tests/topotests/ospf_sr_te_topo1/rt6/ospfd.conf @@ -9,6 +9,7 @@ log file ospfd.log ! interface lo ip ospf area 0.0.0.0 + ip ospf passive ! interface eth-rt4 ip ospf network point-to-point @@ -32,7 +33,6 @@ router ospf mpls-te export mpls-te router-address 6.6.6.6 router-info area 0.0.0.0 - passive-interface lo segment-routing on segment-routing global-block 16000 23999 segment-routing node-msd 8 diff --git a/tests/topotests/ospf_sr_topo1/rt1/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt1/ospfd.conf index be9abf6238..396ef6800e 100644 --- a/tests/topotests/ospf_sr_topo1/rt1/ospfd.conf +++ b/tests/topotests/ospf_sr_topo1/rt1/ospfd.conf @@ -9,6 +9,7 @@ log file ospfd.log ! debug ospf zebra ! interface lo + ip ospf passive ! interface eth-sw1 ip ospf network broadcast @@ -23,7 +24,6 @@ router ospf mpls-te on mpls-te router-address 1.1.1.1 router-info area 0.0.0.0 - passive-interface lo segment-routing on segment-routing global-block 16000 23999 segment-routing node-msd 8 diff --git a/tests/topotests/ospf_sr_topo1/rt2/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt2/ospfd.conf index 30ef12a79e..aca0772c21 100644 --- a/tests/topotests/ospf_sr_topo1/rt2/ospfd.conf +++ b/tests/topotests/ospf_sr_topo1/rt2/ospfd.conf @@ -9,6 +9,7 @@ log file ospfd.log ! debug ospf zebra ! interface lo + ip ospf passive ! interface eth-sw1 ip ospf network broadcast @@ -33,7 +34,6 @@ router ospf mpls-te on mpls-te router-address 2.2.2.2 router-info area 0.0.0.0 - passive-interface lo segment-routing on segment-routing global-block 16000 23999 segment-routing node-msd 8 diff --git a/tests/topotests/ospf_sr_topo1/rt3/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt3/ospfd.conf index e315679765..7601283d83 100644 --- a/tests/topotests/ospf_sr_topo1/rt3/ospfd.conf +++ b/tests/topotests/ospf_sr_topo1/rt3/ospfd.conf @@ -9,6 +9,7 @@ log file ospfd.log ! debug ospf zebra ! interface lo + ip ospf passive ! interface eth-sw1 ip ospf network broadcast @@ -33,7 +34,6 @@ router ospf mpls-te on mpls-te router-address 3.3.3.3 router-info area 0.0.0.0 - passive-interface lo segment-routing on segment-routing global-block 17000 24999 segment-routing node-msd 8 diff --git a/tests/topotests/ospf_sr_topo1/rt4/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt4/ospfd.conf index 681aaa3a8c..8ce8f2ed96 100644 --- a/tests/topotests/ospf_sr_topo1/rt4/ospfd.conf +++ b/tests/topotests/ospf_sr_topo1/rt4/ospfd.conf @@ -9,6 +9,7 @@ log file ospfd.log ! debug ospf zebra ! interface lo + ip ospf passive ! interface eth-rt2-1 ip ospf network point-to-point @@ -38,7 +39,6 @@ router ospf mpls-te on mpls-te router-address 4.4.4.4 router-info area 0.0.0.0 - passive-interface lo segment-routing on segment-routing global-block 16000 23999 segment-routing node-msd 8 diff --git a/tests/topotests/ospf_sr_topo1/rt5/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt5/ospfd.conf index 0b441c70de..55ab5aa0d7 100644 --- a/tests/topotests/ospf_sr_topo1/rt5/ospfd.conf +++ b/tests/topotests/ospf_sr_topo1/rt5/ospfd.conf @@ -9,6 +9,7 @@ log file ospfd.log ! debug ospf zebra ! interface lo + ip ospf passive ! interface eth-rt3-1 ip ospf network point-to-point @@ -38,7 +39,6 @@ router ospf mpls-te on mpls-te router-address 5.5.5.5 router-info area 0.0.0.0 - passive-interface lo segment-routing on segment-routing global-block 16000 23999 segment-routing node-msd 8 diff --git a/tests/topotests/ospf_sr_topo1/rt6/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt6/ospfd.conf index 7bb5de9440..bd1c65416c 100644 --- a/tests/topotests/ospf_sr_topo1/rt6/ospfd.conf +++ b/tests/topotests/ospf_sr_topo1/rt6/ospfd.conf @@ -9,6 +9,7 @@ log file ospfd.log ! debug ospf zebra ! interface lo + ip ospf passive ! interface eth-rt4 ip ospf network point-to-point @@ -28,7 +29,6 @@ router ospf mpls-te on mpls-te router-address 6.6.6.6 router-info area 0.0.0.0 - passive-interface lo segment-routing on segment-routing global-block 16000 23999 segment-routing node-msd 8 diff --git a/tests/topotests/ospf_tilfa_topo1/rt1/ospfd.conf b/tests/topotests/ospf_tilfa_topo1/rt1/ospfd.conf index 04b2c381e2..f9c4eded48 100644 --- a/tests/topotests/ospf_tilfa_topo1/rt1/ospfd.conf +++ b/tests/topotests/ospf_tilfa_topo1/rt1/ospfd.conf @@ -2,6 +2,7 @@ ! debug ospf ti-lfa ! interface lo + ip ospf passive ! interface eth-rt2 ip ospf network point-to-point @@ -19,7 +20,6 @@ router ospf mpls-te on mpls-te router-address 1.1.1.1 router-info area 0.0.0.0 - passive-interface lo segment-routing on segment-routing global-block 16000 23999 segment-routing node-msd 8 diff --git a/tests/topotests/ospf_tilfa_topo1/rt2/ospfd.conf b/tests/topotests/ospf_tilfa_topo1/rt2/ospfd.conf index e6e4847ba7..b364580532 100644 --- a/tests/topotests/ospf_tilfa_topo1/rt2/ospfd.conf +++ b/tests/topotests/ospf_tilfa_topo1/rt2/ospfd.conf @@ -2,6 +2,7 @@ ! debug ospf ti-lfa ! interface lo + ip ospf passive ! interface eth-rt1 ip ospf network point-to-point @@ -19,7 +20,6 @@ router ospf mpls-te on mpls-te router-address 1.1.1.2 router-info area 0.0.0.0 - passive-interface lo segment-routing on segment-routing global-block 16000 23999 segment-routing node-msd 8 diff --git a/tests/topotests/ospf_tilfa_topo1/rt3/ospfd.conf b/tests/topotests/ospf_tilfa_topo1/rt3/ospfd.conf index 472cdc6bcb..a22eabcf95 100644 --- a/tests/topotests/ospf_tilfa_topo1/rt3/ospfd.conf +++ b/tests/topotests/ospf_tilfa_topo1/rt3/ospfd.conf @@ -2,6 +2,7 @@ ! debug ospf ti-lfa ! interface lo + ip ospf passive ! interface eth-rt1 ip ospf network point-to-point @@ -19,7 +20,6 @@ router ospf mpls-te on mpls-te router-address 1.1.1.3 router-info area 0.0.0.0 - passive-interface lo segment-routing on segment-routing global-block 16000 23999 segment-routing node-msd 8 diff --git a/tests/topotests/ospf_tilfa_topo1/rt4/ospfd.conf b/tests/topotests/ospf_tilfa_topo1/rt4/ospfd.conf index 75770dc5dd..a128355adb 100644 --- a/tests/topotests/ospf_tilfa_topo1/rt4/ospfd.conf +++ b/tests/topotests/ospf_tilfa_topo1/rt4/ospfd.conf @@ -2,6 +2,7 @@ ! debug ospf ti-lfa ! interface lo + ip ospf passive ! interface eth-rt2 ip ospf network point-to-point @@ -19,7 +20,6 @@ router ospf mpls-te on mpls-te router-address 1.1.1.4 router-info area 0.0.0.0 - passive-interface lo segment-routing on segment-routing global-block 16000 23999 segment-routing node-msd 8 diff --git a/tests/topotests/ospf_tilfa_topo1/rt5/ospfd.conf b/tests/topotests/ospf_tilfa_topo1/rt5/ospfd.conf index ef9d583ae9..8a0312afc8 100644 --- a/tests/topotests/ospf_tilfa_topo1/rt5/ospfd.conf +++ b/tests/topotests/ospf_tilfa_topo1/rt5/ospfd.conf @@ -2,6 +2,7 @@ ! debug ospf ti-lfa ! interface lo + ip ospf passive ! interface eth-rt3 ip ospf network point-to-point @@ -19,7 +20,6 @@ router ospf mpls-te on mpls-te router-address 1.1.1.5 router-info area 0.0.0.0 - passive-interface lo segment-routing on segment-routing global-block 16000 23999 segment-routing node-msd 8 diff --git a/tests/topotests/pim_acl/r1/ospfd.conf b/tests/topotests/pim_acl/r1/ospfd.conf index c453dec96c..569e8b279e 100644 --- a/tests/topotests/pim_acl/r1/ospfd.conf +++ b/tests/topotests/pim_acl/r1/ospfd.conf @@ -2,6 +2,9 @@ hostname r1 ! ! debug ospf event ! +interface r1-eth0 + ip ospf passive +! interface r1-eth1 ip ospf hello-interval 2 ip ospf dead-interval 10 @@ -9,7 +12,6 @@ interface r1-eth1 ! router ospf ospf router-id 192.168.0.1 - passive-interface r1-eth0 network 192.168.0.1/32 area 0 network 192.168.100.0/24 area 0 network 192.168.101.0/24 area 0