matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[docker-fpm-frr]: Enable sending ipv6 prefixes over ipv4 BGPMON session (#3799)

Browse Source 
* Enable ipv6 prefixes over ipv4 BGPMON session
This commit is contained in:
pavel-shirshov 2019-11-22 20:43:44 -08:00 committed by lguohan
parent 3d80afa415
commit d44cc30191
3 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dockers/docker-fpm-frr/bgpd.conf.default.j2
View File

@ -24,9 +24,9 @@ route-map TO_BGP_PEER_V4 permit 100
route-map TO_BGP_PEER_V6 permit 100 route-map TO_BGP_PEER_V6 permit 100
! !
{% if BGP_MONITORS is defined and BGP_MONITORS|length > 0 %} {% if BGP_MONITORS is defined and BGP_MONITORS|length > 0 %}
route-map FROM_BGPMON_V4 deny 10 route-map FROM_BGPMON deny 10
! !
route-map TO_BGPMON_V4 permit 10 route-map TO_BGPMON permit 10
! !
{% endif %} {% endif %}
! !
@ -136,21 +136,24 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
{% endblock bgp_peers_with_range %} {% endblock bgp_peers_with_range %}
{% block bgp_monitors %} {% block bgp_monitors %}
{% if BGP_MONITORS is defined and BGP_MONITORS|length > 0 %} {% if BGP_MONITORS is defined and BGP_MONITORS|length > 0 %}
neighbor BGPMON_V4 peer-group neighbor BGPMON peer-group
{% for (name, prefix) in LOOPBACK_INTERFACE|pfx_filter %} {% for (name, prefix) in LOOPBACK_INTERFACE|pfx_filter %}
{% if prefix | ipv4 and name == 'Loopback0' %} {% if prefix | ipv4 and name == 'Loopback0' %}
neighbor BGPMON_V4 update-source {{ prefix | ip }} neighbor BGPMON update-source {{ prefix | ip }}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
neighbor BGPMON_V4 route-map FROM_BGPMON_V4 in neighbor BGPMON route-map FROM_BGPMON in
neighbor BGPMON_V4 route-map TO_BGPMON_V4 out neighbor BGPMON route-map TO_BGPMON out
neighbor BGPMON_V4 send-community neighbor BGPMON send-community
neighbor BGPMON_V4 maximum-prefix 1 neighbor BGPMON maximum-prefix 1
{% for neighbor_addr, bgp_session in BGP_MONITORS.items() %} {% for neighbor_addr, bgp_session in BGP_MONITORS.items() %}
neighbor {{ neighbor_addr }} remote-as {{ DEVICE_METADATA['localhost']['bgp_asn'] }} neighbor {{ neighbor_addr }} remote-as {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
neighbor {{ neighbor_addr }} peer-group BGPMON_V4 neighbor {{ neighbor_addr }} peer-group BGPMON
neighbor {{ neighbor_addr }} description {{ bgp_session['name'] }} neighbor {{ neighbor_addr }} description {{ bgp_session['name'] }}
neighbor {{ neighbor_addr }} activate neighbor {{ neighbor_addr }} activate
address-family ipv6
neighbor {{ neighbor_addr }} activate
exit-address-family
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endblock bgp_monitors %} {% endblock bgp_monitors %}

21
src/sonic-config-engine/tests/sample_output/bgpd_frr.conf
View File

@ -31,9 +31,9 @@ route-map TO_BGP_PEER_V4 permit 100
! !
route-map TO_BGP_PEER_V6 permit 100 route-map TO_BGP_PEER_V6 permit 100
! !
route-map FROM_BGPMON_V4 deny 10 route-map FROM_BGPMON deny 10
! !
route-map TO_BGPMON_V4 permit 10 route-map TO_BGPMON permit 10
! !
! !
route-map ISOLATE permit 10 route-map ISOLATE permit 10
@ -73,14 +73,17 @@ router bgp 65100
neighbor PEER_V6 soft-reconfiguration inbound neighbor PEER_V6 soft-reconfiguration inbound
neighbor PEER_V6 route-map TO_BGP_PEER_V6 out neighbor PEER_V6 route-map TO_BGP_PEER_V6 out
exit-address-family exit-address-family
neighbor BGPMON_V4 peer-group neighbor BGPMON peer-group
neighbor BGPMON_V4 update-source 10.1.0.32 neighbor BGPMON update-source 10.1.0.32
neighbor BGPMON_V4 route-map FROM_BGPMON_V4 in neighbor BGPMON route-map FROM_BGPMON in
neighbor BGPMON_V4 route-map TO_BGPMON_V4 out neighbor BGPMON route-map TO_BGPMON out
neighbor BGPMON_V4 send-community neighbor BGPMON send-community
neighbor BGPMON_V4 maximum-prefix 1 neighbor BGPMON maximum-prefix 1
neighbor 10.20.30.40 remote-as 65100 neighbor 10.20.30.40 remote-as 65100
neighbor 10.20.30.40 peer-group BGPMON_V4 neighbor 10.20.30.40 peer-group BGPMON
neighbor 10.20.30.40 description BGPMonitor neighbor 10.20.30.40 description BGPMonitor
neighbor 10.20.30.40 activate neighbor 10.20.30.40 activate
address-family ipv6
neighbor 10.20.30.40 activate
exit-address-family
!! !!

21
src/sonic-config-engine/tests/sample_output/frr.conf
View File

@ -63,9 +63,9 @@ route-map TO_BGP_PEER_V4 permit 100
! !
route-map TO_BGP_PEER_V6 permit 100 route-map TO_BGP_PEER_V6 permit 100
! !
route-map FROM_BGPMON_V4 deny 10 route-map FROM_BGPMON deny 10
! !
route-map TO_BGPMON_V4 permit 10 route-map TO_BGPMON permit 10
! !
! !
route-map ISOLATE permit 10 route-map ISOLATE permit 10
@ -105,14 +105,17 @@ router bgp 65100
neighbor PEER_V6 soft-reconfiguration inbound neighbor PEER_V6 soft-reconfiguration inbound
neighbor PEER_V6 route-map TO_BGP_PEER_V6 out neighbor PEER_V6 route-map TO_BGP_PEER_V6 out
exit-address-family exit-address-family
neighbor BGPMON_V4 peer-group neighbor BGPMON peer-group
neighbor BGPMON_V4 update-source 10.1.0.32 neighbor BGPMON update-source 10.1.0.32
neighbor BGPMON_V4 route-map FROM_BGPMON_V4 in neighbor BGPMON route-map FROM_BGPMON in
neighbor BGPMON_V4 route-map TO_BGPMON_V4 out neighbor BGPMON route-map TO_BGPMON out
neighbor BGPMON_V4 send-community neighbor BGPMON send-community
neighbor BGPMON_V4 maximum-prefix 1 neighbor BGPMON maximum-prefix 1
neighbor 10.20.30.40 remote-as 65100 neighbor 10.20.30.40 remote-as 65100
neighbor 10.20.30.40 peer-group BGPMON_V4 neighbor 10.20.30.40 peer-group BGPMON
neighbor 10.20.30.40 description BGPMonitor neighbor 10.20.30.40 description BGPMonitor
neighbor 10.20.30.40 activate neighbor 10.20.30.40 activate
address-family ipv6
neighbor 10.20.30.40 activate
exit-address-family
!! !!