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

Updated Internal BGP Templates for chassis packet (#9674)

Browse Source 
Fixes: https://github.com/Azure/sonic-buildimage/issues/9610
This commit is contained in:
abdosi 2022-02-08 09:36:32 -08:00 committed by GitHub
parent 49382d773e
commit e44a40cc3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dockers/docker-fpm-frr/frr/bgpd/templates/internal/peer-group.conf.j2
View File

@ -1,14 +1,12 @@
! !
! template: bgpd/templates/internal/peer-group.conf.j2 ! template: bgpd/templates/internal/peer-group.conf.j2
{% from "common/functions.conf.j2" import get_ipv4_loopback_address %}
{% from "common/functions.conf.j2" import get_ipv6_loopback_address %}
! !
neighbor INTERNAL_PEER_V4 peer-group neighbor INTERNAL_PEER_V4 peer-group
neighbor INTERNAL_PEER_V6 peer-group neighbor INTERNAL_PEER_V6 peer-group
address-family ipv4 address-family ipv4
{% if CONFIG_DB__DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %} {% if CONFIG_DB__DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %}
neighbor INTERNAL_PEER_V4 update-source {{ get_ipv4_loopback_address(CONFIG_DB__LOOPBACK_INTERFACE, "Loopback4096") | ip }} neighbor INTERNAL_PEER_V4 update-source Loopback4096
{% elif CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %} {% elif CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %}
neighbor INTERNAL_PEER_V4 route-reflector-client neighbor INTERNAL_PEER_V4 route-reflector-client
{% endif %} {% endif %}
@ -19,7 +17,7 @@
exit-address-family exit-address-family
address-family ipv6 address-family ipv6
{% if CONFIG_DB__DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %} {% if CONFIG_DB__DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %}
neighbor INTERNAL_PEER_V6 update-source {{ get_ipv6_loopback_address(CONFIG_DB__LOOPBACK_INTERFACE, "Loopback4096") | ip }} neighbor INTERNAL_PEER_V6 update-source Loopback4096
{% elif CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %} {% elif CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %}
neighbor INTERNAL_PEER_V6 route-reflector-client neighbor INTERNAL_PEER_V6 route-reflector-client
{% endif %} {% endif %}

4
src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_chasiss_packet.conf
View File

@ -4,14 +4,14 @@
neighbor INTERNAL_PEER_V4 peer-group neighbor INTERNAL_PEER_V4 peer-group
neighbor INTERNAL_PEER_V6 peer-group neighbor INTERNAL_PEER_V6 peer-group
address-family ipv4 address-family ipv4
neighbor INTERNAL_PEER_V4 update-source 10.10.10.10 neighbor INTERNAL_PEER_V4 update-source Loopback4096
neighbor INTERNAL_PEER_V4 soft-reconfiguration inbound neighbor INTERNAL_PEER_V4 soft-reconfiguration inbound
neighbor INTERNAL_PEER_V4 allowas-in 1 neighbor INTERNAL_PEER_V4 allowas-in 1
neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in
neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out
exit-address-family exit-address-family
address-family ipv6 address-family ipv6
neighbor INTERNAL_PEER_V6 update-source 2603:10e2:400::3 neighbor INTERNAL_PEER_V6 update-source Loopback4096
neighbor INTERNAL_PEER_V6 soft-reconfiguration inbound neighbor INTERNAL_PEER_V6 soft-reconfiguration inbound
neighbor INTERNAL_PEER_V6 allowas-in 1 neighbor INTERNAL_PEER_V6 allowas-in 1
neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in