tests: Expand hold timer to 60 seconds for high_ecmp

The hold timer is 5/20.  At load with a very very
large number of routes, the tests are experiencing
some issues with this.  Let's just give ourselves
some headroom associated with the receiving
of packets

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

diff --git a/tests/topotests/high_ecmp/r1/frr.conf b/tests/topotests/high_ecmp/r1/frr.conf
index 957e17e914e4c10b71106e3bf4b5808ec26c8fe0..e64fb2e416d41a20cd7d5d56b05348f10df9fba3 100644 (file)
--- a/tests/topotests/high_ecmp/r1/frr.conf
+++ b/tests/topotests/high_ecmp/r1/frr.conf
@@ -2577,3 +2577,8 @@ interface r1-eth514
  ipv6 address 2001:db8:3:5::1/64
  no shut
 !
+router bgp 1001
+  timers bgp 5 60
+  no bgp ebgp-requires-policy
+  read-quanta 1
+!

diff --git a/tests/topotests/high_ecmp/r1/frr_ipv4_bgp.conf b/tests/topotests/high_ecmp/r1/frr_ipv4_bgp.conf
index df64a146bca67cf159c05a94ba2cf7655a3610a4..ad7b9df9199f328588675575003079555fe8599f 100644 (file)
--- a/tests/topotests/high_ecmp/r1/frr_ipv4_bgp.conf
+++ b/tests/topotests/high_ecmp/r1/frr_ipv4_bgp.conf
@@ -1,7 +1,4 @@
 router bgp 1001
-  timers bgp 5 20
-  no bgp ebgp-requires-policy
-  read-quanta 1
   neighbor 10.1.1.2 remote-as external
   neighbor 10.1.2.2 remote-as external
   neighbor 10.1.3.2 remote-as external

diff --git a/tests/topotests/high_ecmp/r1/frr_ipv6_bgp.conf b/tests/topotests/high_ecmp/r1/frr_ipv6_bgp.conf
index 15137a87158d0ad7686fcdec3567b741f20e0807..9f4b961d82c1d587f92564c9155a379bb60c0512 100644 (file)
--- a/tests/topotests/high_ecmp/r1/frr_ipv6_bgp.conf
+++ b/tests/topotests/high_ecmp/r1/frr_ipv6_bgp.conf
@@ -1,7 +1,4 @@
 router bgp 1001
-  timers bgp 5 20
-  no bgp ebgp-requires-policy
-  read-quanta 1
   neighbor 2001:db8:1:1::2 remote-as external
   neighbor 2001:db8:1:2::2 remote-as external
   neighbor 2001:db8:1:3::2 remote-as external

diff --git a/tests/topotests/high_ecmp/r1/frr_unnumbered_bgp.conf b/tests/topotests/high_ecmp/r1/frr_unnumbered_bgp.conf
index 7985fe6e9949934f53539c03f76d795909aa0713..f48eb234059594b72543d16e5ad66b9111478406 100644 (file)
--- a/tests/topotests/high_ecmp/r1/frr_unnumbered_bgp.conf
+++ b/tests/topotests/high_ecmp/r1/frr_unnumbered_bgp.conf
@@ -1,7 +1,4 @@
 router bgp 1001
-  timers bgp 5 20
-  no bgp ebgp-requires-policy
-  read-quanta 1
   neighbor r1-eth0 interface remote-as external
   neighbor r1-eth1 interface remote-as external
   neighbor r1-eth2 interface remote-as external

diff --git a/tests/topotests/high_ecmp/r2/frr.conf b/tests/topotests/high_ecmp/r2/frr.conf
index 151f6da45c45d4b0c400d1056fb838fa1cdf092d..1e98e31236ef3ad0ca002edca479876ec7ebcafd 100644 (file)
--- a/tests/topotests/high_ecmp/r2/frr.conf
+++ b/tests/topotests/high_ecmp/r2/frr.conf
@@ -2577,3 +2577,8 @@ interface r2-eth514
  ipv6 address 2001:db8:3:5::2/64
  no shutdown
 !
+router bgp 1002
+  timers bgp 5 60
+  no bgp ebgp-requires-policy
+  read-quanta 1
+!

diff --git a/tests/topotests/high_ecmp/r2/frr_ipv4_bgp.conf b/tests/topotests/high_ecmp/r2/frr_ipv4_bgp.conf
index 48842bbfc2395a21948c5f3295529d30d744e872..afc3a30c7de0f198b94a4bbc9732b8f7f70f4d7f 100644 (file)
--- a/tests/topotests/high_ecmp/r2/frr_ipv4_bgp.conf
+++ b/tests/topotests/high_ecmp/r2/frr_ipv4_bgp.conf
@@ -1,7 +1,4 @@
 router bgp 1002
-  timers bgp 5 20
-  no bgp ebgp-requires-policy
-  read-quanta 1
   neighbor 10.1.1.1 remote-as external
   neighbor 10.1.2.1 remote-as external
   neighbor 10.1.3.1 remote-as external

diff --git a/tests/topotests/high_ecmp/r2/frr_ipv6_bgp.conf b/tests/topotests/high_ecmp/r2/frr_ipv6_bgp.conf
index e3258cabd480ff70e18d5082d1b94b18cffc2780..b0728d3069d25a4347855ff0a2e9800987d3ada5 100644 (file)
--- a/tests/topotests/high_ecmp/r2/frr_ipv6_bgp.conf
+++ b/tests/topotests/high_ecmp/r2/frr_ipv6_bgp.conf
@@ -1,7 +1,4 @@
 router bgp 1002
-  timers bgp 5 20
-  no bgp ebgp-requires-policy
-  read-quanta 1
   neighbor 2001:db8:1:1::1 remote-as external
   neighbor 2001:db8:1:2::1 remote-as external
   neighbor 2001:db8:1:3::1 remote-as external

diff --git a/tests/topotests/high_ecmp/r2/frr_unnumbered_bgp.conf b/tests/topotests/high_ecmp/r2/frr_unnumbered_bgp.conf
index 23827789fb0d17d734821e2b708a1d1a9d733f6b..0b12e83e1fa07805d935d59a1958ea86e0ac9036 100644 (file)
--- a/tests/topotests/high_ecmp/r2/frr_unnumbered_bgp.conf
+++ b/tests/topotests/high_ecmp/r2/frr_unnumbered_bgp.conf
@@ -1,7 +1,4 @@
 router bgp 1002
-  timers bgp 5 20
-  no bgp ebgp-requires-policy
-  read-quanta 1
   neighbor r2-eth0 interface remote-as external
   neighbor r2-eth1 interface remote-as external
   neighbor r2-eth2 interface remote-as external