[bgp] Enable BGP Graceful Restart based on device role (#9486)

What I did: Updated Jinja Template to enable BGP Graceful Restart based on device role. By default it will be enable only if the device role type is TorRouter. Why I did:- By default FRR is configured in Graceful Helper mode. Graceful Restart is needed on T0/TorRouter only since the device can go for warm-reboot. For T1/LeafRouter it need to be in Helper mode only
sonic-net · Apr 1, 2022 · 9138423 · 9138423
1 parent db5b9ee
commit 9138423
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 13 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
@@ -52,7 +52,7 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
   bgp bestpath as-path multipath-relax
 {% endif %}
 !
-{% if constants.bgp.graceful_restart.enabled is defined and constants.bgp.graceful_restart.enabled %}
+{% if constants.bgp.graceful_restart.enabled is defined and constants.bgp.graceful_restart.enabled and DEVICE_METADATA['localhost']['type'] == 'ToRRouter' %}
   bgp graceful-restart restart-time {{ constants.bgp.graceful_restart.restart_time | default(240) }}
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state

diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json
@@ -3,7 +3,8 @@
         "localhost": {
             "hostname": "new_hostname",
             "bgp_asn": "55555",
-            "sub_role": "FrontEnd"
+            "sub_role": "FrontEnd",
+            "type": "ToRRouter"
         }
     },
     "LOOPBACK_INTERFACE": {

diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.json
@@ -2,7 +2,8 @@
     "DEVICE_METADATA": {
         "localhost": {
             "bgp_asn": "55555",
-            "sub_role": "FrontEnd"
+            "sub_role": "FrontEnd",
+            "type": "ToRRouter"
         }
     },
     "LOOPBACK_INTERFACE": {

diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.json
@@ -2,7 +2,8 @@
     "DEVICE_METADATA": {
         "localhost": {
             "bgp_asn": "55555",
-            "sub_role": "FrontEnd"
+            "sub_role": "FrontEnd",
+            "type": "ToRRouter"
         }
     },
     "LOOPBACK_INTERFACE": {

diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.json
@@ -3,7 +3,8 @@
         "localhost": {
             "bgp_asn": "55555",
             "hostname": "test_hostname",
-            "sub_role": "FrontEnd"
+            "sub_role": "FrontEnd",
+            "type": "ToRRouter"
         }
     },
     "INTERFACE": {

diff --git a/src/sonic-config-engine/tests/sample_output/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/bgpd_frr_backend_asic.conf
@@ -45,9 +45,6 @@ router bgp 65100
 !
   bgp bestpath as-path multipath-relax
 !
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
-  bgp graceful-restart preserve-fw-state
 !
   bgp router-id 8.0.0.5
 !

diff --git a/src/sonic-config-engine/tests/sample_output/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/bgpd_frr_frontend_asic.conf
@@ -45,9 +45,6 @@ router bgp 65100
 !
   bgp bestpath as-path multipath-relax
 !
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
-  bgp graceful-restart preserve-fw-state
 !
   bgp router-id 10.1.0.32
 !

diff --git a/src/sonic-config-engine/tests/sample_output/t2-chassis-fe-bgpd.conf b/src/sonic-config-engine/tests/sample_output/t2-chassis-fe-bgpd.conf
@@ -26,8 +26,6 @@ router bgp 4000 vrf VnetFE
   bgp log-neighbor-changes
   bgp bestpath as-path multipath-relax
   no bgp default ipv4-unicast
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
   bgp router-id 4.0.0.0
   neighbor 192.168.0.1 remote-as 3000
   neighbor 192.168.0.1 description Leaf01