Skip to content

bgpd: Changes for supporting install-then-advertise #3629

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

Open
sudhanshukumar22 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

bgpd: Changes for supporting install-then-advertise #3629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d52842e
bgpd: Changes for supporting install-then-advertise
sudhanshukumar22 Oct 17, 2019
9f58548
Merge branch 'master' into bgp-install-advertise-feature-sonic
sudhanshukumar22 Nov 26, 2019
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
7 changes: 7 additions & 0 deletions dockers/docker-fpm-frr/bgpd.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,10 @@ agentx
!
{% include "bgpd.conf.default.j2" %}
!
{% block bgp_error_handling_init %}
{% if BGP_ERROR_CFG_TABLE %}
{% if BGP_ERROR_CFG_TABLE['config']['enable'] == 'true' %}
bgp error-handling enable
{% endif %}
{% endif %}
{% endblock bgp_error_handling_init %}
8 changes: 8 additions & 0 deletions dockers/docker-fpm-frr/frr.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,11 @@ agentx
!
{% include "bgpd.conf.default.j2" %}
!
{% block bgp_error_handling_init %}
{% if BGP_ERROR_CFG_TABLE %}
{% if BGP_ERROR_CFG_TABLE['config']['enable'] == 'true' %}
bgp error-handling enable
{% endif %}
{% endif %}
{% endblock bgp_error_handling_init %}

9 changes: 9 additions & 0 deletions dockers/docker-fpm-frr/zebra.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,12 @@
!
{% include "zebra.interfaces.conf.j2" %}
!
{% block bgp_error_handling_init %}
{% if BGP_ERROR_CFG_TABLE %}
{% if BGP_ERROR_CFG_TABLE['config']['enable'] == 'true' %}
bgp error-handling enable
{% endif %}
{% endif %}
{% endblock bgp_error_handling_init %}


1 change: 1 addition & 0 deletions src/sonic-config-engine/tests/sample_output/frr.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,5 @@ router bgp 65100
address-family ipv6
neighbor 10.20.30.40 activate
exit-address-family

!!
Loading