proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-24 19:59:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Donald Sharp 2024-12-04 12:22:59 -05:00
parent a43b11fcf6
commit dc372568ad
25 changed files with 71 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/topotests/bgp_aggregate_address_topo1/r1/bgpd.conf
View File

@ -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

1
tests/topotests/bgp_aggregate_address_topo1/r2/bgpd.conf
View File

@ -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

1
tests/topotests/bgp_aggregator_zero/r1/bgpd.conf
View File

@ -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
!

1
tests/topotests/bgp_aspath_zero/r1/bgpd.conf
View File

@ -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
!

20
tests/topotests/bgp_ecmp_topo1/r1/bgpd.conf
View File

@ -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
!
!

1
tests/topotests/bgp_flowspec/r1/bgpd.conf
View File

@ -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

1
tests/topotests/bgp_invalid_nexthop/r1/frr.conf
View File

@ -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

8
tests/topotests/bgp_multiview_topo1/r1/bgpd.conf
View File

@ -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

1
tests/topotests/bgp_nexthop_ipv6/r1/bgpd.conf
View File

@ -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
!

1
tests/topotests/bgp_nexthop_ipv6/r2/bgpd.conf
View File

@ -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
!

1
tests/topotests/bgp_nexthop_ipv6/r4/bgpd.conf
View File

@ -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
!

1
tests/topotests/bgp_nexthop_ipv6/r5/bgpd.conf
View File

@ -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
!

1
tests/topotests/bgp_nexthop_ipv6/r6/bgpd.conf
View File

@ -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
!

6
tests/topotests/bgp_nexthop_ipv6/rr/bgpd.conf
View File

@ -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

1
tests/topotests/bgp_path_attribute_discard/r1/frr.conf
View File

@ -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
!

1
tests/topotests/bgp_path_attribute_discard/r2/frr.conf
View File

@ -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
!

8
tests/topotests/bgp_peer_type_multipath_relax/r1/bgpd.conf
View File

@ -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
!

4
tests/topotests/bgp_peer_type_multipath_relax/r2/bgpd.conf
View File

@ -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

2
tests/topotests/bgp_prefix_sid/r1/bgpd.conf
View File

@ -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

1
tests/topotests/bgp_prefix_sid2/r1/bgpd.conf
View File

@ -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

2
tests/topotests/bgp_route_server_client/r1/bgpd.conf
View File

@ -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

8
tests/topotests/bgp_route_server_client/r2/bgpd.conf
View File

@ -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

2
tests/topotests/bgp_route_server_client/r3/bgpd.conf
View File

@ -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

2
tests/topotests/bgp_route_server_client/r4/bgpd.conf
View File

@ -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

1
tests/topotests/bgp_vrf_netns/r1/bgpd.conf
View File

@ -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
!
!