From 6f2aea5a1309ce69f269ca4e95ed5c1f476a3735 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 31 Jul 2024 10:45:38 -0400 Subject: [PATCH 1/4] tests: Increase route_scale timeouts This test is frequently failing in the upstream CI. Most log failures are stating that we expected something like 1 million routes but we have 900k+. Looks like the system is just loaded a bit more than expected. Let's give these tests a bit more time to complete. Signed-off-by: Donald Sharp --- tests/topotests/route_scale/scale_test_common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/topotests/route_scale/scale_test_common.py b/tests/topotests/route_scale/scale_test_common.py index 3e20296018..0b239dc04b 100644 --- a/tests/topotests/route_scale/scale_test_common.py +++ b/tests/topotests/route_scale/scale_test_common.py @@ -165,7 +165,7 @@ def route_install_helper(iter): # Table of defaults, used for timeout values and 'expected' objects scale_defaults = dict( - zip(scale_keys, [None, None, 10, 50, expected_installed, expected_removed]) + zip(scale_keys, [None, None, 10, 60, expected_installed, expected_removed]) ) # List of params for each step in the test; note extra time given From 08bf9cd9f5f37cf7afefa181d82d0836809109a4 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 31 Jul 2024 10:37:59 -0400 Subject: [PATCH 2/4] tests: Shorten reconnect timer when something goes wrong When running bfd_bgp_cbit_topo3 and an intial connection goes wrong, try to connect again as fast as possible as that the timer is 2 minutes otherwise and the test will never come back from it. Signed-off-by: Donald Sharp --- tests/topotests/bfd_bgp_cbit_topo3/r1/bgpd.conf | 1 + tests/topotests/bfd_bgp_cbit_topo3/r3/bgpd.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/topotests/bfd_bgp_cbit_topo3/r1/bgpd.conf b/tests/topotests/bfd_bgp_cbit_topo3/r1/bgpd.conf index f8ad1f3a66..054b12832a 100644 --- a/tests/topotests/bfd_bgp_cbit_topo3/r1/bgpd.conf +++ b/tests/topotests/bfd_bgp_cbit_topo3/r1/bgpd.conf @@ -7,6 +7,7 @@ router bgp 101 bgp graceful-restart neighbor 2001:db8:4::1 remote-as 102 neighbor 2001:db8:4::1 timers 3 10 + neighbor 2001:db8:4::1 timers connect 1 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 42953a075c..d7e10210f3 100644 --- a/tests/topotests/bfd_bgp_cbit_topo3/r3/bgpd.conf +++ b/tests/topotests/bfd_bgp_cbit_topo3/r3/bgpd.conf @@ -11,6 +11,7 @@ router bgp 102 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 timers connect 1 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 From b52346efe404de8da5e0dd6ff41e6a1ec4dd1621 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 31 Jul 2024 11:00:38 -0400 Subject: [PATCH 3/4] tests: need aggressive timers in bgp_route_map_match_ipv6_nexthop Add some timers to make the convergence happen as fast as possible when a connection fails on the initial attempt. Signed-off-by: Donald Sharp --- tests/topotests/bgp_route_map_match_ipv6_nexthop/r1/bgpd.conf | 2 ++ tests/topotests/bgp_route_map_match_ipv6_nexthop/r2/bgpd.conf | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/topotests/bgp_route_map_match_ipv6_nexthop/r1/bgpd.conf b/tests/topotests/bgp_route_map_match_ipv6_nexthop/r1/bgpd.conf index 8b743bd320..11e57ca932 100644 --- a/tests/topotests/bgp_route_map_match_ipv6_nexthop/r1/bgpd.conf +++ b/tests/topotests/bgp_route_map_match_ipv6_nexthop/r1/bgpd.conf @@ -11,6 +11,8 @@ router bgp 65001 bgp router-id 10.10.10.1 no bgp ebgp-requires-policy neighbor 2001:db8::2 remote-as external + neighbor 2001:db8::2 timers 3 10 + neighbor 2001:db8::2 timers connect 1 address-family ipv6 unicast neighbor 2001:db8::2 activate neighbor 2001:db8::2 route-map r2 in diff --git a/tests/topotests/bgp_route_map_match_ipv6_nexthop/r2/bgpd.conf b/tests/topotests/bgp_route_map_match_ipv6_nexthop/r2/bgpd.conf index 61c36d366b..abd0ab9a41 100644 --- a/tests/topotests/bgp_route_map_match_ipv6_nexthop/r2/bgpd.conf +++ b/tests/topotests/bgp_route_map_match_ipv6_nexthop/r2/bgpd.conf @@ -5,6 +5,8 @@ router bgp 65002 bgp router-id 10.10.10.2 no bgp ebgp-requires-policy neighbor 2001:db8::1 remote-as external + neighbor 2001:db8::1 timers 3 10 + neighbor 2001:db8::1 timers connect 1 address-family ipv6 unicast redistribute connected neighbor 2001:db8::1 activate From 9af1f5e8237a74ed756cdec258a3a2921b536707 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 31 Jul 2024 11:43:07 -0400 Subject: [PATCH 4/4] tests: need aggressive timers in bgp_prefix_list_any Add some timers to make convergence happan as fast as possible when a connection fails on the intial attempt. Signed-off-by: Donald Sharp --- tests/topotests/bgp_prefix_list_any/r1/bgpd.conf | 4 ++++ tests/topotests/bgp_prefix_list_any/r2/bgpd.conf | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/tests/topotests/bgp_prefix_list_any/r1/bgpd.conf b/tests/topotests/bgp_prefix_list_any/r1/bgpd.conf index 14c28ca906..593442a42a 100644 --- a/tests/topotests/bgp_prefix_list_any/r1/bgpd.conf +++ b/tests/topotests/bgp_prefix_list_any/r1/bgpd.conf @@ -4,6 +4,10 @@ router bgp 65001 no bgp network import-check neighbor 192.168.1.2 remote-as external neighbor 2001:db8:1::2 remote-as external + neighbor 192.168.1.2 timers 3 10 + neighbor 192.168.1.2 timers connect 1 + neighbor 2001:db8:1::2 timers 3 10 + neighbor 2001:db8:1::2 timers connect 1 address-family ipv4 unicast network 192.168.0.1/32 no neighbor 2001:db8:1::2 activate diff --git a/tests/topotests/bgp_prefix_list_any/r2/bgpd.conf b/tests/topotests/bgp_prefix_list_any/r2/bgpd.conf index 733205928f..0de5bd3355 100644 --- a/tests/topotests/bgp_prefix_list_any/r2/bgpd.conf +++ b/tests/topotests/bgp_prefix_list_any/r2/bgpd.conf @@ -6,6 +6,10 @@ router bgp 65002 no bgp network import-check neighbor 192.168.1.1 remote-as external neighbor 2001:db8:1::1 remote-as external + neighbor 192.168.1.1 timers 3 10 + neighbor 192.168.1.1 timers connect 1 + neighbor 2001:db8:1::1 timers 3 10 + neighbor 2001:db8:1::1 timers connect 1 address-family ipv4 unicast network 10.10.10.1/32 network 10.10.10.2/32