[BGP]Introduce bgp update delay to control how long bgp stays in read…

… only mode during init
dgsudharsan · Dec 11, 2024 · b1cb18d · b1cb18d
1 parent c715dff
commit b1cb18d
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 0 deletions.
diff --git a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
@@ -65,6 +65,10 @@ route-map HIDE_INTERNAL permit 20
 !
 {% endif %}
 !
+{% if constants.bgp.update_delay is defined %}
+bgp update-delay {{ constants.bgp.update_delay }}
+{% endif %}
+!
 {% if (DEVICE_METADATA is defined) and ('localhost' in DEVICE_METADATA) and ('bgp_asn' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['bgp_asn'].lower() != 'none') and (DEVICE_METADATA['localhost']['bgp_asn'].lower() != 'null') %}
 router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
 !

diff --git a/files/image_config/constants/constants.yml b/files/image_config/constants/constants.yml
@@ -24,6 +24,7 @@ constants:
       enabled: true
       ipv4: 514
       ipv6: 514
+    update_delay: 20
     allow_list:
       enabled: true
       default_action: "permit"   # or "deny"

diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf
@@ -39,6 +39,8 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.0.0/27
 !
 !
 !
+bgp update-delay 20
+!
 router bgp 65100
 !
   bgp log-neighbor-changes

diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
@@ -50,6 +50,8 @@ route-map HIDE_INTERNAL permit 10
   set community no-export
 !
 !
+bgp update-delay 20
+!
 router bgp 65100
 !
   bgp log-neighbor-changes

diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_bmp.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_bmp.conf
@@ -39,6 +39,8 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.200.0/27
 !
 !
 !
+bgp update-delay 20
+!
 router bgp 65100
 !
   bgp log-neighbor-changes

diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_dualtor.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_dualtor.conf
@@ -39,6 +39,8 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.0.0/27
 !
 !
 !
+bgp update-delay 20
+!
 router bgp 65100
 !
   bgp log-neighbor-changes

diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
@@ -50,6 +50,8 @@ route-map HIDE_INTERNAL permit 10
   set community no-export
 !
 !
+bgp update-delay 20
+!
 router bgp 65100
 !
   bgp log-neighbor-changes

diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_quagga.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_quagga.conf
@@ -16,6 +16,8 @@ route-map FROM_BGP_SPEAKER_V4 permit 10
 !
 route-map TO_BGP_SPEAKER_V4 deny 10
 !
+bgp update-delay 20
+!
 router bgp 65100
   bgp log-neighbor-changes
   bgp bestpath as-path multipath-relax

diff --git a/src/sonic-config-engine/tests/sample_output/py2/frr.conf b/src/sonic-config-engine/tests/sample_output/py2/frr.conf
@@ -59,6 +59,8 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.0.0/27
 !
 !
 !
+bgp update-delay 20
+!
 router bgp 65100
 !
   bgp log-neighbor-changes

diff --git a/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf b/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf
@@ -55,6 +55,8 @@ ip prefix-list PL_LoopbackV4 permit 4.0.0.0/32
 !
 !
 !
+bgp update-delay 20
+!
 router bgp 4000
 !
   bgp log-neighbor-changes

diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf
@@ -39,6 +39,8 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.200.0/27
 !
 !
 !
+bgp update-delay 20
+!
 router bgp 65100
 !
   bgp log-neighbor-changes

diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
@@ -50,6 +50,8 @@ route-map HIDE_INTERNAL permit 10
   set community no-export
 !
 !
+bgp update-delay 20
+!
 router bgp 65100
 !
   bgp log-neighbor-changes

diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_bmp.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_bmp.conf
@@ -39,6 +39,8 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.200.0/27
 !
 !
 !
+bgp update-delay 20
+!
 router bgp 65100
 !
   bgp log-neighbor-changes

diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_dualtor.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_dualtor.conf
@@ -39,6 +39,8 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.200.0/27
 !
 !
 !
+bgp update-delay 20
+!
 router bgp 65100
 !
   bgp log-neighbor-changes

diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
@@ -50,6 +50,8 @@ route-map HIDE_INTERNAL permit 10
   set community no-export
 !
 !
+bgp update-delay 20
+!
 router bgp 65100
 !
   bgp log-neighbor-changes

diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_quagga.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_quagga.conf
@@ -16,6 +16,8 @@ route-map FROM_BGP_SPEAKER_V4 permit 10
 !
 route-map TO_BGP_SPEAKER_V4 deny 10
 !
+bgp update-delay 20
+!
 router bgp 65100
   bgp log-neighbor-changes
   bgp bestpath as-path multipath-relax

diff --git a/src/sonic-config-engine/tests/sample_output/py3/frr.conf b/src/sonic-config-engine/tests/sample_output/py3/frr.conf
@@ -59,6 +59,8 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.200.0/27
 !
 !
 !
+bgp update-delay 20
+!
 router bgp 65100
 !
   bgp log-neighbor-changes

diff --git a/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf b/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf
@@ -55,6 +55,8 @@ ip prefix-list PL_LoopbackV4 permit 4.0.0.0/32
 !
 !
 !
+bgp update-delay 20
+!
 router bgp 4000
 !
   bgp log-neighbor-changes
-Original file line number
+Diff line change
@@ Expand Up @@
     !
     !
     !
+    bgp update-delay 20
+    !
     router bgp 65100
     !
       bgp log-neighbor-changes
@@ Expand Down @@