tests: Modify bgpd.conf to have faster keepalive/hold timers

Modify bgpd.conf in all easily accessible topotests to use 3 10
as their timers du jour.  This will allow the tests to converge
faster.

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

diff --git a/tests/topotests/all-protocol-startup/r1/bgpd.conf b/tests/topotests/all-protocol-startup/r1/bgpd.conf
index e000b4e625d691c10bb35b338488bce7ec635613..d287b86175c6806f87c188717a2d6897e27c9e68 100644 (file)
--- a/tests/topotests/all-protocol-startup/r1/bgpd.conf
+++ b/tests/topotests/all-protocol-startup/r1/bgpd.conf
@@ -7,9 +7,13 @@ router bgp 100
  no bgp ebgp-requires-policy
  no bgp network import-check
  neighbor 192.168.7.10 remote-as 100
+ neighbor 192.168.7.10 timers 3 10
  neighbor 192.168.7.20 remote-as 200
+ neighbor 192.168.7.20 timers 3 10
  neighbor fc00:0:0:8::1000 remote-as 100
+ neighbor fc00:0:0:8::1000 timers 3 10
  neighbor fc00:0:0:8::2000 remote-as 200
+ neighbor fc00:0:0:8::2000 timers 3 10
  !
  address-family ipv4 unicast
   network 192.168.0.0/24

diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r1/bgpd.conf b/tests/topotests/bfd-bgp-cbit-topo3/r1/bgpd.conf
index 82b189b29205b554867ba6ec4698e8d53b46487c..689797a5e6b0429694d1e0a838d96bd78ac9567f 100644 (file)
--- a/tests/topotests/bfd-bgp-cbit-topo3/r1/bgpd.conf
+++ b/tests/topotests/bfd-bgp-cbit-topo3/r1/bgpd.conf
@@ -6,6 +6,7 @@ router bgp 101
  timers bgp 8 24
  bgp graceful-restart
  neighbor 2001:db8:4::1 remote-as 102
+ neighbor 2001:db8:4::1 timers 3 10
  neighbor 2001:db8:4::1 remote-as external
  neighbor 2001:db8:4::1 bfd
  neighbor 2001:db8:4::1 bfd check-control-plane-failure

diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r3/bgpd.conf b/tests/topotests/bfd-bgp-cbit-topo3/r3/bgpd.conf
index e566e08f7df311f697f13f77d87d0f931fc11bf5..1f5aac42ed6824e67e7405833f9bda23c1cab908 100644 (file)
--- a/tests/topotests/bfd-bgp-cbit-topo3/r3/bgpd.conf
+++ b/tests/topotests/bfd-bgp-cbit-topo3/r3/bgpd.conf
@@ -10,6 +10,7 @@ router bgp 102
  bgp graceful-restart stalepath-time 900
  bgp graceful-restart restart-time 900
  neighbor 2001:db8:1::1 remote-as 101
+ neighbor 2001:db8:1::1 timers 3 10
  neighbor 2001:db8:1::1 remote-as external
  neighbor 2001:db8:1::1 update-source 2001:db8:4::1
  neighbor 2001:db8:1::1 bfd

diff --git a/tests/topotests/bfd-profiles-topo1/r2/bgpd.conf b/tests/topotests/bfd-profiles-topo1/r2/bgpd.conf
index 824d01983fd8c43c5dc99f30aea125a77f7579c3..0c3db97bc17a02ef18345346255042b1119eeaaf 100644 (file)
--- a/tests/topotests/bfd-profiles-topo1/r2/bgpd.conf
+++ b/tests/topotests/bfd-profiles-topo1/r2/bgpd.conf
@@ -4,8 +4,10 @@ router bgp 100
  bgp router-id 10.254.254.2
  no bgp ebgp-requires-policy
  neighbor 172.16.1.1 remote-as 100
+ neighbor 172.16.1.1 timers 3 10
  neighbor 172.16.1.1 bfd profile fasttx
  neighbor 2001:db8:2::2 remote-as 200
+ neighbor 2001:db8:2::2 timers 3 10
  neighbor 2001:db8:2::2 ebgp-multihop 2
  neighbor 2001:db8:2::2 bfd profile slowtx
  address-family ipv4 unicast

diff --git a/tests/topotests/bfd-profiles-topo1/r3/bgpd.conf b/tests/topotests/bfd-profiles-topo1/r3/bgpd.conf
index c7b75d2fde2b59c2159f9d8767de4221df102ea2..65647b39e51dd09d2e2b53292329a5c6f20dd502 100644 (file)
--- a/tests/topotests/bfd-profiles-topo1/r3/bgpd.conf
+++ b/tests/topotests/bfd-profiles-topo1/r3/bgpd.conf
@@ -1,6 +1,7 @@
 router bgp 100
  bgp router-id 10.254.254.3
  neighbor 172.16.1.2 remote-as 100
+ neighbor 172.16.1.2 timers 3 10
  neighbor 172.16.1.2 bfd profile DOES_NOT_EXIST
  address-family ipv4 unicast
   redistribute connected

diff --git a/tests/topotests/bfd-profiles-topo1/r4/bgpd.conf b/tests/topotests/bfd-profiles-topo1/r4/bgpd.conf
index aff1016deeafe4644632f5ab21842ff73594ea4e..200937a9a51912de916056ae0e15a28c7d31aef5 100644 (file)
--- a/tests/topotests/bfd-profiles-topo1/r4/bgpd.conf
+++ b/tests/topotests/bfd-profiles-topo1/r4/bgpd.conf
@@ -4,6 +4,7 @@ router bgp 200
  bgp router-id 10.254.254.4
  no bgp ebgp-requires-policy
  neighbor 2001:db8:1::2 remote-as 100
+ neighbor 2001:db8:1::2 timers 3 10
  neighbor 2001:db8:1::2 ebgp-multihop 2
  neighbor 2001:db8:1::2 bfd profile DOES_NOT_EXIST
  address-family ipv4 unicast

diff --git a/tests/topotests/bfd-topo1/r1/bgpd.conf b/tests/topotests/bfd-topo1/r1/bgpd.conf
index 25e16a6e0c89090f8987825b456a5f12376d4e89..57bde1f234ebe4f94aa013a9162176b387a24587 100644 (file)
--- a/tests/topotests/bfd-topo1/r1/bgpd.conf
+++ b/tests/topotests/bfd-topo1/r1/bgpd.conf
@@ -2,6 +2,7 @@ router bgp 101
  no bgp ebgp-requires-policy
  no bgp network import-check
  neighbor 192.168.0.2 remote-as 102
+ neighbor 192.168.0.2 timers 3 10
  neighbor 192.168.0.2 bfd
  address-family ipv4 unicast
   network 10.254.254.1/32

diff --git a/tests/topotests/bfd-topo1/r2/bgpd.conf b/tests/topotests/bfd-topo1/r2/bgpd.conf
index 693fb93411c06140c78c752f8a2ba609913c8a1c..50d75ab67f8606643b459e00a9bb0d0e64804549 100644 (file)
--- a/tests/topotests/bfd-topo1/r2/bgpd.conf
+++ b/tests/topotests/bfd-topo1/r2/bgpd.conf
@@ -2,10 +2,13 @@ router bgp 102
  no bgp ebgp-requires-policy
  no bgp network import-check
  neighbor 192.168.0.1 remote-as 101
+ neighbor 192.168.0.1 timers 3 10
  neighbor 192.168.0.1 bfd
  neighbor 192.168.1.1 remote-as 103
+ neighbor 192.168.1.1 timers 3 10
  neighbor 192.168.1.1 bfd
  neighbor 192.168.2.1 remote-as 104
+ neighbor 192.168.2.1 timers 3 10
  neighbor 192.168.2.1 bfd
  address-family ipv4 unicast
   network 10.254.254.2/32

diff --git a/tests/topotests/bfd-topo1/r3/bgpd.conf b/tests/topotests/bfd-topo1/r3/bgpd.conf
index 7584f988039e804406b16855bc0369a3f6d685c0..ce6055d518be3a81efb533426a6a79688bc33083 100644 (file)
--- a/tests/topotests/bfd-topo1/r3/bgpd.conf
+++ b/tests/topotests/bfd-topo1/r3/bgpd.conf
@@ -2,6 +2,7 @@ router bgp 103
  no bgp ebgp-requires-policy
  no bgp network import-check
  neighbor 192.168.1.2 remote-as 102
+ neighbor 192.168.1.2 timers 3 10
  neighbor 192.168.1.2 bfd
  address-family ipv4 unicast
   network 10.254.254.3/32

diff --git a/tests/topotests/bfd-topo1/r4/bgpd.conf b/tests/topotests/bfd-topo1/r4/bgpd.conf
index 3c68e7eec9bbaa1cc6a371c7c477866dd389b92e..0d032b4cdd4ec7b45c97c067350b3a65e03d3be0 100644 (file)
--- a/tests/topotests/bfd-topo1/r4/bgpd.conf
+++ b/tests/topotests/bfd-topo1/r4/bgpd.conf
@@ -2,6 +2,7 @@ router bgp 104
  no bgp ebgp-requires-policy
  no bgp network import-check
  neighbor 192.168.2.2 remote-as 102
+ neighbor 192.168.2.2 timers 3 10
  neighbor 192.168.2.2 bfd
  address-family ipv4 unicast
   network 10.254.254.4/32

diff --git a/tests/topotests/bfd-topo2/r1/bgpd.conf b/tests/topotests/bfd-topo2/r1/bgpd.conf
index 4d96bec2cb4c51bdd3fcd105c120488b962dbbcb..0918796e9503308379273d4be019c4284e03f5af 100644 (file)
--- a/tests/topotests/bfd-topo2/r1/bgpd.conf
+++ b/tests/topotests/bfd-topo2/r1/bgpd.conf
@@ -5,6 +5,7 @@ router bgp 101
  neighbor r2g remote-as external
  neighbor r2g bfd
  neighbor r1-eth0 interface peer-group r2g
+ neighbor r1-eth0 timers 3 10
  address-family ipv4 unicast
   redistribute connected
  exit-address-family

diff --git a/tests/topotests/bfd-topo2/r2/bgpd.conf b/tests/topotests/bfd-topo2/r2/bgpd.conf
index 4d02fc4f29b741c20dfc4a70ed84f3affea58dd8..55d48560e7ff326cd6dfd7fe8f8ca986b93d228c 100644 (file)
--- a/tests/topotests/bfd-topo2/r2/bgpd.conf
+++ b/tests/topotests/bfd-topo2/r2/bgpd.conf
@@ -5,6 +5,7 @@ router bgp 102
  neighbor r2g remote-as external
  neighbor r2g bfd
  neighbor r2-eth0 interface peer-group r2g
+ neighbor r2-eth0 timers 3 10
  !
  address-family ipv4 unicast
   redistribute connected

diff --git a/tests/topotests/bfd-topo3/r1/bgpd.conf b/tests/topotests/bfd-topo3/r1/bgpd.conf
index a0281d50c627e8212c7cf21b2ee2cfdfc193f3d9..4c75d669c5180969ca959782f529c5e795b44d95 100644 (file)
--- a/tests/topotests/bfd-topo3/r1/bgpd.conf
+++ b/tests/topotests/bfd-topo3/r1/bgpd.conf
@@ -1,11 +1,14 @@
 router bgp 100
  no bgp ebgp-requires-policy
  neighbor 2001:db8:1::2 remote-as internal
+ neighbor 2001:db8:1::2 timers 3 10
  neighbor 2001:db8:1::2 bfd profile fast-tx
  neighbor 192.168.2.1 remote-as external
+ neighbor 192.168.2.1 timers 3 10
  neighbor 192.168.2.1 ebgp-multihop 2
  neighbor 192.168.2.1 bfd profile slow-tx
  neighbor 2001:db8:3::1 remote-as external
+ neighbor 2001:db8:3::1 timers 3 10
  neighbor 2001:db8:3::1 ebgp-multihop 3
  neighbor 2001:db8:3::1 bfd profile slow-tx
  address-family ipv4 unicast

diff --git a/tests/topotests/bfd-topo3/r2/bgpd.conf b/tests/topotests/bfd-topo3/r2/bgpd.conf
index 0e960330239fcac856b320c21bb8c9518f37b3e1..75225765e1d5ae61fd9de987b6213a603b970af4 100644 (file)
--- a/tests/topotests/bfd-topo3/r2/bgpd.conf
+++ b/tests/topotests/bfd-topo3/r2/bgpd.conf
@@ -1,8 +1,10 @@
 router bgp 100
  no bgp ebgp-requires-policy
  neighbor 2001:db8:1::1 remote-as internal
+ neighbor 2001:db8:1::1 timers 3 10
  neighbor 2001:db8:1::1 bfd profile fast-tx
  neighbor 2001:db8:2::1 remote-as external
+ neighbor 2001:db8:2::1 timers 3 10
  neighbor 2001:db8:2::1 bfd profile slow-tx
  address-family ipv4 unicast
   redistribute connected

diff --git a/tests/topotests/bfd-topo3/r3/bgpd.conf b/tests/topotests/bfd-topo3/r3/bgpd.conf
index e14d2011a01d972516e6c631ac6915f72e130b4a..82adf8be9e7c134959d12b642ac9219db69d7c65 100644 (file)
--- a/tests/topotests/bfd-topo3/r3/bgpd.conf
+++ b/tests/topotests/bfd-topo3/r3/bgpd.conf
@@ -1,11 +1,14 @@
 router bgp 300
  no bgp ebgp-requires-policy
  neighbor 192.168.1.1 remote-as external
+ neighbor 192.168.1.1 timers 3 10
  neighbor 192.168.1.1 ebgp-multihop 2
  neighbor 192.168.1.1 bfd profile slow-tx
  neighbor 2001:db8:2::2 remote-as external
+ neighbor 2001:db8:2::2 timers 3 10
  neighbor 2001:db8:2::2 bfd profile slow-tx
  neighbor 2001:db8:3::1 remote-as external
+ neighbor 2001:db8:3::1 timers 3 10
  neighbor 2001:db8:3::1 bfd profile slow-tx
  address-family ipv4 unicast
   redistribute connected

diff --git a/tests/topotests/bfd-topo3/r4/bgpd.conf b/tests/topotests/bfd-topo3/r4/bgpd.conf
index 3e81008d5dc9633077ae5804f6d49a61145acead..0aab6e3017a694eac407ff8f2a7b955c3c0a8010 100644 (file)
--- a/tests/topotests/bfd-topo3/r4/bgpd.conf
+++ b/tests/topotests/bfd-topo3/r4/bgpd.conf
@@ -1,8 +1,10 @@
 router bgp 400
  no bgp ebgp-requires-policy
  neighbor 2001:db8:3::2 remote-as external
+ neighbor 2001:db8:3::2 timers 3 10
  neighbor 2001:db8:3::2 bfd profile slow-tx
  neighbor 2001:db8:1::1 remote-as external
+ neighbor 2001:db8:1::1 timers 3 10
  neighbor 2001:db8:1::1 ebgp-multihop 3
  neighbor 2001:db8:1::1 bfd profile slow-tx-mh
  address-family ipv4 unicast

diff --git a/tests/topotests/bfd-vrf-topo1/r1/bgpd.conf b/tests/topotests/bfd-vrf-topo1/r1/bgpd.conf
index 439c58fb2a45730f17b6e79e8cff7f978a77e6c8..5bb45b9863cb749d9689c46de362fe60a8ad8ae3 100644 (file)
--- a/tests/topotests/bfd-vrf-topo1/r1/bgpd.conf
+++ b/tests/topotests/bfd-vrf-topo1/r1/bgpd.conf
@@ -2,6 +2,7 @@ router bgp 101 vrf r1-cust1
  no bgp ebgp-requires-policy
  no bgp network import-check
  neighbor 192.168.0.2 remote-as 102
+ neighbor 192.168.0.2 timers 3 10
 ! neighbor 192.168.0.2 ebgp-multihop 10
  neighbor 192.168.0.2 bfd
  address-family ipv4 unicast

diff --git a/tests/topotests/bfd-vrf-topo1/r2/bgpd.conf b/tests/topotests/bfd-vrf-topo1/r2/bgpd.conf
index 4fac25d7bb6df3f602716faf25944faf1cc60488..b2aac74685d4612407cc333ac2c52a78788c27e1 100644 (file)
--- a/tests/topotests/bfd-vrf-topo1/r2/bgpd.conf
+++ b/tests/topotests/bfd-vrf-topo1/r2/bgpd.conf
@@ -2,10 +2,13 @@ router bgp 102 vrf r2-cust1
  no bgp ebgp-requires-policy
  no bgp network import-check
  neighbor 192.168.0.1 remote-as 101
+ neighbor 192.168.0.1 timers 3 10
  neighbor 192.168.0.1 bfd
  neighbor 192.168.1.1 remote-as 103
+ neighbor 192.168.1.1 timers 3 10
  neighbor 192.168.1.1 bfd
  neighbor 192.168.2.1 remote-as 104
+ neighbor 192.168.2.1 timers 3 10
  neighbor 192.168.2.1 bfd
  address-family ipv4 unicast
   network 10.254.254.2/32

diff --git a/tests/topotests/bfd-vrf-topo1/r3/bgpd.conf b/tests/topotests/bfd-vrf-topo1/r3/bgpd.conf
index 052707ae1bfc3e0a93c4d8e294bbb80f75aafe52..1d7c7303952a4a5aca356efd48e7d76814d51873 100644 (file)
--- a/tests/topotests/bfd-vrf-topo1/r3/bgpd.conf
+++ b/tests/topotests/bfd-vrf-topo1/r3/bgpd.conf
@@ -2,6 +2,7 @@ router bgp 103 vrf r3-cust1
  no bgp ebgp-requires-policy
  no bgp network import-check
  neighbor 192.168.1.2 remote-as 102
+ neighbor 192.168.1.2 timers 3 10
  neighbor 192.168.1.2 bfd
  address-family ipv4 unicast
   network 10.254.254.3/32

diff --git a/tests/topotests/bfd-vrf-topo1/r4/bgpd.conf b/tests/topotests/bfd-vrf-topo1/r4/bgpd.conf
index bcb0a17c019a6e770008353321ea8fa7c43ef4fe..f34035d460fa13348692add6203e879f27b38744 100644 (file)
--- a/tests/topotests/bfd-vrf-topo1/r4/bgpd.conf
+++ b/tests/topotests/bfd-vrf-topo1/r4/bgpd.conf
@@ -2,6 +2,7 @@ router bgp 104 vrf r4-cust1
  no bgp ebgp-requires-policy
  no bgp network import-check
  neighbor 192.168.2.2 remote-as 102
+ neighbor 192.168.2.2 timers 3 10
  neighbor 192.168.2.2 bfd
  address-family ipv4 unicast
   network 10.254.254.4/32

diff --git a/tests/topotests/bgp-ecmp-topo1/r1/bgpd.conf b/tests/topotests/bgp-ecmp-topo1/r1/bgpd.conf
index d3beb2d32023dac3b7cb3211322b68dfe5cd3332..49981ac589685ecfaca66093c3fbf6b1e067a060 100644 (file)
--- a/tests/topotests/bgp-ecmp-topo1/r1/bgpd.conf
+++ b/tests/topotests/bgp-ecmp-topo1/r1/bgpd.conf
@@ -7,25 +7,45 @@ router bgp 100
  bgp bestpath as-path multipath-relax
  no bgp ebgp-requires-policy
  neighbor 10.0.1.101 remote-as 99
+ neighbor 10.0.1.101 timers 3 10
  neighbor 10.0.1.102 remote-as 99
+ neighbor 10.0.1.102 timers 3 10
  neighbor 10.0.1.103 remote-as 99
+ neighbor 10.0.1.103 timers 3 10
  neighbor 10.0.1.104 remote-as 99
+ neighbor 10.0.1.104 timers 3 10
  neighbor 10.0.1.105 remote-as 99
+ neighbor 10.0.1.105 timers 3 10
  neighbor 10.0.2.106 remote-as 99
+ neighbor 10.0.2.106 timers 3 10
  neighbor 10.0.2.107 remote-as 99
+ neighbor 10.0.2.107 timers 3 10
  neighbor 10.0.2.108 remote-as 99
+ neighbor 10.0.2.108 timers 3 10
  neighbor 10.0.2.109 remote-as 99
+ neighbor 10.0.2.109 timers 3 10
  neighbor 10.0.2.110 remote-as 99
+ neighbor 10.0.2.110 timers 3 10
  neighbor 10.0.3.111 remote-as 111
+ neighbor 10.0.3.111 timers 3 10
  neighbor 10.0.3.112 remote-as 112
+ neighbor 10.0.3.112 timers 3 10
  neighbor 10.0.3.113 remote-as 113
+ neighbor 10.0.3.113 timers 3 10
  neighbor 10.0.3.114 remote-as 114
+ neighbor 10.0.3.114 timers 3 10
  neighbor 10.0.3.115 remote-as 115
+ neighbor 10.0.3.115 timers 3 10
  neighbor 10.0.4.116 remote-as 116
+ neighbor 10.0.4.116 timers 3 10
  neighbor 10.0.4.117 remote-as 117
+ neighbor 10.0.4.117 timers 3 10
  neighbor 10.0.4.118 remote-as 118
+ neighbor 10.0.4.118 timers 3 10
  neighbor 10.0.4.119 remote-as 119
+ neighbor 10.0.4.119 timers 3 10
  neighbor 10.0.4.120 remote-as 120
+ neighbor 10.0.4.120 timers 3 10
  !
 !
 

diff --git a/tests/topotests/bgp_aggregate-address_origin/r1/bgpd.conf b/tests/topotests/bgp_aggregate-address_origin/r1/bgpd.conf
index 9d519fae8871ccb7db044480c4ca4fcc3208287f..3486c64c55191c7ab66330c2e7608d1dfd673f0a 100644 (file)
--- a/tests/topotests/bgp_aggregate-address_origin/r1/bgpd.conf
+++ b/tests/topotests/bgp_aggregate-address_origin/r1/bgpd.conf
@@ -1,6 +1,7 @@
 router bgp 65000
   no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
+  neighbor 192.168.255.2 timers 3 10
   address-family ipv4 unicast
     redistribute connected
     aggregate-address 172.16.255.0/24 origin igp

diff --git a/tests/topotests/bgp_aggregate-address_origin/r2/bgpd.conf b/tests/topotests/bgp_aggregate-address_origin/r2/bgpd.conf
index 38cf5aaca7cd087936ec81c1eb4e681dc72eb6aa..b2d945583c8cd1f59f0b1c194fb036e5fa66f766 100644 (file)
--- a/tests/topotests/bgp_aggregate-address_origin/r2/bgpd.conf
+++ b/tests/topotests/bgp_aggregate-address_origin/r2/bgpd.conf
@@ -1,5 +1,6 @@
 router bgp 65001
   no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65000
+  neighbor 192.168.255.1 timers 3 10
   exit-address-family
 !

diff --git a/tests/topotests/bgp_aggregate-address_route-map/r1/bgpd.conf b/tests/topotests/bgp_aggregate-address_route-map/r1/bgpd.conf
index 292f0e967f8aeaf3ab9f8cec82d3894e7f58acb4..7fb55cf001ec0bca52f9512e1c64897bbff9537c 100644 (file)
--- a/tests/topotests/bgp_aggregate-address_route-map/r1/bgpd.conf
+++ b/tests/topotests/bgp_aggregate-address_route-map/r1/bgpd.conf
@@ -1,6 +1,7 @@
 router bgp 65000
   no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
+  neighbor 192.168.255.2 timers 3 10
   address-family ipv4 unicast
     redistribute connected
     aggregate-address 172.16.255.0/24 route-map aggr-rmap

diff --git a/tests/topotests/bgp_aggregate-address_route-map/r2/bgpd.conf b/tests/topotests/bgp_aggregate-address_route-map/r2/bgpd.conf
index 38cf5aaca7cd087936ec81c1eb4e681dc72eb6aa..b2d945583c8cd1f59f0b1c194fb036e5fa66f766 100644 (file)
--- a/tests/topotests/bgp_aggregate-address_route-map/r2/bgpd.conf
+++ b/tests/topotests/bgp_aggregate-address_route-map/r2/bgpd.conf
@@ -1,5 +1,6 @@
 router bgp 65001
   no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65000
+  neighbor 192.168.255.1 timers 3 10
   exit-address-family
 !

diff --git a/tests/topotests/bgp_as_wide_bgp_identifier/r1/bgpd.conf b/tests/topotests/bgp_as_wide_bgp_identifier/r1/bgpd.conf
index 75741a3c3e9beca08a6244f7726557c67e660318..cb04749b92b6ef8b2d0c90e9a11779b2a709fbfa 100644 (file)
--- a/tests/topotests/bgp_as_wide_bgp_identifier/r1/bgpd.conf
+++ b/tests/topotests/bgp_as_wide_bgp_identifier/r1/bgpd.conf
@@ -3,4 +3,5 @@ router bgp 65001
   bgp router-id 10.10.10.10
   no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65002
+  neighbor 192.168.255.1 timers 3 10
 !

diff --git a/tests/topotests/bgp_as_wide_bgp_identifier/r2/bgpd.conf b/tests/topotests/bgp_as_wide_bgp_identifier/r2/bgpd.conf
index 18a6c66f69e9c2c5b34c0d4b09eab50dd0e50e98..bed68858fd262cef7e2d35fa4a196d309b6a8a4b 100644 (file)
--- a/tests/topotests/bgp_as_wide_bgp_identifier/r2/bgpd.conf
+++ b/tests/topotests/bgp_as_wide_bgp_identifier/r2/bgpd.conf
@@ -3,5 +3,7 @@ router bgp 65002
   bgp router-id 10.10.10.10
   no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
+  neighbor 192.168.255.2 timers 3 10
   neighbor 192.168.255.3 remote-as 65002
+  neighbor 192.168.255.3 timers 3 10
 !

diff --git a/tests/topotests/bgp_as_wide_bgp_identifier/r3/bgpd.conf b/tests/topotests/bgp_as_wide_bgp_identifier/r3/bgpd.conf
index 27bf1260007c4065b7ebd2d2a0e7dc2c9e4b49d0..384e617d026dceb0542033a8c6d456a26a9af5cd 100644 (file)
--- a/tests/topotests/bgp_as_wide_bgp_identifier/r3/bgpd.conf
+++ b/tests/topotests/bgp_as_wide_bgp_identifier/r3/bgpd.conf
@@ -3,4 +3,5 @@ router bgp 65002
   bgp router-id 10.10.10.10
   no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65002
+  neighbor 192.168.255.1 timers 3 10
 !

diff --git a/tests/topotests/bgp_comm-list_delete/r1/bgpd.conf b/tests/topotests/bgp_comm-list_delete/r1/bgpd.conf
index 95188943514a704f7afe3a5b90ae95dbd557df48..12161d2fa216d7d5ca027badbf959f51b16bad5e 100644 (file)
--- a/tests/topotests/bgp_comm-list_delete/r1/bgpd.conf
+++ b/tests/topotests/bgp_comm-list_delete/r1/bgpd.conf
@@ -1,6 +1,7 @@
 router bgp 65000
   no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
+  neighbor 192.168.255.2 timers 3 10
   address-family ipv4 unicast
     redistribute connected route-map r2-out
   exit-address-family

diff --git a/tests/topotests/bgp_comm-list_delete/r2/bgpd.conf b/tests/topotests/bgp_comm-list_delete/r2/bgpd.conf
index e4c11677452088369df76121793a5301d6a40b07..33231b527421c5312c2755d83dd6d4ee2b2a354f 100644 (file)
--- a/tests/topotests/bgp_comm-list_delete/r2/bgpd.conf
+++ b/tests/topotests/bgp_comm-list_delete/r2/bgpd.conf
@@ -1,6 +1,7 @@
 router bgp 65001
   no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65000
+  neighbor 192.168.255.1 timers 3 10
   address-family ipv4
     neighbor 192.168.255.1 route-map r1-in in
   exit-address-family

diff --git a/tests/topotests/bgp_default-route_route-map/r1/bgpd.conf b/tests/topotests/bgp_default-route_route-map/r1/bgpd.conf
index 12e56e27c4d4d0fcb767ed11911a8363dd2bb43f..cb07ea9fdfb4d4b98e7fcada1f863cb824de1949 100644 (file)
--- a/tests/topotests/bgp_default-route_route-map/r1/bgpd.conf
+++ b/tests/topotests/bgp_default-route_route-map/r1/bgpd.conf
@@ -1,6 +1,7 @@
 router bgp 65000
   no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
+  neighbor 192.168.255.2 timers 3 10
   address-family ipv4 unicast
     neighbor 192.168.255.2 default-originate route-map default
   exit-address-family

diff --git a/tests/topotests/bgp_default-route_route-map/r2/bgpd.conf b/tests/topotests/bgp_default-route_route-map/r2/bgpd.conf
index b6b560aa4d08bf86c57df64b2165e4c8fa86085d..00c96cc58b2c16d80859d8ca60a715da5e7ca8fb 100644 (file)
--- a/tests/topotests/bgp_default-route_route-map/r2/bgpd.conf
+++ b/tests/topotests/bgp_default-route_route-map/r2/bgpd.conf
@@ -1,6 +1,7 @@
 router bgp 65001
   no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65000
+  neighbor 192.168.255.1 timers 3 10
   address-family ipv4 unicast
     redistribute connected
   exit-address-family

diff --git a/tests/topotests/bgp_distance_change/r1/bgpd.conf b/tests/topotests/bgp_distance_change/r1/bgpd.conf
index cd2ef675fcaaf201c76a156799baf553c326a012..07cfe2e2f1c3665f1df04422583d826af7cc2e6a 100644 (file)
--- a/tests/topotests/bgp_distance_change/r1/bgpd.conf
+++ b/tests/topotests/bgp_distance_change/r1/bgpd.conf
@@ -1,5 +1,6 @@
 router bgp 65000
   no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
+  neighbor 192.168.255.2 timers 3 10
   exit-address-family
 !

diff --git a/tests/topotests/bgp_distance_change/r2/bgpd.conf b/tests/topotests/bgp_distance_change/r2/bgpd.conf
index 0faec8503250340e8f2ad3df3477b4f30193bf20..9cd86dc284cca284022774ab7ed4a024d1c2fc63 100644 (file)
--- a/tests/topotests/bgp_distance_change/r2/bgpd.conf
+++ b/tests/topotests/bgp_distance_change/r2/bgpd.conf
@@ -1,6 +1,7 @@
 router bgp 65001
   no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65000
+  neighbor 192.168.255.1 timers 3 10
   address-family ipv4
     redistribute connected
   exit-address-family

diff --git a/tests/topotests/bgp_ebgp_requires_policy/r1/bgpd.conf b/tests/topotests/bgp_ebgp_requires_policy/r1/bgpd.conf
index aaa01ebcf9ff8385b85206cb319bdb41660608ca..add37ee58d881912083e4a827475055ea5e2e751 100644 (file)
--- a/tests/topotests/bgp_ebgp_requires_policy/r1/bgpd.conf
+++ b/tests/topotests/bgp_ebgp_requires_policy/r1/bgpd.conf
@@ -1,5 +1,6 @@
 router bgp 65000
   neighbor 192.168.255.2 remote-as 1000
+  neighbor 192.168.255.2 timers 3 10
   neighbor 192.168.255.2 local-as 500
   address-family ipv4 unicast
     redistribute connected

diff --git a/tests/topotests/bgp_ebgp_requires_policy/r2/bgpd.conf b/tests/topotests/bgp_ebgp_requires_policy/r2/bgpd.conf
index 27427a9aaa67e8496bde64948a5854388ae8c4f1..802c32714b1d9caff2623e21851482b7b78a6863 100644 (file)
--- a/tests/topotests/bgp_ebgp_requires_policy/r2/bgpd.conf
+++ b/tests/topotests/bgp_ebgp_requires_policy/r2/bgpd.conf
@@ -1,3 +1,5 @@
 router bgp 1000
   no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 500
+  neighbor 192.168.255.1 timers 3 10
+!

diff --git a/tests/topotests/bgp_ebgp_requires_policy/r3/bgpd.conf b/tests/topotests/bgp_ebgp_requires_policy/r3/bgpd.conf
index 2deb4b663d7c5aa9058f4fc0c81df100b21bdf78..1280b427adee3ea839f93fda8a94a95022438f51 100644 (file)
--- a/tests/topotests/bgp_ebgp_requires_policy/r3/bgpd.conf
+++ b/tests/topotests/bgp_ebgp_requires_policy/r3/bgpd.conf
@@ -1,5 +1,6 @@
 router bgp 65000
   neighbor 192.168.255.2 remote-as 1000
+  neighbor 192.168.255.2 timers 3 10
   neighbor 192.168.255.2 local-as 500
   address-family ipv4 unicast
     redistribute connected

diff --git a/tests/topotests/bgp_ebgp_requires_policy/r4/bgpd.conf b/tests/topotests/bgp_ebgp_requires_policy/r4/bgpd.conf
index 27427a9aaa67e8496bde64948a5854388ae8c4f1..802c32714b1d9caff2623e21851482b7b78a6863 100644 (file)
--- a/tests/topotests/bgp_ebgp_requires_policy/r4/bgpd.conf
+++ b/tests/topotests/bgp_ebgp_requires_policy/r4/bgpd.conf
@@ -1,3 +1,5 @@
 router bgp 1000
   no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 500
+  neighbor 192.168.255.1 timers 3 10
+!

diff --git a/tests/topotests/bgp_ebgp_requires_policy/r5/bgpd.conf b/tests/topotests/bgp_ebgp_requires_policy/r5/bgpd.conf
index 92a2797921bea2f47875a0b467dbdefad55aad10..60b29f6f1b80f176c9921c1a965d837577ba686c 100644 (file)
--- a/tests/topotests/bgp_ebgp_requires_policy/r5/bgpd.conf
+++ b/tests/topotests/bgp_ebgp_requires_policy/r5/bgpd.conf
@@ -1,6 +1,7 @@
 router bgp 65000
   no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65000
+  neighbor 192.168.255.2 timers 3 10
   address-family ipv4 unicast
     redistribute connected
 !

diff --git a/tests/topotests/bgp_ebgp_requires_policy/r6/bgpd.conf b/tests/topotests/bgp_ebgp_requires_policy/r6/bgpd.conf
index 342f53d4c7e6ebdaf386bc00ae5dae79194c58fa..7ad5d927a7d267897dfdc2f0f74277dc9ee170a5 100644 (file)
--- a/tests/topotests/bgp_ebgp_requires_policy/r6/bgpd.conf
+++ b/tests/topotests/bgp_ebgp_requires_policy/r6/bgpd.conf
@@ -1,2 +1,4 @@
 router bgp 65000
   neighbor 192.168.255.1 remote-as 65000
+  neighbor 192.168.255.1 timers 3 10
+!

diff --git a/tests/topotests/bgp_features/r1/bgpd.conf b/tests/topotests/bgp_features/r1/bgpd.conf
index 7aea2dc16140af302f0c397c357cd59c8305cc32..74d1993af07527ef57728de527447c747bb14615 100644 (file)
--- a/tests/topotests/bgp_features/r1/bgpd.conf
+++ b/tests/topotests/bgp_features/r1/bgpd.conf
@@ -9,10 +9,12 @@ router bgp 65000
  bgp log-neighbor-changes
  no bgp ebgp-requires-policy
  neighbor 192.168.0.2 remote-as 65000
+ neighbor 192.168.0.2 timers 3 10
  neighbor 192.168.0.2 description Router R2 (iBGP)
  neighbor 192.168.0.2 update-source lo
  neighbor 192.168.0.2 timers connect 5
  neighbor 192.168.101.2 remote-as 65100
+ neighbor 192.168.101.2 timers 3 10
  neighbor 192.168.101.2 description Router R4 (eBGP AS 65100)
  neighbor 192.168.101.2 timers connect 5
  !

diff --git a/tests/topotests/bgp_features/r2/bgpd.conf b/tests/topotests/bgp_features/r2/bgpd.conf
index 3daf9842ce7baa3bcdc51cd94ff1091599f5c870..99cec988116dd785bc633da9dc9f0b1caad0c110 100644 (file)
--- a/tests/topotests/bgp_features/r2/bgpd.conf
+++ b/tests/topotests/bgp_features/r2/bgpd.conf
@@ -9,10 +9,12 @@ router bgp 65000
  bgp log-neighbor-changes
  no bgp ebgp-requires-policy
  neighbor 192.168.0.1 remote-as 65000
+ neighbor 192.168.0.1 timers 3 10
  neighbor 192.168.0.1 description Router R1 (iBGP)
  neighbor 192.168.0.1 update-source lo
  neighbor 192.168.0.1 timers connect 5
  neighbor 192.168.201.2 remote-as 65200
+ neighbor 192.168.201.2 timers 3 10
  neighbor 192.168.201.2 description Router R5 (eBGP AS 65200)
  neighbor 192.168.201.2 timers connect 5
  !

diff --git a/tests/topotests/bgp_features/r4/bgpd.conf b/tests/topotests/bgp_features/r4/bgpd.conf
index fe1a4d4ffe0004b93d64ae773b3754502cb7014e..cdf8f4e8f6dd93146e8db02d5bfa6b55bd8a6824 100644 (file)
--- a/tests/topotests/bgp_features/r4/bgpd.conf
+++ b/tests/topotests/bgp_features/r4/bgpd.conf
@@ -9,6 +9,7 @@ router bgp 65100
  bgp log-neighbor-changes
  no bgp ebgp-requires-policy
  neighbor 192.168.101.1 remote-as 65000
+ neighbor 192.168.101.1 timers 3 10
  neighbor 192.168.101.1 description Router R1 (eBGP AS 65000)
  neighbor 192.168.101.1 timers connect 5
  !

diff --git a/tests/topotests/bgp_features/r5/bgpd.conf b/tests/topotests/bgp_features/r5/bgpd.conf
index 8504213b41b30c267e13b747156e8f2325f13f75..6368fedd397c3174ffa31dbcdece50e22f17ae6a 100644 (file)
--- a/tests/topotests/bgp_features/r5/bgpd.conf
+++ b/tests/topotests/bgp_features/r5/bgpd.conf
@@ -9,6 +9,7 @@ router bgp 65200
  bgp log-neighbor-changes
  no bgp ebgp-requires-policy
  neighbor 192.168.201.1 remote-as 65000
+ neighbor 192.168.201.1 timers 3 10
  neighbor 192.168.201.1 description Router R2 (eBGP AS 65000)
  neighbor 192.168.201.1 timers connect 5
  !

diff --git a/tests/topotests/bgp_flowspec/r1/bgpd.conf b/tests/topotests/bgp_flowspec/r1/bgpd.conf
index 6dc91b24a99e2cad589d8a2cdeb473907a355a40..4b7a20f958000be309b2ee111ba2149f683650bd 100644 (file)
--- a/tests/topotests/bgp_flowspec/r1/bgpd.conf
+++ b/tests/topotests/bgp_flowspec/r1/bgpd.conf
@@ -5,6 +5,7 @@ log stdout debugging
 router bgp 100
  bgp router-id 10.0.1.1
  neighbor 10.0.1.101 remote-as 100
+ neighbor 10.0.1.101 timers 3 10
  neighbor 10.0.1.101 update-source 10.0.1.1
  address-family ipv6 flowspec
   local-install r1-eth0

diff --git a/tests/topotests/bgp_ipv6_rtadv/r1/bgpd.conf b/tests/topotests/bgp_ipv6_rtadv/r1/bgpd.conf
index 4d96bec2cb4c51bdd3fcd105c120488b962dbbcb..0918796e9503308379273d4be019c4284e03f5af 100644 (file)
--- a/tests/topotests/bgp_ipv6_rtadv/r1/bgpd.conf
+++ b/tests/topotests/bgp_ipv6_rtadv/r1/bgpd.conf
@@ -5,6 +5,7 @@ router bgp 101
  neighbor r2g remote-as external
  neighbor r2g bfd
  neighbor r1-eth0 interface peer-group r2g
+ neighbor r1-eth0 timers 3 10
  address-family ipv4 unicast
   redistribute connected
  exit-address-family

diff --git a/tests/topotests/bgp_ipv6_rtadv/r2/bgpd.conf b/tests/topotests/bgp_ipv6_rtadv/r2/bgpd.conf
index 4d02fc4f29b741c20dfc4a70ed84f3affea58dd8..55d48560e7ff326cd6dfd7fe8f8ca986b93d228c 100644 (file)
--- a/tests/topotests/bgp_ipv6_rtadv/r2/bgpd.conf
+++ b/tests/topotests/bgp_ipv6_rtadv/r2/bgpd.conf
@@ -5,6 +5,7 @@ router bgp 102
  neighbor r2g remote-as external
  neighbor r2g bfd
  neighbor r2-eth0 interface peer-group r2g
+ neighbor r2-eth0 timers 3 10
  !
  address-family ipv4 unicast
   redistribute connected

diff --git a/tests/topotests/bgp_link_bw_ip/r1/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r1/bgpd.conf
index 40c19062a2e364da14340ee74620439e142127d1..0e466871009543549e0a65d9c91f8df288de03ae 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r1/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r1/bgpd.conf
@@ -5,5 +5,7 @@ router bgp 65101
  no bgp ebgp-requires-policy
  bgp bestpath as-path multipath-relax
  neighbor 11.1.1.2 remote-as external
+ neighbor 11.1.1.2 timers 3 10
  neighbor 11.1.1.6 remote-as external
+ neighbor 11.1.1.6 timers 3 10
 !

diff --git a/tests/topotests/bgp_link_bw_ip/r10/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r10/bgpd.conf
index 80588e7961e1b15553bcdf2ca70c85786a7e4d93..022270ff8a47eef347906ceb756b33be53364a40 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r10/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r10/bgpd.conf
@@ -9,6 +9,7 @@ router bgp 65354
  bgp router-id 11.1.6.2
  no bgp ebgp-requires-policy
  neighbor 11.1.6.1 remote-as external
+ neighbor 11.1.6.1 timers 3 10
  !
  address-family ipv4 unicast
   redistribute connected route-map redist

diff --git a/tests/topotests/bgp_link_bw_ip/r2/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r2/bgpd.conf
index 6fec1913c8f348acf4738329b76d91e817396d2f..0c0e859cab0548b3051d44f828cff03b03330791 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r2/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r2/bgpd.conf
@@ -5,6 +5,9 @@ router bgp 65201
  bgp bestpath as-path multipath-relax
  no bgp ebgp-requires-policy
  neighbor 11.1.1.1 remote-as external
+ neighbor 11.1.1.1 timers 3 10
  neighbor 11.1.2.2 remote-as external
+ neighbor 11.1.2.2 timers 3 10
  neighbor 11.1.2.6 remote-as external
+ neighbor 11.1.2.6 timers 3 10
 !

diff --git a/tests/topotests/bgp_link_bw_ip/r3/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r3/bgpd.conf
index 1c2ca88306165cea63199cf0e622b35e44592913..3f20eb10a30ccb07a47a9709f18b020224afb3d6 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r3/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r3/bgpd.conf
@@ -5,5 +5,7 @@ router bgp 65202
  bgp bestpath as-path multipath-relax
  no bgp ebgp-requires-policy
  neighbor 11.1.1.5 remote-as external
+ neighbor 11.1.1.5 timers 3 10
  neighbor 11.1.3.2 remote-as external
+ neighbor 11.1.3.2 timers 3 10
 !

diff --git a/tests/topotests/bgp_link_bw_ip/r4/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r4/bgpd.conf
index 022a2306438d2810cce52c33c0209c664794c6d6..d34db982c9e2204c1b74ccbb2c7c3f095cb98430 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r4/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r4/bgpd.conf
@@ -20,8 +20,11 @@ router bgp 65301
  bgp bestpath as-path multipath-relax
  no bgp ebgp-requires-policy
  neighbor 11.1.2.1 remote-as external
+ neighbor 11.1.2.1 timers 3 10
  neighbor 11.1.4.2 remote-as external
+ neighbor 11.1.4.2 timers 3 10
  neighbor 11.1.4.6 remote-as external
+ neighbor 11.1.4.6 timers 3 10
  !
  address-family ipv4 unicast
   neighbor 11.1.2.1 route-map anycast_ip out

diff --git a/tests/topotests/bgp_link_bw_ip/r5/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r5/bgpd.conf
index fc4e3888d8ef312040153c9cb29a7a216f0255c2..4014bfbc8bb91277a6f367e61457a7afaf14266e 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r5/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r5/bgpd.conf
@@ -13,7 +13,9 @@ router bgp 65302
  bgp bestpath as-path multipath-relax
  no bgp ebgp-requires-policy
  neighbor 11.1.2.5 remote-as external
+ neighbor 11.1.2.5 timers 3 10
  neighbor 11.1.5.2 remote-as external
+ neighbor 11.1.5.2 timers 3 10
  !
  address-family ipv4 unicast
   neighbor 11.1.2.5 route-map anycast_ip out

diff --git a/tests/topotests/bgp_link_bw_ip/r6/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r6/bgpd.conf
index f08f6337f4beb6858c4b945bddb4f451b6222ad5..18e7eb92850f04c58c9ba77a51b2f825a36a560d 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r6/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r6/bgpd.conf
@@ -13,7 +13,9 @@ router bgp 65303
  bgp bestpath as-path multipath-relax
  no bgp ebgp-requires-policy
  neighbor 11.1.3.1 remote-as external
+ neighbor 11.1.3.1 timers 3 10
  neighbor 11.1.6.2 remote-as external
+ neighbor 11.1.6.2 timers 3 10
  !
  address-family ipv4 unicast
   neighbor 11.1.3.1 route-map anycast_ip out

diff --git a/tests/topotests/bgp_link_bw_ip/r7/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r7/bgpd.conf
index 98dfe2471aa14214119f213acc7f998a410fd2ec..39c0c819502f18eccf2bd35843bec6436e715801 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r7/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r7/bgpd.conf
@@ -9,6 +9,7 @@ router bgp 65351
  bgp router-id 11.1.4.2
  no bgp ebgp-requires-policy
  neighbor 11.1.4.1 remote-as external
+ neighbor 11.1.4.1 timers 3 10
  !
  address-family ipv4 unicast
   redistribute connected route-map redist

diff --git a/tests/topotests/bgp_link_bw_ip/r8/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r8/bgpd.conf
index b4ba8e8a72b79cdc3357a1339da311834ecc0ce1..ea1d5460175b8d6d2f42d44b240fe1fc96234c0f 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r8/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r8/bgpd.conf
@@ -9,6 +9,7 @@ router bgp 65352
  bgp router-id 11.1.4.6
  no bgp ebgp-requires-policy
  neighbor 11.1.4.5 remote-as external
+ neighbor 11.1.4.5 timers 3 10
  !
  address-family ipv4 unicast
   redistribute connected route-map redist

diff --git a/tests/topotests/bgp_link_bw_ip/r9/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r9/bgpd.conf
index 31f971dd0894cd6d89e506cefc852fd81a0ecd44..a6066ee7667ca52331238a05a3628423cb8800f7 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r9/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r9/bgpd.conf
@@ -9,6 +9,7 @@ router bgp 65353
  bgp router-id 11.1.5.2
  no bgp ebgp-requires-policy
  neighbor 11.1.5.1 remote-as external
+ neighbor 11.1.5.1 timers 3 10
  !
  address-family ipv4 unicast
   redistribute connected route-map redist

diff --git a/tests/topotests/bgp_local_as_private_remove/r1/bgpd.conf b/tests/topotests/bgp_local_as_private_remove/r1/bgpd.conf
index 6f8fcd753d7e7024d75e2d640b8d009a24455739..16a9eeadd121189c6097343947cb846100ad6ae9 100644 (file)
--- a/tests/topotests/bgp_local_as_private_remove/r1/bgpd.conf
+++ b/tests/topotests/bgp_local_as_private_remove/r1/bgpd.conf
@@ -1,6 +1,7 @@
 router bgp 65000
   no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 1000
+  neighbor 192.168.255.2 timers 3 10
   neighbor 192.168.255.2 local-as 500
   address-family ipv4 unicast
     neighbor 192.168.255.2 remove-private-AS

diff --git a/tests/topotests/bgp_local_as_private_remove/r2/bgpd.conf b/tests/topotests/bgp_local_as_private_remove/r2/bgpd.conf
index 27427a9aaa67e8496bde64948a5854388ae8c4f1..802c32714b1d9caff2623e21851482b7b78a6863 100644 (file)
--- a/tests/topotests/bgp_local_as_private_remove/r2/bgpd.conf
+++ b/tests/topotests/bgp_local_as_private_remove/r2/bgpd.conf
@@ -1,3 +1,5 @@
 router bgp 1000
   no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 500
+  neighbor 192.168.255.1 timers 3 10
+!

diff --git a/tests/topotests/bgp_local_as_private_remove/r3/bgpd.conf b/tests/topotests/bgp_local_as_private_remove/r3/bgpd.conf
index f2050ddfdbea6fc0a61221fdc2fca2c27fbdc85c..9a831270b45421b9bd37248d1296b4db44954f47 100644 (file)
--- a/tests/topotests/bgp_local_as_private_remove/r3/bgpd.conf
+++ b/tests/topotests/bgp_local_as_private_remove/r3/bgpd.conf
@@ -1,6 +1,7 @@
 router bgp 3000
   no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 1000
+  neighbor 192.168.255.2 timers 3 10
   neighbor 192.168.255.2 local-as 500
   address-family ipv4 unicast
     neighbor 192.168.255.2 remove-private-AS

diff --git a/tests/topotests/bgp_local_as_private_remove/r4/bgpd.conf b/tests/topotests/bgp_local_as_private_remove/r4/bgpd.conf
index 27427a9aaa67e8496bde64948a5854388ae8c4f1..802c32714b1d9caff2623e21851482b7b78a6863 100644 (file)
--- a/tests/topotests/bgp_local_as_private_remove/r4/bgpd.conf
+++ b/tests/topotests/bgp_local_as_private_remove/r4/bgpd.conf
@@ -1,3 +1,5 @@
 router bgp 1000
   no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 500
+  neighbor 192.168.255.1 timers 3 10
+!

diff --git a/tests/topotests/bgp_maximum_prefix_invalid_update/r1/bgpd.conf b/tests/topotests/bgp_maximum_prefix_invalid_update/r1/bgpd.conf
index f0df56e9472d30d32191c18e4b7eb6c9b2661dc5..62110429cf32f529ea57253b60a17628925b3454 100644 (file)
--- a/tests/topotests/bgp_maximum_prefix_invalid_update/r1/bgpd.conf
+++ b/tests/topotests/bgp_maximum_prefix_invalid_update/r1/bgpd.conf
@@ -1,5 +1,6 @@
 router bgp 65000
   no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
+  neighbor 192.168.255.2 timers 3 10
   address-family ipv4 unicast
     redistribute connected

diff --git a/tests/topotests/bgp_maximum_prefix_invalid_update/r2/bgpd.conf b/tests/topotests/bgp_maximum_prefix_invalid_update/r2/bgpd.conf
index ef50dd0d7fe9a12f8d2f2ac1405c53834a7ceba4..005425e8500f15da58d85b656e72f29dfee17560 100644 (file)
--- a/tests/topotests/bgp_maximum_prefix_invalid_update/r2/bgpd.conf
+++ b/tests/topotests/bgp_maximum_prefix_invalid_update/r2/bgpd.conf
@@ -1,5 +1,6 @@
 router bgp 65001
   no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65000
+  neighbor 192.168.255.1 timers 3 10
   address-family ipv4
     neighbor 192.168.255.1 maximum-prefix 1

diff --git a/tests/topotests/bgp_maximum_prefix_out/r1/bgpd.conf b/tests/topotests/bgp_maximum_prefix_out/r1/bgpd.conf
index 03e3eb6e080b49915aa5dd6f4198aa437c407dd5..adb594b3dd4bc65dbea4ed3068cda8cead59782f 100644 (file)
--- a/tests/topotests/bgp_maximum_prefix_out/r1/bgpd.conf
+++ b/tests/topotests/bgp_maximum_prefix_out/r1/bgpd.conf
@@ -2,6 +2,7 @@
 router bgp 65001
   no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65002
+  neighbor 192.168.255.1 timers 3 10
   address-family ipv4 unicast
     redistribute connected
     neighbor 192.168.255.1 maximum-prefix-out 2

diff --git a/tests/topotests/bgp_maximum_prefix_out/r2/bgpd.conf b/tests/topotests/bgp_maximum_prefix_out/r2/bgpd.conf
index 2d47b2f6614ef83e0aadd3131365c42ee66283f1..229de2e2f24175ea3362309fe60ece8c8ded8cb4 100644 (file)
--- a/tests/topotests/bgp_maximum_prefix_out/r2/bgpd.conf
+++ b/tests/topotests/bgp_maximum_prefix_out/r2/bgpd.conf
@@ -2,6 +2,7 @@
 router bgp 65002
   no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
+  neighbor 192.168.255.2 timers 3 10
   exit-address-family
   !
 !

diff --git a/tests/topotests/bgp_multiview_topo1/r1/bgpd.conf b/tests/topotests/bgp_multiview_topo1/r1/bgpd.conf
index 5f65a54d7f12eb9e6c5b6b57bc2e50313cc99d98..d44c3e18e65205c81fbdfe76fb7beee9665c10ab 100644 (file)
--- a/tests/topotests/bgp_multiview_topo1/r1/bgpd.conf
+++ b/tests/topotests/bgp_multiview_topo1/r1/bgpd.conf
@@ -17,8 +17,11 @@ router bgp 100 view 1
  network 172.20.0.0/28 route-map local1
  timers bgp 60 180
  neighbor 172.16.1.1 remote-as 65001
+ neighbor 172.16.1.1 timers 3 10
  neighbor 172.16.1.2 remote-as 65002
+ neighbor 172.16.1.2 timers 3 10
  neighbor 172.16.1.5 remote-as 65005
+ neighbor 172.16.1.5 timers 3 10
 !
 router bgp 100 view 2
  bgp router-id 172.30.1.1
@@ -26,7 +29,9 @@ router bgp 100 view 2
  network 172.20.0.0/28 route-map local2
  timers bgp 60 180
  neighbor 172.16.1.3 remote-as 65003
+ neighbor 172.16.1.3 timers 3 10
  neighbor 172.16.1.4 remote-as 65004
+ neighbor 172.16.1.4 timers 3 10
 !
 router bgp 100 view 3
  bgp router-id 172.30.1.1
@@ -34,8 +39,11 @@ router bgp 100 view 3
  network 172.20.0.0/28
  timers bgp 60 180
  neighbor 172.16.1.6 remote-as 65006
+ neighbor 172.16.1.6 timers 3 10
  neighbor 172.16.1.7 remote-as 65007
+ neighbor 172.16.1.7 timers 3 10
  neighbor 172.16.1.8 remote-as 65008
+ neighbor 172.16.1.8 timers 3 10
 !
 route-map local1 permit 10
  set community 100:9999 additive

diff --git a/tests/topotests/bgp_prefix_sid/r1/bgpd.conf b/tests/topotests/bgp_prefix_sid/r1/bgpd.conf
index 06bdc31f8c9d602c7d6bfdf16066b63407b7a782..e02226f2fd64339feedc75ea3a137096ed248deb 100644 (file)
--- a/tests/topotests/bgp_prefix_sid/r1/bgpd.conf
+++ b/tests/topotests/bgp_prefix_sid/r1/bgpd.conf
@@ -6,7 +6,9 @@ router bgp 1
  no bgp default ipv4-unicast
  no bgp ebgp-requires-policy
  neighbor 10.0.0.101 remote-as 2
+ neighbor 10.0.0.101 timers 3 10
  neighbor 10.0.0.102 remote-as 3
+ neighbor 10.0.0.102 timers 3 10
  !
  address-family ipv4 labeled-unicast
   neighbor 10.0.0.101 activate

diff --git a/tests/topotests/bgp_reject_as_sets/r1/bgpd.conf b/tests/topotests/bgp_reject_as_sets/r1/bgpd.conf
index 94bfc5e5612a316969fa67fe5cb45ab5bb44c9c3..a28b612e00e503844a3f7befa268878c46c2a78d 100644 (file)
--- a/tests/topotests/bgp_reject_as_sets/r1/bgpd.conf
+++ b/tests/topotests/bgp_reject_as_sets/r1/bgpd.conf
@@ -2,6 +2,7 @@
 router bgp 65001
   no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65002
+  neighbor 192.168.255.1 timers 3 10
   address-family ipv4 unicast
     redistribute connected
   exit-address-family

diff --git a/tests/topotests/bgp_reject_as_sets/r2/bgpd.conf b/tests/topotests/bgp_reject_as_sets/r2/bgpd.conf
index f217b7f794b0d32b1bbce36c75e242f7b55dae26..453961762af8d572e49012acc5d027d77167142b 100644 (file)
--- a/tests/topotests/bgp_reject_as_sets/r2/bgpd.conf
+++ b/tests/topotests/bgp_reject_as_sets/r2/bgpd.conf
@@ -3,7 +3,9 @@ router bgp 65002
   bgp reject-as-sets
   no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
+  neighbor 192.168.255.2 timers 3 10
   neighbor 192.168.254.2 remote-as 65003
+  neighbor 192.168.254.2 timers 3 10
   address-family ipv4 unicast
     aggregate-address 172.16.0.0/16 as-set summary-only
   exit-address-family

diff --git a/tests/topotests/bgp_reject_as_sets/r3/bgpd.conf b/tests/topotests/bgp_reject_as_sets/r3/bgpd.conf
index 8d085a0e4b4c02c83bf969ee8890e4f41ba9d4ac..1dde4f0f69836344dbfc429ca7ab590db0a8fcff 100644 (file)
--- a/tests/topotests/bgp_reject_as_sets/r3/bgpd.conf
+++ b/tests/topotests/bgp_reject_as_sets/r3/bgpd.conf
@@ -2,6 +2,7 @@
 router bgp 65003
   no bgp ebgp-requires-policy
   neighbor 192.168.254.1 remote-as 65002
+  neighbor 192.168.254.1 timers 3 10
   address-family ipv4 unicast
     neighbor 192.168.254.1 allowas-in
     redistribute connected

diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r1/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r1/bgpd.conf
index ada354bd625caf809a0e1d1f852f1d09b39a6ed7..f6e0baa43df399d4319e9d01e014e4d8454c1f2b 100644 (file)
--- a/tests/topotests/bgp_rfapi_basic_sanity/r1/bgpd.conf
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r1/bgpd.conf
@@ -9,6 +9,7 @@ router bgp 5226
    bgp cluster-id 1.1.1.1
    no bgp ebgp-requires-policy
    neighbor 2.2.2.2 remote-as 5226
+   neighbor 2.2.2.2 timers 3 10
    neighbor 2.2.2.2 update-source 1.1.1.1
 !
    address-family ipv4 unicast

diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r2/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r2/bgpd.conf
index 95890f25b9280ba154b884eb854cfc19589c75b1..19050e67f6de1f953e59713e25c5797012594bf0 100644 (file)
--- a/tests/topotests/bgp_rfapi_basic_sanity/r2/bgpd.conf
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r2/bgpd.conf
@@ -9,10 +9,13 @@ router bgp 5226
    bgp cluster-id 2.2.2.2
    no bgp ebgp-requires-policy
    neighbor 1.1.1.1 remote-as 5226
+   neighbor 1.1.1.1 timers 3 10
    neighbor 1.1.1.1 update-source 2.2.2.2
    neighbor 3.3.3.3 remote-as 5226
+   neighbor 3.3.3.3 timers 3 10
    neighbor 3.3.3.3 update-source 2.2.2.2
    neighbor 4.4.4.4 remote-as 5226
+   neighbor 4.4.4.4 timers 3 10
    neighbor 4.4.4.4 update-source 2.2.2.2
    address-family ipv4 unicast
      no neighbor 1.1.1.1 activate

diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r3/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r3/bgpd.conf
index 4932d63d4f61de8beea21e3e5e002f69f5440730..2210f24589b6b68971b6d63fbd72a25b389527a2 100644 (file)
--- a/tests/topotests/bgp_rfapi_basic_sanity/r3/bgpd.conf
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r3/bgpd.conf
@@ -9,6 +9,7 @@ router bgp 5226
    bgp cluster-id 3.3.3.3
    no bgp ebgp-requires-policy
    neighbor 2.2.2.2 remote-as 5226
+   neighbor 2.2.2.2 timers 3 10
    neighbor 2.2.2.2 update-source 3.3.3.3
 !
    address-family ipv4 unicast

diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r4/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r4/bgpd.conf
index 1a5e41aae6efbbc76ad1b64bd5ef179fb076e9d8..28b5f9cfc513cde24ec303d7a0e335bf0ee2f592 100644 (file)
--- a/tests/topotests/bgp_rfapi_basic_sanity/r4/bgpd.conf
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r4/bgpd.conf
@@ -9,6 +9,7 @@ router bgp 5226
    bgp cluster-id 4.4.4.4
    no bgp ebgp-requires-policy
    neighbor 2.2.2.2 remote-as 5226
+   neighbor 2.2.2.2 timers 3 10
    neighbor 2.2.2.2 update-source 4.4.4.4
 !
    address-family ipv4 unicast

diff --git a/tests/topotests/bgp_rfapi_basic_sanity_config2/r1/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity_config2/r1/bgpd.conf
index a38afd632f3d09542863970edc81b951558bcf90..3196a16626c24bb9b37f3a672a75302eb7f2353a 100644 (file)
--- a/tests/topotests/bgp_rfapi_basic_sanity_config2/r1/bgpd.conf
+++ b/tests/topotests/bgp_rfapi_basic_sanity_config2/r1/bgpd.conf
@@ -9,6 +9,7 @@ router bgp 5226
    bgp cluster-id 1.1.1.1
    no bgp ebgp-requires-policy
    neighbor 2.2.2.2 remote-as 5226
+   neighbor 2.2.2.2 timers 3 10
    neighbor 2.2.2.2 update-source 1.1.1.1
 !
    address-family ipv4 unicast

diff --git a/tests/topotests/bgp_rfapi_basic_sanity_config2/r2/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity_config2/r2/bgpd.conf
index 95890f25b9280ba154b884eb854cfc19589c75b1..19050e67f6de1f953e59713e25c5797012594bf0 100644 (file)
--- a/tests/topotests/bgp_rfapi_basic_sanity_config2/r2/bgpd.conf
+++ b/tests/topotests/bgp_rfapi_basic_sanity_config2/r2/bgpd.conf
@@ -9,10 +9,13 @@ router bgp 5226
    bgp cluster-id 2.2.2.2
    no bgp ebgp-requires-policy
    neighbor 1.1.1.1 remote-as 5226
+   neighbor 1.1.1.1 timers 3 10
    neighbor 1.1.1.1 update-source 2.2.2.2
    neighbor 3.3.3.3 remote-as 5226
+   neighbor 3.3.3.3 timers 3 10
    neighbor 3.3.3.3 update-source 2.2.2.2
    neighbor 4.4.4.4 remote-as 5226
+   neighbor 4.4.4.4 timers 3 10
    neighbor 4.4.4.4 update-source 2.2.2.2
    address-family ipv4 unicast
      no neighbor 1.1.1.1 activate

diff --git a/tests/topotests/bgp_rfapi_basic_sanity_config2/r3/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity_config2/r3/bgpd.conf
index dbeb2c4665ddf2b1a05ae5255127b76532e06faa..e74fc0b3de667aeb909a70abafd6e26e253b62b1 100644 (file)
--- a/tests/topotests/bgp_rfapi_basic_sanity_config2/r3/bgpd.conf
+++ b/tests/topotests/bgp_rfapi_basic_sanity_config2/r3/bgpd.conf
@@ -9,6 +9,7 @@ router bgp 5226
    bgp cluster-id 3.3.3.3
    no bgp ebgp-requires-policy
    neighbor 2.2.2.2 remote-as 5226
+   neighbor 2.2.2.2 timers 3 10
    neighbor 2.2.2.2 update-source 3.3.3.3
 !
    address-family ipv4 unicast

diff --git a/tests/topotests/bgp_rfapi_basic_sanity_config2/r4/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity_config2/r4/bgpd.conf
index ae1787718c901f81b9433a31012a0139f1e687ee..56474aad9cac49cd7269f33ee3246930e5a85493 100644 (file)
--- a/tests/topotests/bgp_rfapi_basic_sanity_config2/r4/bgpd.conf
+++ b/tests/topotests/bgp_rfapi_basic_sanity_config2/r4/bgpd.conf
@@ -9,6 +9,7 @@ router bgp 5226
    bgp cluster-id 4.4.4.4
    no bgp ebgp-requires-policy
    neighbor 2.2.2.2 remote-as 5226
+   neighbor 2.2.2.2 timers 3 10
    neighbor 2.2.2.2 update-source 4.4.4.4
 !
    address-family ipv4 unicast

diff --git a/tests/topotests/bgp_rr_ibgp/spine1/bgpd.conf b/tests/topotests/bgp_rr_ibgp/spine1/bgpd.conf
index fa77cce073127978b571754e5841485017e81b7a..cece3fc6001bdd70da78d841d5f96a996a239ef0 100644 (file)
--- a/tests/topotests/bgp_rr_ibgp/spine1/bgpd.conf
+++ b/tests/topotests/bgp_rr_ibgp/spine1/bgpd.conf
@@ -2,7 +2,9 @@ hostname spine1
 router bgp 99
   no bgp ebgp-requires-policy
   neighbor 192.168.2.1 remote-as internal
+  neighbor 192.168.2.1 timers 3 10
   neighbor 192.168.4.2 remote-as internal
+  neighbor 192.168.4.2 timers 3 10
   address-family ipv4 uni
        redistribute connected
        neighbor 192.168.2.1 route-reflector-client

diff --git a/tests/topotests/bgp_rr_ibgp/tor1/bgpd.conf b/tests/topotests/bgp_rr_ibgp/tor1/bgpd.conf
index b028ab4e8bab6c02ad3808cbd9e022b315ddc216..1b9f15010a4bdcae2cecf2b89100de70bc65dd7c 100644 (file)
--- a/tests/topotests/bgp_rr_ibgp/tor1/bgpd.conf
+++ b/tests/topotests/bgp_rr_ibgp/tor1/bgpd.conf
@@ -2,4 +2,5 @@ hostname tor1
 router bgp 99
   no bgp ebgp-requires-policy
   neighbor 192.168.2.3 remote-as internal
+  neighbor 192.168.2.3 timers 3 10
   redistribute connected

diff --git a/tests/topotests/bgp_rr_ibgp/tor2/bgpd.conf b/tests/topotests/bgp_rr_ibgp/tor2/bgpd.conf
index 99c34158b98c0d9911c093db47ab2517b09b2246..3bdb35976c74118da7bc16e996daafbfeee84191 100644 (file)
--- a/tests/topotests/bgp_rr_ibgp/tor2/bgpd.conf
+++ b/tests/topotests/bgp_rr_ibgp/tor2/bgpd.conf
@@ -2,4 +2,5 @@ hostname tor2
 router bgp 99
   no bgp ebgp-requires-policy
   neighbor 192.168.4.3 remote-as internal
+  neighbor 192.168.4.3 timers 3 10
   redistribute connected

diff --git a/tests/topotests/bgp_sender-as-path-loop-detection/r1/bgpd.conf b/tests/topotests/bgp_sender-as-path-loop-detection/r1/bgpd.conf
index b16e94d7c1ca3a03121b6b9687c2fb8510b5d906..719d76392d33b8d94b4c90bd0a64c336b9cd68a7 100644 (file)
--- a/tests/topotests/bgp_sender-as-path-loop-detection/r1/bgpd.conf
+++ b/tests/topotests/bgp_sender-as-path-loop-detection/r1/bgpd.conf
@@ -2,6 +2,7 @@
 router bgp 65001
   no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65002
+  neighbor 192.168.255.1 timers 3 10
   address-family ipv4 unicast
     neighbor 192.168.255.1 route-map prepend out
     redistribute connected

diff --git a/tests/topotests/bgp_sender-as-path-loop-detection/r2/bgpd.conf b/tests/topotests/bgp_sender-as-path-loop-detection/r2/bgpd.conf
index 674877edd31eefac9ebb2c4eb35996fa8377ec90..a4a654d7b5c24f458a5dc2fa144df451f9417f93 100644 (file)
--- a/tests/topotests/bgp_sender-as-path-loop-detection/r2/bgpd.conf
+++ b/tests/topotests/bgp_sender-as-path-loop-detection/r2/bgpd.conf
@@ -2,8 +2,10 @@
 router bgp 65002
   no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
+  neighbor 192.168.255.2 timers 3 10
   neighbor 192.168.255.2 solo
   neighbor 192.168.254.2 remote-as 65003
+  neighbor 192.168.254.2 timers 3 10
   neighbor 192.168.254.2 solo
   neighbor 192.168.254.2 sender-as-path-loop-detection
 !

diff --git a/tests/topotests/bgp_sender-as-path-loop-detection/r3/bgpd.conf b/tests/topotests/bgp_sender-as-path-loop-detection/r3/bgpd.conf
index 4ee7a39ab2f56bf64d39f72e7e748eabd66e083c..2e24de0b2d89ca48fa02267a8fb25a911e0e86c9 100644 (file)
--- a/tests/topotests/bgp_sender-as-path-loop-detection/r3/bgpd.conf
+++ b/tests/topotests/bgp_sender-as-path-loop-detection/r3/bgpd.conf
@@ -2,4 +2,5 @@
 router bgp 65003
   no bgp ebgp-requires-policy
   neighbor 192.168.254.1 remote-as 65002
+  neighbor 192.168.254.1 timers 3 10
 !

diff --git a/tests/topotests/bgp_set_local-preference_add_subtract/r1/bgpd.conf b/tests/topotests/bgp_set_local-preference_add_subtract/r1/bgpd.conf
index 7dab52fef0b9e48ae452e6084c6d614af76f0b2c..57e2f5818abd6afdf2aebff0955a5337b7574d5d 100644 (file)
--- a/tests/topotests/bgp_set_local-preference_add_subtract/r1/bgpd.conf
+++ b/tests/topotests/bgp_set_local-preference_add_subtract/r1/bgpd.conf
@@ -1,6 +1,8 @@
 router bgp 65000
   no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65000
+  neighbor 192.168.255.2 timers 3 10
   neighbor 192.168.255.3 remote-as 65000
+  neighbor 192.168.255.3 timers 3 10
   exit-address-family
 !

diff --git a/tests/topotests/bgp_set_local-preference_add_subtract/r2/bgpd.conf b/tests/topotests/bgp_set_local-preference_add_subtract/r2/bgpd.conf
index a8a0384632a70614a360c6b0ff90f345616c5031..82a01d457044e76e511c8766b6857292d439f497 100644 (file)
--- a/tests/topotests/bgp_set_local-preference_add_subtract/r2/bgpd.conf
+++ b/tests/topotests/bgp_set_local-preference_add_subtract/r2/bgpd.conf
@@ -1,6 +1,7 @@
 router bgp 65000
   no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65000
+  neighbor 192.168.255.1 timers 3 10
   address-family ipv4
     redistribute connected
     neighbor 192.168.255.1 route-map r1-out out

diff --git a/tests/topotests/bgp_set_local-preference_add_subtract/r3/bgpd.conf b/tests/topotests/bgp_set_local-preference_add_subtract/r3/bgpd.conf
index 2f5dceede2dae84dff002703e751705bb9cf03d2..65e092b0f251eb63c4f09324329175325a1b59f4 100644 (file)
--- a/tests/topotests/bgp_set_local-preference_add_subtract/r3/bgpd.conf
+++ b/tests/topotests/bgp_set_local-preference_add_subtract/r3/bgpd.conf
@@ -1,6 +1,7 @@
 router bgp 65000
   no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65000
+  neighbor 192.168.255.1 timers 3 10
   address-family ipv4
     redistribute connected
     neighbor 192.168.255.1 route-map r1-out out

diff --git a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/bgpd.conf b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/bgpd.conf
index 002cecd1fafb19f5aacfdbc007917a195e327c7e..0033bc2a7a3c8ba8153cfeaf5d872c49a78e348f 100644 (file)
--- a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/bgpd.conf
+++ b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/bgpd.conf
@@ -5,6 +5,7 @@ router bgp 101 vrf r1-cust1
  neighbor r2g remote-as external
  neighbor r2g bfd
  neighbor r1-eth0 interface peer-group r2g
+ neighbor r1-eth0 timers 3 10
  address-family ipv4 unicast
   redistribute connected
  exit-address-family

diff --git a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/bgpd.conf b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/bgpd.conf
index 0878b9b9952b06e94ad4ab0263318d17643d7b93..183157eb46642c8c6b3fb39baa4c78f43b6796ef 100644 (file)
--- a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/bgpd.conf
+++ b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/bgpd.conf
@@ -5,6 +5,7 @@ router bgp 102 vrf r2-cust1
  neighbor r2g remote-as external
  neighbor r2g bfd
  neighbor r2-eth0 interface peer-group r2g
+ neighbor r2-eth0 timers 3 10
  !
  address-family ipv4 unicast
   redistribute connected

diff --git a/tests/topotests/bgp_vrf_netns/r1/bgpd.conf b/tests/topotests/bgp_vrf_netns/r1/bgpd.conf
index dabf9521ac4498fcdc2203a916ceb916dc8cc267..cfe3f2e2b5de0fc992e53af0f0506103e1c1817c 100644 (file)
--- a/tests/topotests/bgp_vrf_netns/r1/bgpd.conf
+++ b/tests/topotests/bgp_vrf_netns/r1/bgpd.conf
@@ -4,6 +4,7 @@ router bgp 100 vrf r1-cust1
  bgp bestpath as-path multipath-relax
  no bgp ebgp-requires-policy
  neighbor 10.0.1.101 remote-as 99
+ neighbor 10.0.1.101 timers 3 10
  !
 !
 

diff --git a/tests/topotests/evpn-pim-1/leaf1/bgpd.conf b/tests/topotests/evpn-pim-1/leaf1/bgpd.conf
index 4dedfecd612167138e7c358ccfc78445ff3938ec..97fd8662f4e37f27d40cca88dc4d18881c13b4d9 100644 (file)
--- a/tests/topotests/evpn-pim-1/leaf1/bgpd.conf
+++ b/tests/topotests/evpn-pim-1/leaf1/bgpd.conf
@@ -2,6 +2,7 @@
 router bgp 65002
    no bgp ebgp-requires-policy
    neighbor 192.168.1.1 remote-as external
+   neighbor 192.168.1.1 timers 3 10
    redistribute connected
    address-family l2vpn evpn
       neighbor 192.168.1.1 activate

diff --git a/tests/topotests/evpn-pim-1/leaf2/bgpd.conf b/tests/topotests/evpn-pim-1/leaf2/bgpd.conf
index 5bc708240d90017dadde0f7a90f868235e28df0d..91d9bd8c8bff08a26c1694b3dd7cc83265bc66c7 100644 (file)
--- a/tests/topotests/evpn-pim-1/leaf2/bgpd.conf
+++ b/tests/topotests/evpn-pim-1/leaf2/bgpd.conf
@@ -2,6 +2,7 @@
 router bgp 65003
   no bgp ebgp-requires-policy
   neighbor 192.168.2.1 remote-as external
+  neighbor 192.168.2.1 timers 3 10
   redistribute connected
   address-family l2vpn evpn
      neighbor 192.168.2.1 activate

diff --git a/tests/topotests/evpn-pim-1/spine/bgpd.conf b/tests/topotests/evpn-pim-1/spine/bgpd.conf
index 16c17b29cce0cff013620b583de550614f613488..81ab802f35aa3e433ef7c51dc4fc35bf7884885f 100644 (file)
--- a/tests/topotests/evpn-pim-1/spine/bgpd.conf
+++ b/tests/topotests/evpn-pim-1/spine/bgpd.conf
@@ -2,7 +2,9 @@
 router bgp 65001
   no bgp ebgp-requires-policy
   neighbor 192.168.1.2 remote-as external
+  neighbor 192.168.1.2 timers 3 10
   neighbor 192.168.2.3 remote-as external
+  neighbor 192.168.2.3 timers 3 10
   redistribute connected
   address-family l2vpn evpn
     neighbor 192.168.1.2 activate

diff --git a/tests/topotests/pim-basic/r1/bgpd.conf b/tests/topotests/pim-basic/r1/bgpd.conf
index 1ca643f758fc197db4633f1a65dd7c862e804ccd..84d9598bc60074247ce6584b9b9647c5c035a8c2 100644 (file)
--- a/tests/topotests/pim-basic/r1/bgpd.conf
+++ b/tests/topotests/pim-basic/r1/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65001
   no bgp ebgp-requires-policy
   neighbor 10.0.30.3 remote-as external
+  neighbor 10.0.30.3 timers 3 10
   redistribute connected

diff --git a/tests/topotests/pim-basic/rp/bgpd.conf b/tests/topotests/pim-basic/rp/bgpd.conf
index 451799288afd1d7fab6f91199f97ffd79c1a2de7..1bfae6059b275189dd1e5a1a504971ecf44b16f3 100644 (file)
--- a/tests/topotests/pim-basic/rp/bgpd.conf
+++ b/tests/topotests/pim-basic/rp/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65003
    no bgp ebgp-requires-policy
    neighbor 10.0.30.1 remote-as external
+   neighbor 10.0.30.1 timers 3 10
    redistribute connected