Merge pull request #18450 from donaldsharp/bgp_packet_reads

Bgp packet reads conversion to a FIFO

8 files changed, 10 insertions, 18 deletions

diff --git a/tests/topotests/high_ecmp/r1/frr.conf b/tests/topotests/high_ecmp/r1/frr.conf
index 957e17e914..e64fb2e416 100644
--- 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 df64a146bc..ad7b9df919 100644
--- 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 15137a8715..9f4b961d82 100644
--- 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 7985fe6e99..f48eb23405 100644
--- 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 151f6da45c..1e98e31236 100644
--- 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 48842bbfc2..afc3a30c7d 100644
--- 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 e3258cabd4..b0728d3069 100644
--- 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 23827789fb..0b12e83e1f 100644
--- 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