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 <sharpd@nvidia.com>

diff --git a/tests/topotests/ospf_sr_te_topo1/rt1/ospfd.conf b/tests/topotests/ospf_sr_te_topo1/rt1/ospfd.conf
index 064a4bf2863b387843bb43cb0f2f531150d2ed9b..b7f0d3f40d06643504753203b5984b795b2d8e10 100644 (file)
--- 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 65b20f0e63f2280c6dca6dd9475cdd29f46ea92f..734a0a6a393e1daafc295fc6cdd865ede5dab4d2 100644 (file)
--- 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 7cdf032eaa6a2fcbdbe0a29db201f4fe50d3dac2..6e51513ea694e9c182b28fa435bf131df233ac02 100644 (file)
--- 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 8f71cda443da99abd299205c598e6b20fc9753db..4cf0ae0cede22db34a1b1e8344f74dae1320bfe8 100644 (file)
--- 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 20c89757a839d1eafd4c7a357ccb09a7ded8ad4b..77e50fb770bbb9330ec891b5cdac5714fb937a9c 100644 (file)
--- 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 be9abf62382445c76d9c34748e0555c087ec1296..396ef6800eb75eb1251bf74eed646af034eda32d 100644 (file)
--- 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 30ef12a79eb97030b9c3105cebc479eec8b7e317..aca0772c21ee9a319e570c8de5771f1e4defe11e 100644 (file)
--- 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 e31567976598493d3ca3253c0658cd9b0b930a96..7601283d83d31df4727e04af471df29800e5e9d5 100644 (file)
--- 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 681aaa3a8cb7e4d6f545aff35c6df21e0bfe0968..8ce8f2ed96eff049d09a5f20805126e887d55755 100644 (file)
--- 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 0b441c70de901d934aa7f92c014a660c0c9afd0f..55ab5aa0d7db2edd8f45e31776792a6b12f29349 100644 (file)
--- 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 7bb5de94403df42e7a95d81b149dcfc69877b670..bd1c65416cd3140f762f1fcaa65d7899e2ea7d3a 100644 (file)
--- 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 04b2c381e22d4a20771985ac592ba4efcd36e777..f9c4eded48b275a7489ae7725f42378dd4edddb7 100644 (file)
--- 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 e6e4847ba7757c8729f48c5328e0a6a1f4dab730..b364580532cbb52097146e8ad001f10dafb129c3 100644 (file)
--- 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 472cdc6bcbd47479ef15bc2b44dfe711c82234c5..a22eabcf95f2c934f5e3b5fcc2765cf63b3e9dc1 100644 (file)
--- 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 75770dc5ddd340ce060fe9d71ef828fc656c8ed6..a128355adb77d83b57f0e86632548a4835c2e9e8 100644 (file)
--- 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 ef9d583ae915fb359b40103608253fc7e39d05be..8a0312afc8e05b1a721432a8ffd3820ae52eb44f 100644 (file)
--- 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 c453dec96cd9b5eef3bc5f609d562054d23a7fdf..569e8b279e857e482b9d48169ba28b599e88cf63 100644 (file)
--- 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