tests: Convert to using `neighbor X timers connect 1` for exabgp using tests

For those tests using exabgp convert them all to use `neighbor X timers
connect 1`.  I have noticed that occassionally when looking at the
support files for tests run that peers are in a wait period for
reconnecting which is longer than the test is waiting to converge.

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

diff --git a/tests/topotests/bgp_aggregate_address_topo1/r1/bgpd.conf b/tests/topotests/bgp_aggregate_address_topo1/r1/bgpd.conf
index c7cf4a527f9e6e5192b5e8c587cba98ea69255a6..69be4b541d2395259ffcbc57fb3e627f09aea001 100644 (file)
--- a/tests/topotests/bgp_aggregate_address_topo1/r1/bgpd.conf
+++ b/tests/topotests/bgp_aggregate_address_topo1/r1/bgpd.conf
@@ -19,8 +19,10 @@ router bgp 65000
   no bgp ebgp-requires-policy
   neighbor 10.0.0.2 remote-as 65001
   neighbor 10.0.0.2 timers 3 10
+  neighbor 10.0.0.2 timers connect 1
   neighbor 10.0.1.2 remote-as internal
   neighbor 10.0.1.2 timers 3 10
+  neighbor 10.0.1.2 timers connect 1
   address-family ipv4 unicast
    redistribute connected
    aggregate-address 192.168.0.0/24 matching-MED-only

diff --git a/tests/topotests/bgp_aggregate_address_topo1/r2/bgpd.conf b/tests/topotests/bgp_aggregate_address_topo1/r2/bgpd.conf
index acacd8652657f71fdd5aff1f8a0f6fb0b3e511f5..418624aed41ec4ab8156d29dcf27c37ea2be68f8 100644 (file)
--- a/tests/topotests/bgp_aggregate_address_topo1/r2/bgpd.conf
+++ b/tests/topotests/bgp_aggregate_address_topo1/r2/bgpd.conf
@@ -1,6 +1,7 @@
 router bgp 65000
   neighbor 10.0.1.1 remote-as internal
   neighbor 10.0.1.1 timers 3 10
+  neighbor 10.0.1.1 timers connect 1
   address-family ipv4 unicast
     redistribute connected
   exit-address-family

diff --git a/tests/topotests/bgp_aggregator_zero/r1/bgpd.conf b/tests/topotests/bgp_aggregator_zero/r1/bgpd.conf
index 002a5c78c0f74b4e11e2ec94b4cd039e0fa9c29a..a6e24b221bf0cd6669bffd960c81a944e38f4127 100644 (file)
--- a/tests/topotests/bgp_aggregator_zero/r1/bgpd.conf
+++ b/tests/topotests/bgp_aggregator_zero/r1/bgpd.conf
@@ -3,4 +3,5 @@ router bgp 65534
   no bgp ebgp-requires-policy
   neighbor 10.0.0.2 remote-as external
   neighbor 10.0.0.2 timers 3 10
+  neighbor 10.0.0.2 timers connect 1
 !

diff --git a/tests/topotests/bgp_aspath_zero/r1/bgpd.conf b/tests/topotests/bgp_aspath_zero/r1/bgpd.conf
index 002a5c78c0f74b4e11e2ec94b4cd039e0fa9c29a..a6e24b221bf0cd6669bffd960c81a944e38f4127 100644 (file)
--- a/tests/topotests/bgp_aspath_zero/r1/bgpd.conf
+++ b/tests/topotests/bgp_aspath_zero/r1/bgpd.conf
@@ -3,4 +3,5 @@ router bgp 65534
   no bgp ebgp-requires-policy
   neighbor 10.0.0.2 remote-as external
   neighbor 10.0.0.2 timers 3 10
+  neighbor 10.0.0.2 timers connect 1
 !

diff --git a/tests/topotests/bgp_ecmp_topo1/r1/bgpd.conf b/tests/topotests/bgp_ecmp_topo1/r1/bgpd.conf
index 49981ac589685ecfaca66093c3fbf6b1e067a060..09c65321c2e1128737d87d9e6545f966d71dab21 100644 (file)
--- a/tests/topotests/bgp_ecmp_topo1/r1/bgpd.conf
+++ b/tests/topotests/bgp_ecmp_topo1/r1/bgpd.conf
@@ -8,44 +8,64 @@ router bgp 100
  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.101 timers connect 1
  neighbor 10.0.1.102 remote-as 99
  neighbor 10.0.1.102 timers 3 10
+ neighbor 10.0.1.102 timers connect 1
  neighbor 10.0.1.103 remote-as 99
  neighbor 10.0.1.103 timers 3 10
+ neighbor 10.0.1.103 timers connect 1
  neighbor 10.0.1.104 remote-as 99
  neighbor 10.0.1.104 timers 3 10
+ neighbor 10.0.1.104 timers connect 1
  neighbor 10.0.1.105 remote-as 99
  neighbor 10.0.1.105 timers 3 10
+ neighbor 10.0.1.105 timers connect 1
  neighbor 10.0.2.106 remote-as 99
  neighbor 10.0.2.106 timers 3 10
+ neighbor 10.0.1.106 timers connect 1
  neighbor 10.0.2.107 remote-as 99
  neighbor 10.0.2.107 timers 3 10
+ neighbor 10.0.1.107 timers connect 1
  neighbor 10.0.2.108 remote-as 99
  neighbor 10.0.2.108 timers 3 10
+ neighbor 10.0.1.108 timers connect 1
  neighbor 10.0.2.109 remote-as 99
  neighbor 10.0.2.109 timers 3 10
+ neighbor 10.0.1.109 timers connect 1
  neighbor 10.0.2.110 remote-as 99
  neighbor 10.0.2.110 timers 3 10
+ neighbor 10.0.1.110 timers connect 1
  neighbor 10.0.3.111 remote-as 111
  neighbor 10.0.3.111 timers 3 10
+ neighbor 10.0.1.111 timers connect 1
  neighbor 10.0.3.112 remote-as 112
  neighbor 10.0.3.112 timers 3 10
+ neighbor 10.0.1.112 timers connect 1
  neighbor 10.0.3.113 remote-as 113
  neighbor 10.0.3.113 timers 3 10
+ neighbor 10.0.1.113 timers connect 1
  neighbor 10.0.3.114 remote-as 114
  neighbor 10.0.3.114 timers 3 10
+ neighbor 10.0.1.114 timers connect 1
  neighbor 10.0.3.115 remote-as 115
  neighbor 10.0.3.115 timers 3 10
+ neighbor 10.0.1.115 timers connect 1
  neighbor 10.0.4.116 remote-as 116
  neighbor 10.0.4.116 timers 3 10
+ neighbor 10.0.1.116 timers connect 1
  neighbor 10.0.4.117 remote-as 117
  neighbor 10.0.4.117 timers 3 10
+ neighbor 10.0.1.117 timers connect 1
  neighbor 10.0.4.118 remote-as 118
  neighbor 10.0.4.118 timers 3 10
+ neighbor 10.0.1.118 timers connect 1
  neighbor 10.0.4.119 remote-as 119
  neighbor 10.0.4.119 timers 3 10
+ neighbor 10.0.1.119 timers connect 1
  neighbor 10.0.4.120 remote-as 120
  neighbor 10.0.4.120 timers 3 10
+ neighbor 10.0.1.120 timers connect 1
  !
 !
 

diff --git a/tests/topotests/bgp_flowspec/r1/bgpd.conf b/tests/topotests/bgp_flowspec/r1/bgpd.conf
index 4b7a20f958000be309b2ee111ba2149f683650bd..288aeaf4dde9f3277efd8d86aa36d53350da63cf 100644 (file)
--- a/tests/topotests/bgp_flowspec/r1/bgpd.conf
+++ b/tests/topotests/bgp_flowspec/r1/bgpd.conf
@@ -6,6 +6,7 @@ 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 timers connect 1
  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_invalid_nexthop/r1/frr.conf b/tests/topotests/bgp_invalid_nexthop/r1/frr.conf
index 05e1a6c8259e6923986beb945c49b9ceed8253f1..f96aeb43668c670fea76c63a9fe41e3567c68a0d 100644 (file)
--- a/tests/topotests/bgp_invalid_nexthop/r1/frr.conf
+++ b/tests/topotests/bgp_invalid_nexthop/r1/frr.conf
@@ -8,6 +8,7 @@ router bgp 65001
  no bgp ebgp-requires-policy
  neighbor fc00::2 remote-as external
  neighbor fc00::2 timers 3 10
+ neighbor fc00::2 timers connect 1
  address-family ipv6
   neighbor fc00::2 activate
  exit-address-family

diff --git a/tests/topotests/bgp_multiview_topo1/r1/bgpd.conf b/tests/topotests/bgp_multiview_topo1/r1/bgpd.conf
index cd7f44ac665074c4f76cd2db096e19eb3242855f..ced5cb5e4dcc17cebcfdceff3cbfe47e54659987 100644 (file)
--- a/tests/topotests/bgp_multiview_topo1/r1/bgpd.conf
+++ b/tests/topotests/bgp_multiview_topo1/r1/bgpd.conf
@@ -19,10 +19,13 @@ router bgp 100 view 1
  timers bgp 60 180
  neighbor 172.16.1.1 remote-as 65001
  neighbor 172.16.1.1 timers 3 10
+ neighbor 172.16.1.1 timers connect 1
  neighbor 172.16.1.2 remote-as 65002
  neighbor 172.16.1.2 timers 3 10
+ neighbor 172.16.1.2 timers connect 1
  neighbor 172.16.1.5 remote-as 65005
  neighbor 172.16.1.5 timers 3 10
+ neighbor 172.16.1.5 timers connect 1
 !
 router bgp 100 view 2
  bgp router-id 172.30.1.1
@@ -32,8 +35,10 @@ router bgp 100 view 2
  timers bgp 60 180
  neighbor 172.16.1.3 remote-as 65003
  neighbor 172.16.1.3 timers 3 10
+ neighbor 172.16.1.3 timers connect 1
  neighbor 172.16.1.4 remote-as 65004
  neighbor 172.16.1.4 timers 3 10
+ neighbor 172.16.1.4 timers connect 1
 !
 router bgp 100 view 3
  bgp router-id 172.30.1.1
@@ -43,10 +48,13 @@ router bgp 100 view 3
  timers bgp 60 180
  neighbor 172.16.1.6 remote-as 65006
  neighbor 172.16.1.6 timers 3 10
+ neighbor 172.16.1.6 timers connect 1
  neighbor 172.16.1.7 remote-as 65007
  neighbor 172.16.1.7 timers 3 10
+ neighbor 172.16.1.7 timers connect 1
  neighbor 172.16.1.8 remote-as 65008
  neighbor 172.16.1.8 timers 3 10
+ neighbor 172.16.1.8 timers connect 1
 !
 route-map local1 permit 10
  set community 100:9999 additive

diff --git a/tests/topotests/bgp_nexthop_ipv6/r1/bgpd.conf b/tests/topotests/bgp_nexthop_ipv6/r1/bgpd.conf
index 7efa1b79fa5d2ae4647e5e50344ed1e4fc1a38f2..06ac666ce6eab90ed5abe0d0358faa05de23a6c2 100644 (file)
--- a/tests/topotests/bgp_nexthop_ipv6/r1/bgpd.conf
+++ b/tests/topotests/bgp_nexthop_ipv6/r1/bgpd.conf
@@ -2,6 +2,7 @@ router bgp 65000
  no bgp ebgp-requires-policy
  neighbor fd00:0:2::9 remote-as internal
  neighbor fd00:0:2::9 timers 3 10
+ neighbor fd00:0:2::9 timers connect 1
  address-family ipv4 unicast
   redistribute connected route-map RMAP4
  !

diff --git a/tests/topotests/bgp_nexthop_ipv6/r2/bgpd.conf b/tests/topotests/bgp_nexthop_ipv6/r2/bgpd.conf
index 4d4ae44e284b47db6fe9e7085257b980ac842f63..4b696b51b38e257468e35d53230d4e81f4521109 100644 (file)
--- a/tests/topotests/bgp_nexthop_ipv6/r2/bgpd.conf
+++ b/tests/topotests/bgp_nexthop_ipv6/r2/bgpd.conf
@@ -2,6 +2,7 @@ router bgp 65000
  no bgp ebgp-requires-policy
  neighbor fd00:0:2::9 remote-as internal
  neighbor fd00:0:2::9 timers 3 10
+ neighbor fd00:0:2::9 timers connect 1
  address-family ipv4 unicast
   redistribute connected route-map RMAP4
  !

diff --git a/tests/topotests/bgp_nexthop_ipv6/r4/bgpd.conf b/tests/topotests/bgp_nexthop_ipv6/r4/bgpd.conf
index b14c9bace4a6d9b58b292448946a3619cc5198e9..081909bbb3f6319967af9cab9017c380834bc135 100644 (file)
--- a/tests/topotests/bgp_nexthop_ipv6/r4/bgpd.conf
+++ b/tests/topotests/bgp_nexthop_ipv6/r4/bgpd.conf
@@ -2,6 +2,7 @@ router bgp 65001
  no bgp ebgp-requires-policy
  neighbor fd00:0:2::9 remote-as external
  neighbor fd00:0:2::9 timers 3 10
+ neighbor fd00:0:2::9 timers connect 1
  address-family ipv4 unicast
   redistribute connected route-map RMAP4
  !

diff --git a/tests/topotests/bgp_nexthop_ipv6/r5/bgpd.conf b/tests/topotests/bgp_nexthop_ipv6/r5/bgpd.conf
index becea2bbe64832e0d899ba96aa7b82f70fef256e..b8f9078f51e85c3a866c8e5b7c226a6c12c49e90 100644 (file)
--- a/tests/topotests/bgp_nexthop_ipv6/r5/bgpd.conf
+++ b/tests/topotests/bgp_nexthop_ipv6/r5/bgpd.conf
@@ -2,6 +2,7 @@ router bgp 65002
  no bgp ebgp-requires-policy
  neighbor fd00:0:3::9 remote-as external
  neighbor fd00:0:3::9 timers 3 10
+ neighbor fd00:0:3::9 timers connect 1
  address-family ipv4 unicast
   redistribute connected route-map RMAP4
  !

diff --git a/tests/topotests/bgp_nexthop_ipv6/r6/bgpd.conf b/tests/topotests/bgp_nexthop_ipv6/r6/bgpd.conf
index 801736ab988edeccabcf9edb5eef73157005bc80..19c6bbc819486cd1c3f13862d829dd7638eaad5a 100644 (file)
--- a/tests/topotests/bgp_nexthop_ipv6/r6/bgpd.conf
+++ b/tests/topotests/bgp_nexthop_ipv6/r6/bgpd.conf
@@ -2,6 +2,7 @@ router bgp 65000
  no bgp ebgp-requires-policy
  neighbor fd00:0:4::9 remote-as internal
  neighbor fd00:0:4::9 timers 3 10
+ neighbor fd00:0:4::9 timers connect 1
  address-family ipv4 unicast
   redistribute connected route-map RMAP4
  !

diff --git a/tests/topotests/bgp_nexthop_ipv6/rr/bgpd.conf b/tests/topotests/bgp_nexthop_ipv6/rr/bgpd.conf
index 705ae78b8e1e0f1d16733f4499395b15b8bb9fbf..1c8f2fa49edc9409c4b0337dbdd0e1ccfec97ce2 100644 (file)
--- a/tests/topotests/bgp_nexthop_ipv6/rr/bgpd.conf
+++ b/tests/topotests/bgp_nexthop_ipv6/rr/bgpd.conf
@@ -2,16 +2,22 @@ router bgp 65000
  no bgp ebgp-requires-policy
  neighbor fd00:0:2::1 remote-as internal
  neighbor fd00:0:2::1 timers 3 10
+ neighbor fd00:0:2::1 timers connect 1
  neighbor fd00:0:2::2 remote-as internal
  neighbor fd00:0:2::2 timers 3 10
+ neighbor fd00:0:2::2 timers connect 1
  neighbor fd00:0:2::3 remote-as internal
  neighbor fd00:0:2::3 timers 3 10
+ neighbor fd00:0:2::3 timers connect 1
  neighbor fd00:0:2::4 remote-as external
  neighbor fd00:0:2::4 timers 3 10
+ neighbor fd00:0:2::4 timers connect 1
  neighbor fd00:0:3::5 remote-as external
  neighbor fd00:0:3::5 timers 3 10
+ neighbor fd00:0:3::5 timers connect 1
  neighbor fd00:0:4::6 remote-as internal
  neighbor fd00:0:4::6 timers 3 10
+ neighbor fd00:0:4::6 timers connect 1
  address-family ipv4 unicast
   neighbor fd00:0:2::1 route-reflector-client
   neighbor fd00:0:2::2 route-reflector-client

diff --git a/tests/topotests/bgp_path_attribute_discard/r1/frr.conf b/tests/topotests/bgp_path_attribute_discard/r1/frr.conf
index ae7fbdd9a93a32ba4b898b8ef6d2be2467eb1e81..ae47862963be6f957ceac76d4715ee22ab33806c 100644 (file)
--- a/tests/topotests/bgp_path_attribute_discard/r1/frr.conf
+++ b/tests/topotests/bgp_path_attribute_discard/r1/frr.conf
@@ -6,4 +6,5 @@ router bgp 65001
  no bgp ebgp-requires-policy
  neighbor 10.0.0.254 remote-as external
  neighbor 10.0.0.254 timers 3 10
+ neighbor 10.0.0.254 timers connect 1
 !

diff --git a/tests/topotests/bgp_path_attribute_discard/r2/frr.conf b/tests/topotests/bgp_path_attribute_discard/r2/frr.conf
index 1dafbdd8e19f950352a85a0263aa322d8d09eedf..30ffdefff3f5be04e7060f2315026a19fbecdba4 100644 (file)
--- a/tests/topotests/bgp_path_attribute_discard/r2/frr.conf
+++ b/tests/topotests/bgp_path_attribute_discard/r2/frr.conf
@@ -6,5 +6,6 @@ router bgp 65254
  no bgp ebgp-requires-policy
  neighbor 10.0.0.254 remote-as internal
  neighbor 10.0.0.254 timers 3 10
+ neighbor 10.0.0.254 timers connect 1
  neighbor 10.0.0.254 path-attribute discard 26
 !

diff --git a/tests/topotests/bgp_peer_type_multipath_relax/r1/bgpd.conf b/tests/topotests/bgp_peer_type_multipath_relax/r1/bgpd.conf
index 038f108aa8b2a9d52c7ddd1828d377b10b5e1693..e743010922f559f33b230603995d3a43b059ddd6 100644 (file)
--- a/tests/topotests/bgp_peer_type_multipath_relax/r1/bgpd.conf
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/bgpd.conf
@@ -8,9 +8,17 @@ router bgp 64510
  bgp bestpath compare-routerid
  bgp bestpath peer-type multipath-relax
  neighbor 10.0.1.2 remote-as 64510
+ neighbor 10.0.1.2 timers 3 10
+ neighbor 10.0.1.2 timers connect 1
  neighbor 10.0.3.2 remote-as 64502
+ neighbor 10.0.3.2 timers 3 10
+ neighbor 10.0.3.2 timers connect 1
  neighbor 10.0.4.2 remote-as 64503
+ neighbor 10.0.4.2 timers 3 10
+ neighbor 10.0.4.2 timers connect 1
  neighbor 10.0.5.2 remote-as 64511
+ neighbor 10.0.5.2 timers 3 10
+ neighbor 10.0.5.2 timers connect 1
 !
 line vty
 !

diff --git a/tests/topotests/bgp_peer_type_multipath_relax/r2/bgpd.conf b/tests/topotests/bgp_peer_type_multipath_relax/r2/bgpd.conf
index 2362a19f265a44ded70e50797c381dfeaa5b7a44..1da7173bba018e9faf57cd8e496658c1c21b16fb 100644 (file)
--- a/tests/topotests/bgp_peer_type_multipath_relax/r2/bgpd.conf
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r2/bgpd.conf
@@ -7,7 +7,11 @@ router bgp 64511
  bgp router-id 10.0.5.2
  no bgp ebgp-requires-policy
  neighbor 10.0.2.2 remote-as 64511
+ neighbor 10.0.2.2 timers 3 10
+ neighbor 10.0.2.2 timers connect 1
  neighbor 10.0.5.1 remote-as 64510
+ neighbor 10.0.5.1 timers 3 10
+ neighbor 10.0.5.1 timers connect 1
  !
  address-family ipv4 unicast
   neighbor 10.0.5.1 route-map dropall in

diff --git a/tests/topotests/bgp_prefix_sid/r1/bgpd.conf b/tests/topotests/bgp_prefix_sid/r1/bgpd.conf
index e02226f2fd64339feedc75ea3a137096ed248deb..3fd5e5e9c3cdb2d561f5fc2d25b64b0801b22b06 100644 (file)
--- a/tests/topotests/bgp_prefix_sid/r1/bgpd.conf
+++ b/tests/topotests/bgp_prefix_sid/r1/bgpd.conf
@@ -7,8 +7,10 @@ router bgp 1
  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.101 timers connect 1
  neighbor 10.0.0.102 remote-as 3
  neighbor 10.0.0.102 timers 3 10
+ neighbor 10.0.0.102 timers connect 1
  !
  address-family ipv4 labeled-unicast
   neighbor 10.0.0.101 activate

diff --git a/tests/topotests/bgp_prefix_sid2/r1/bgpd.conf b/tests/topotests/bgp_prefix_sid2/r1/bgpd.conf
index b3ca0e114d17e6fe74eb10b058cccfebfff9b369..946103c30fd2f1957da34b3960edf9bbfe943461 100644 (file)
--- a/tests/topotests/bgp_prefix_sid2/r1/bgpd.conf
+++ b/tests/topotests/bgp_prefix_sid2/r1/bgpd.conf
@@ -18,6 +18,7 @@ router bgp 1
  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.101 timers connect 1
  !
  address-family ipv6 vpn
   neighbor 10.0.0.101 activate

diff --git a/tests/topotests/bgp_route_server_client/r1/bgpd.conf b/tests/topotests/bgp_route_server_client/r1/bgpd.conf
index e464e6c50b884350fd2247819b410905fb5e9371..d379f7df4527459a966005e1884115086caa25a2 100644 (file)
--- a/tests/topotests/bgp_route_server_client/r1/bgpd.conf
+++ b/tests/topotests/bgp_route_server_client/r1/bgpd.conf
@@ -5,7 +5,7 @@ router bgp 65001
  no bgp enforce-first-as
  neighbor 2001:db8:1::1 remote-as external
  neighbor 2001:db8:1::1 timers 3 10
- neighbor 2001:db8:1::1 timers connect 5
+ neighbor 2001:db8:1::1 timers connect 1
  address-family ipv6 unicast
   redistribute connected
   neighbor 2001:db8:1::1 activate

diff --git a/tests/topotests/bgp_route_server_client/r2/bgpd.conf b/tests/topotests/bgp_route_server_client/r2/bgpd.conf
index 19607660f98f5a156321489fdbf8e6eaa2c7418e..7fda2b0a058f35bbad71147f69babbf1270091c2 100644 (file)
--- a/tests/topotests/bgp_route_server_client/r2/bgpd.conf
+++ b/tests/topotests/bgp_route_server_client/r2/bgpd.conf
@@ -3,16 +3,16 @@ router bgp 65000 view RS
  no bgp ebgp-requires-policy
  neighbor 2001:db8:1::2 remote-as external
  neighbor 2001:db8:1::2 timers 3 10
- neighbor 2001:db8:1::2 timers connect 5
+ neighbor 2001:db8:1::2 timers connect 1
  neighbor 2001:db8:1::3 remote-as external
  neighbor 2001:db8:1::3 timers 3 10
- neighbor 2001:db8:1::3 timers connect 5
+ neighbor 2001:db8:1::3 timers connect 1
  neighbor 2001:db8:1::4 remote-as external
  neighbor 2001:db8:1::4 timers 3 10
- neighbor 2001:db8:1::4 timers connect 5
+ neighbor 2001:db8:1::4 timers connect 1
  neighbor 2001:db8:3::2 remote-as external
  neighbor 2001:db8:3::2 timers 3 10
- neighbor 2001:db8:3::2 timers connect 5
+ neighbor 2001:db8:3::2 timers connect 1
  address-family ipv6 unicast
   redistribute connected
   neighbor 2001:db8:1::2 activate

diff --git a/tests/topotests/bgp_route_server_client/r3/bgpd.conf b/tests/topotests/bgp_route_server_client/r3/bgpd.conf
index f7daba87facee9b257e2898680335e131ff42edc..2f20b9133499980b1688ca263db79575e069abcc 100644 (file)
--- a/tests/topotests/bgp_route_server_client/r3/bgpd.conf
+++ b/tests/topotests/bgp_route_server_client/r3/bgpd.conf
@@ -5,7 +5,7 @@ router bgp 65003
  no bgp enforce-first-as
  neighbor 2001:db8:3::1 remote-as external
  neighbor 2001:db8:3::1 timers 3 10
- neighbor 2001:db8:3::1 timers connect 5
+ neighbor 2001:db8:3::1 timers connect 1
  address-family ipv6 unicast
   redistribute connected
   neighbor 2001:db8:3::1 activate

diff --git a/tests/topotests/bgp_route_server_client/r4/bgpd.conf b/tests/topotests/bgp_route_server_client/r4/bgpd.conf
index c907d7284e22317211993c75045b81ceda7aff33..66a15730186f7597346d8ea6a1a2cec216ec69eb 100644 (file)
--- a/tests/topotests/bgp_route_server_client/r4/bgpd.conf
+++ b/tests/topotests/bgp_route_server_client/r4/bgpd.conf
@@ -5,7 +5,7 @@ router bgp 65004
  no bgp enforce-first-as
  neighbor 2001:db8:1::1 remote-as external
  neighbor 2001:db8:1::1 timers 3 10
- neighbor 2001:db8:1::1 timers connect 5
+ neighbor 2001:db8:1::1 timers connect 1
  address-family ipv6 unicast
   redistribute connected
   neighbor 2001:db8:1::1 activate

diff --git a/tests/topotests/bgp_vrf_netns/r1/bgpd.conf b/tests/topotests/bgp_vrf_netns/r1/bgpd.conf
index 572dce74557455a7056fe427025f193ab479af47..2853a7a5caa2e21ae33c24441ea3954d10babb7b 100644 (file)
--- a/tests/topotests/bgp_vrf_netns/r1/bgpd.conf
+++ b/tests/topotests/bgp_vrf_netns/r1/bgpd.conf
@@ -5,6 +5,7 @@ router bgp 100 vrf r1-bgp-cust1
  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.101 timers connect 1
  !
 !