Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[202012] [bgp] Enable BGP Graceful Restart based on device role #12990

Merged
merged 1 commit into from
Dec 8, 2022
Merged

[202012] [bgp] Enable BGP Graceful Restart based on device role #12990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,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
Expand Down
3 changes: 2 additions & 1 deletion src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"localhost": {
"hostname": "new_hostname",
"bgp_asn": "55555",
"sub_role": "FrontEnd"
"sub_role": "FrontEnd",
"type": "ToRRouter"
}
},
"LOOPBACK_INTERFACE": {
Expand Down
3 changes: 2 additions & 1 deletion src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"DEVICE_METADATA": {
"localhost": {
"bgp_asn": "55555",
"sub_role": "FrontEnd"
"sub_role": "FrontEnd",
"type": "ToRRouter"
}
},
"LOOPBACK_INTERFACE": {
Expand Down
3 changes: 2 additions & 1 deletion src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"DEVICE_METADATA": {
"localhost": {
"bgp_asn": "55555",
"sub_role": "FrontEnd"
"sub_role": "FrontEnd",
"type": "ToRRouter"
}
},
"LOOPBACK_INTERFACE": {
Expand Down
3 changes: 2 additions & 1 deletion src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"localhost": {
"bgp_asn": "55555",
"hostname": "test_hostname",
"sub_role": "FrontEnd"
"sub_role": "FrontEnd",
"type": "ToRRouter"
}
},
"INTERFACE": {
Expand Down
4 changes: 0 additions & 4 deletions src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,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 graceful-restart select-defer-time 45
!
bgp router-id 8.0.0.5
!
Expand Down
4 changes: 0 additions & 4 deletions src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,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 graceful-restart select-defer-time 45
!
bgp router-id 10.1.0.32
!
Expand Down
4 changes: 0 additions & 4 deletions src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ router bgp 4000
!
bgp bestpath as-path multipath-relax
!
bgp graceful-restart restart-time 240
bgp graceful-restart
bgp graceful-restart preserve-fw-state
bgp graceful-restart select-defer-time 45
!
bgp router-id 4.0.0.0
!
Expand Down
4 changes: 0 additions & 4 deletions src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,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 graceful-restart select-defer-time 45
!
bgp router-id 8.0.0.5
!
Expand Down
4 changes: 0 additions & 4 deletions src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,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 graceful-restart select-defer-time 45
!
bgp router-id 10.1.0.32
!
Expand Down
4 changes: 0 additions & 4 deletions src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ router bgp 4000
!
bgp bestpath as-path multipath-relax
!
bgp graceful-restart restart-time 240
bgp graceful-restart
bgp graceful-restart preserve-fw-state
bgp graceful-restart select-defer-time 45
!
bgp router-id 4.0.0.0
!
Expand Down