tests: Reduce pim join/prune interval to 5 seconds

Tests should have low enough overhead that sending
the join/prune every 5 seconds should be sufficient
also it should allow us to converge faster in case of
dropped packets.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/tests/topotests/evpn_pim_1/leaf1/pimd.conf b/tests/topotests/evpn_pim_1/leaf1/pimd.conf
index 293e25208629cd13728db0fe91d1ac0d2267abd2..d85f33d1fc2972fedfb4b0ab6127286136640708 100644 (file)
--- a/tests/topotests/evpn_pim_1/leaf1/pimd.conf
+++ b/tests/topotests/evpn_pim_1/leaf1/pimd.conf
@@ -2,6 +2,7 @@ debug pim events
 debug pim nht
 debug pim zebra
 ip pim rp 192.168.100.1
+ip pim join-prune-interval 5
 !
 int lo
   ip pim

diff --git a/tests/topotests/evpn_pim_1/leaf2/pimd.conf b/tests/topotests/evpn_pim_1/leaf2/pimd.conf
index 08d5a19a2acf4bd316eb5d3e2c07cea6ea79cb99..d775b800b3337508238ac1da01cd723b9ec75da2 100644 (file)
--- a/tests/topotests/evpn_pim_1/leaf2/pimd.conf
+++ b/tests/topotests/evpn_pim_1/leaf2/pimd.conf
@@ -1,4 +1,5 @@
 ip pim rp 192.168.100.1
+ip pim join-prune-interval 5
 !
 int lo
   ip pim

diff --git a/tests/topotests/evpn_pim_1/spine/pimd.conf b/tests/topotests/evpn_pim_1/spine/pimd.conf
index 56adda5cc47de46e73290e39013030b5c112e296..12c6d6f85c0fa015d3bd8f4bab705e5ab473c17a 100644 (file)
--- a/tests/topotests/evpn_pim_1/spine/pimd.conf
+++ b/tests/topotests/evpn_pim_1/spine/pimd.conf
@@ -1,4 +1,5 @@
 ip pim rp 192.168.100.1
+ip pim join-prune-interval 5
 !
 int lo
   ip pim

diff --git a/tests/topotests/msdp_mesh_topo1/r1/pimd.conf b/tests/topotests/msdp_mesh_topo1/r1/pimd.conf
index 30cecee9e1ecf55722a158fe55708ad8724fc7dc..c2ffed4762348a15601e1651c0858829909c8022 100644 (file)
--- a/tests/topotests/msdp_mesh_topo1/r1/pimd.conf
+++ b/tests/topotests/msdp_mesh_topo1/r1/pimd.conf
@@ -10,6 +10,7 @@ interface r1-eth1
  ip igmp
 !
 ip pim rp 10.254.254.1
+ip pim join-prune-interval 5
 ip msdp timers 10 20 3
 ip msdp mesh-group mg-1 source 10.254.254.1
 ip msdp mesh-group mg-1 member 10.254.254.2

diff --git a/tests/topotests/msdp_mesh_topo1/r2/pimd.conf b/tests/topotests/msdp_mesh_topo1/r2/pimd.conf
index a51c6d58c759da09f896457eb86797a9842d20a3..1719a17007ffed0a91825edff266609ee87672ae 100644 (file)
--- a/tests/topotests/msdp_mesh_topo1/r2/pimd.conf
+++ b/tests/topotests/msdp_mesh_topo1/r2/pimd.conf
@@ -9,6 +9,7 @@ interface r2-eth1
  ip pim
 !
 ip pim rp 10.254.254.2
+ip pim join-prune-interval 5
 ip msdp timers 10 20 3
 ip msdp mesh-group mg-1 source 10.254.254.2
 ip msdp mesh-group mg-1 member 10.254.254.1

diff --git a/tests/topotests/msdp_mesh_topo1/r3/pimd.conf b/tests/topotests/msdp_mesh_topo1/r3/pimd.conf
index 663f78620e1334eb26dca55f3297c0b01328c336..2748a55d83a585fcf3cbd06556ff62c27d66afab 100644 (file)
--- a/tests/topotests/msdp_mesh_topo1/r3/pimd.conf
+++ b/tests/topotests/msdp_mesh_topo1/r3/pimd.conf
@@ -9,6 +9,7 @@ interface r3-eth1
  ip pim
  ip igmp
 !
+ip pim join-prune-interval 5
 ip pim rp 10.254.254.3
 ip msdp timers 10 20 3
 ip msdp mesh-group mg-1 source 10.254.254.3

diff --git a/tests/topotests/msdp_topo1/r1/pimd.conf b/tests/topotests/msdp_topo1/r1/pimd.conf
index fc289031f44e161656dcc81d4d21e217f61cfd1a..42743152714e2282e1908c8c2892c81a0d27a624 100644 (file)
--- a/tests/topotests/msdp_topo1/r1/pimd.conf
+++ b/tests/topotests/msdp_topo1/r1/pimd.conf
@@ -19,3 +19,4 @@ ip msdp timers 10 20 3
 ip msdp peer 192.168.0.2 source 192.168.0.1
 ip msdp peer 192.168.1.2 source 192.168.1.1
 ip pim rp 10.254.254.1
+ip pim join-prune-interval 5

diff --git a/tests/topotests/msdp_topo1/r2/pimd.conf b/tests/topotests/msdp_topo1/r2/pimd.conf
index ffa80b12d30dcd73eb1119ea2bffd1113644fe2c..a4a69bf05c62ab5d2106e5dad2528af67b0b02fe 100644 (file)
--- a/tests/topotests/msdp_topo1/r2/pimd.conf
+++ b/tests/topotests/msdp_topo1/r2/pimd.conf
@@ -15,3 +15,4 @@ ip msdp timers 10 20 3
 ip msdp peer 192.168.0.1 source 192.168.0.2
 ip msdp peer 192.168.2.2 source 192.168.2.1
 ip pim rp 10.254.254.2
+ip pim join-prune-interval 5

diff --git a/tests/topotests/msdp_topo1/r3/pimd.conf b/tests/topotests/msdp_topo1/r3/pimd.conf
index ab12f0573a2b82a91b1c45408631a95ae2a6f17b..db94447c767de6adcc7ba61ba56ab90ecc6cd4e5 100644 (file)
--- a/tests/topotests/msdp_topo1/r3/pimd.conf
+++ b/tests/topotests/msdp_topo1/r3/pimd.conf
@@ -15,3 +15,4 @@ ip msdp timers 10 20 3
 ip msdp peer 192.168.1.1 source 192.168.1.2
 ip msdp peer 192.168.3.2 source 192.168.3.1
 ip pim rp 10.254.254.3
+ip pim join-prune-interval 5

diff --git a/tests/topotests/msdp_topo1/r4/pimd.conf b/tests/topotests/msdp_topo1/r4/pimd.conf
index b2e05cb3cb63ca5e5f58a6ac4f4e46ac50e01e0a..e9bb59054ccef428c7e72cfd1ff52ba60c327932 100644 (file)
--- a/tests/topotests/msdp_topo1/r4/pimd.conf
+++ b/tests/topotests/msdp_topo1/r4/pimd.conf
@@ -19,3 +19,4 @@ ip msdp timers 10 20 3
 ip msdp peer 192.168.2.1 source 192.168.2.2
 ip msdp peer 192.168.3.1 source 192.168.3.2
 ip pim rp 10.254.254.4
+ip pim join-prune-interval 5

diff --git a/tests/topotests/pim_acl/r1/pimd.conf b/tests/topotests/pim_acl/r1/pimd.conf
index 72d28c9b021dff384ff0efa6dfa41636464b5860..a148c73146e38f8c3d2c2842365138bc8115af43 100644 (file)
--- a/tests/topotests/pim_acl/r1/pimd.conf
+++ b/tests/topotests/pim_acl/r1/pimd.conf
@@ -13,6 +13,7 @@ ip pim rp 192.168.0.12 prefix-list rp-pl-2
 ip pim rp 192.168.0.13 prefix-list rp-pl-3
 ip pim rp 192.168.0.14 prefix-list rp-pl-4
 ip pim rp 192.168.0.15 prefix-list rp-pl-5
+ip pim join-prune-interval 5
 !
 interface r1-eth0
  ip igmp

diff --git a/tests/topotests/pim_acl/r11/pimd.conf b/tests/topotests/pim_acl/r11/pimd.conf
index 05cd5ac91174fdc964fd7542d54bf7a893312ace..b1d45205daa837ad16a347ad87b4cc43e557d959 100644 (file)
--- a/tests/topotests/pim_acl/r11/pimd.conf
+++ b/tests/topotests/pim_acl/r11/pimd.conf
@@ -7,6 +7,7 @@ debug pim zebra
 debug pim bsm
 !
 ip pim rp 192.168.0.11 239.100.0.0/28
+ip pim join-prune-interval 5
 !
 interface lo
  ip pim

diff --git a/tests/topotests/pim_acl/r12/pimd.conf b/tests/topotests/pim_acl/r12/pimd.conf
index cedde73c59ac157acf0f60f8675ede5db3bf7d31..ba9e7d902fe600b8bd6f54920ae26ceab35253a0 100644 (file)
--- a/tests/topotests/pim_acl/r12/pimd.conf
+++ b/tests/topotests/pim_acl/r12/pimd.conf
@@ -7,6 +7,7 @@ debug pim zebra
 debug pim bsm
 !
 ip pim rp 192.168.0.12 239.100.0.17/32
+ip pim join-prune-interval 5
 !
 interface lo
  ip pim

diff --git a/tests/topotests/pim_acl/r13/pimd.conf b/tests/topotests/pim_acl/r13/pimd.conf
index 2dab0cabec31f76da0db8faedeb86e589f01981d..2ff1743574fc0d183d4a3e76938389de151ebe01 100644 (file)
--- a/tests/topotests/pim_acl/r13/pimd.conf
+++ b/tests/topotests/pim_acl/r13/pimd.conf
@@ -7,6 +7,7 @@ debug pim zebra
 debug pim bsm
 !
 ip pim rp 192.168.0.13 239.100.0.32/27
+ip pim join-prune-interval 5
 !
 interface lo
  ip pim

diff --git a/tests/topotests/pim_acl/r14/pimd.conf b/tests/topotests/pim_acl/r14/pimd.conf
index c6b949af16216d44cc8bc7a548cdf5bd9b064f26..1324a9e40b34764682801682a16578d3d893d665 100644 (file)
--- a/tests/topotests/pim_acl/r14/pimd.conf
+++ b/tests/topotests/pim_acl/r14/pimd.conf
@@ -8,6 +8,7 @@ debug pim bsm
 !
 ip pim rp 192.168.0.14 239.100.0.96/28
 ip pim rp 192.168.0.14 239.100.0.128/25
+ip pim join-prune-interval 5
 !
 interface lo
  ip pim

diff --git a/tests/topotests/pim_acl/r15/pimd.conf b/tests/topotests/pim_acl/r15/pimd.conf
index 85c9c51e1eb8644435f95d483add1befc0102568..f47e78c2219fa41e86d9baf5e2068619089fd9c9 100644 (file)
--- a/tests/topotests/pim_acl/r15/pimd.conf
+++ b/tests/topotests/pim_acl/r15/pimd.conf
@@ -7,6 +7,7 @@ debug pim zebra
 debug pim bsm
 !
 ip pim rp 192.168.0.15 239.100.0.64/28
+ip pim join-prune-interval 5
 !
 interface lo
  ip pim

diff --git a/tests/topotests/pim_basic/r1/pimd.conf b/tests/topotests/pim_basic/r1/pimd.conf
index f64a46deb38b24b160d9b91d53577eb0f5d6dce1..737019fa51470b367451f567ee9a77dc8c60b707 100644 (file)
--- a/tests/topotests/pim_basic/r1/pimd.conf
+++ b/tests/topotests/pim_basic/r1/pimd.conf
@@ -15,3 +15,4 @@ interface lo
   ip pim
 !
 ip pim rp 10.254.0.3
+ip pim join-prune-interval 5

diff --git a/tests/topotests/pim_basic/rp/pimd.conf b/tests/topotests/pim_basic/rp/pimd.conf
index 6e35c97971cd2a145cd0018716b32fa915d11c2c..fd26bc4d712d62263e987a7cc15947e924786349 100644 (file)
--- a/tests/topotests/pim_basic/rp/pimd.conf
+++ b/tests/topotests/pim_basic/rp/pimd.conf
@@ -6,6 +6,7 @@ interface rp-eth0
 interface lo
   ip pim
 !
+ip pim join-prune-interval 5
 ip pim rp 10.254.0.3
 ip pim register-accept-list ACCEPT
 

diff --git a/tests/topotests/pim_basic_topo2/r2/pimd.conf b/tests/topotests/pim_basic_topo2/r2/pimd.conf
index 0b32ded19aa1a9b02021e005bd73d96d5f7ab459..9f389deb11aeb3b785ac259ea4c944824ddf7f99 100644 (file)
--- a/tests/topotests/pim_basic_topo2/r2/pimd.conf
+++ b/tests/topotests/pim_basic_topo2/r2/pimd.conf
@@ -10,3 +10,4 @@ interface r2-eth2
  ip pim
  ip pim bfd
 !
+ip pim join-prune-interval 5

diff --git a/tests/topotests/pim_igmp_vrf/r1/pimd.conf b/tests/topotests/pim_igmp_vrf/r1/pimd.conf
index 6ee264d3d0073cd9cf3d9a4dc5ef179b40b5a440..f04c255de9ded36902ceddf00b63ebeb1f82fe74 100644 (file)
--- a/tests/topotests/pim_igmp_vrf/r1/pimd.conf
+++ b/tests/topotests/pim_igmp_vrf/r1/pimd.conf
@@ -24,3 +24,4 @@ interface r1-eth2
 interface r1-eth3
  ip pim
 !
+ip pim join-prune-interval 5

diff --git a/tests/topotests/pim_igmp_vrf/r11/pimd.conf b/tests/topotests/pim_igmp_vrf/r11/pimd.conf
index 05cd5ac91174fdc964fd7542d54bf7a893312ace..b1d45205daa837ad16a347ad87b4cc43e557d959 100644 (file)
--- a/tests/topotests/pim_igmp_vrf/r11/pimd.conf
+++ b/tests/topotests/pim_igmp_vrf/r11/pimd.conf
@@ -7,6 +7,7 @@ debug pim zebra
 debug pim bsm
 !
 ip pim rp 192.168.0.11 239.100.0.0/28
+ip pim join-prune-interval 5
 !
 interface lo
  ip pim

diff --git a/tests/topotests/pim_igmp_vrf/r12/pimd.conf b/tests/topotests/pim_igmp_vrf/r12/pimd.conf
index 531aec61ed971a447c6a9111226fdd53baaec537..5cb76efa22bff79442473070dd1b608c02f11e50 100644 (file)
--- a/tests/topotests/pim_igmp_vrf/r12/pimd.conf
+++ b/tests/topotests/pim_igmp_vrf/r12/pimd.conf
@@ -7,6 +7,7 @@ debug pim zebra
 debug pim bsm
 !
 ip pim rp 192.168.0.12 239.100.0.0/28
+ip pim join-prune-interval 5
 !
 interface lo
  ip pim