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

Template change for BGP monitors on T2 (#14844)

Browse Source 
Why I did it
To support BGPMon sessions from each T2 linecard ASIC

Work item tracking
Microsoft ADO (number only): 17873174
How I did it
Added change in BGPMon configuration to use Loopback4096 as source interface, since this has a unique IP per ASIC.

How to verify it
Tested by manually setting up BGPMon session on T2 LC and verified that Loopback4096 could be used as source
This commit is contained in:
Tejaswini Chadaga 2023-05-09 13:40:00 -07:00 committed by GitHub
parent b6b31df339
commit 4e60f0d563
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 78 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dockers/docker-fpm-frr/frr/bgpd/templates/monitors/peer-group.conf.j2
View File

@ -2,11 +2,30 @@
! template: bgpd/templates/BGPMON/peer-group.conf.j2
!
neighbor BGPMON peer-group
{% if CONFIG_DB__DEVICE_METADATA['localhost']['type'] == 'SpineRouter' %}
neighbor BGPMON update-source Loopback4096
{% else %}
neighbor BGPMON update-source {{ loopback0_ipv4 | ip }}
neighbor BGPMON route-map FROM_BGPMON in
neighbor BGPMON route-map TO_BGPMON out
neighbor BGPMON send-community
neighbor BGPMON maximum-prefix 1
{% endif %}
address-family ipv4
neighbor BGPMON activate
neighbor BGPMON route-map FROM_BGPMON in
neighbor BGPMON route-map TO_BGPMON out
neighbor BGPMON send-community
neighbor BGPMON maximum-prefix 1
exit-address-family
{% if CONFIG_DB__DEVICE_METADATA['localhost']['type'] == 'SpineRouter' %}
address-family ipv6
neighbor BGPMON activate
neighbor BGPMON route-map FROM_BGPMON in
neighbor BGPMON route-map TO_BGPMON out
neighbor BGPMON send-community
neighbor BGPMON maximum-prefix 1
exit-address-family
{% endif %}
!
! end of template: bgpd/templates/BGPMON/peer-group.conf.j2
!

1
dockers/docker-fpm-frr/frr/zebra/zebra.interfaces.conf.j2
View File

@ -12,6 +12,7 @@ vni {{ vnet_metadata['vni'] }}
{% block interfaces %}
! Enable nht through default route
ip nht resolve-via-default
ipv6 nht resolve-via-default
! Enable link-detect (default disabled)
{% for (name, prefix) in INTERFACE|pfx_filter %}
interface {{ name }}

7
src/sonic-bgpcfgd/tests/data/monitors/peer-group.conf/param_all.json
View File

@ -1,3 +1,8 @@
{
"CONFIG_DB__DEVICE_METADATA": {
"localhost": {
"type": "LeafRouter"
}
},
"loopback0_ipv4": "1.1.1.1/32"
}
}

7
src/sonic-bgpcfgd/tests/data/monitors/peer-group.conf/param_chassis.json Normal file
View File

@ -0,0 +1,7 @@
{
"CONFIG_DB__DEVICE_METADATA": {
"localhost": {
"type": "SpineRouter"
}
}
}

12
src/sonic-bgpcfgd/tests/data/monitors/peer-group.conf/result_all.conf
View File

@ -3,10 +3,14 @@
!
neighbor BGPMON peer-group
neighbor BGPMON update-source 1.1.1.1
neighbor BGPMON route-map FROM_BGPMON in
neighbor BGPMON route-map TO_BGPMON out
neighbor BGPMON send-community
neighbor BGPMON maximum-prefix 1
address-family ipv4
neighbor BGPMON activate
neighbor BGPMON route-map FROM_BGPMON in
neighbor BGPMON route-map TO_BGPMON out
neighbor BGPMON send-community
neighbor BGPMON maximum-prefix 1
exit-address-family
!
! end of template: bgpd/templates/BGPMON/peer-group.conf.j2
!

22
src/sonic-bgpcfgd/tests/data/monitors/peer-group.conf/result_chassis.conf Normal file
View File

@ -0,0 +1,22 @@
!
! template: bgpd/templates/BGPMON/peer-group.conf.j2
!
neighbor BGPMON peer-group
neighbor BGPMON update-source Loopback4096
address-family ipv4
neighbor BGPMON activate
neighbor BGPMON route-map FROM_BGPMON in
neighbor BGPMON route-map TO_BGPMON out
neighbor BGPMON send-community
neighbor BGPMON maximum-prefix 1
exit-address-family
address-family ipv6
neighbor BGPMON activate
neighbor BGPMON route-map FROM_BGPMON in
neighbor BGPMON route-map TO_BGPMON out
neighbor BGPMON send-community
neighbor BGPMON maximum-prefix 1
exit-address-family
!
! end of template: bgpd/templates/BGPMON/peer-group.conf.j2
!

1
src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
View File

@ -17,6 +17,7 @@ agentx
!
! Enable nht through default route
ip nht resolve-via-default
ipv6 nht resolve-via-default
! Enable link-detect (default disabled)
interface Ethernet0
link-detect

1
src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/interfaces.conf
View File

@ -1,6 +1,7 @@
!
! Enable nht through default route
ip nht resolve-via-default
ipv6 nht resolve-via-default
! Enable link-detect (default disabled)
interface Ethernet0
link-detect

1
src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf
View File

@ -28,6 +28,7 @@ vni 20
!
! Enable nht through default route
ip nht resolve-via-default
ipv6 nht resolve-via-default
! Enable link-detect (default disabled)
interface Ethernet0
link-detect

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

@ -20,6 +20,7 @@ agentx
!
! Enable nht through default route
ip nht resolve-via-default
ipv6 nht resolve-via-default
! Enable link-detect (default disabled)
interface PortChannel03
link-detect

1
src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-vni-zebra.conf
View File

@ -26,6 +26,7 @@ vni 9000
!
! Enable nht through default route
ip nht resolve-via-default
ipv6 nht resolve-via-default
! Enable link-detect (default disabled)
interface Ethernet8
link-detect

1
src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-zebra.conf
View File

@ -26,6 +26,7 @@ vni 8000
!
! Enable nht through default route
ip nht resolve-via-default
ipv6 nht resolve-via-default
! Enable link-detect (default disabled)
interface Ethernet8
link-detect

1
src/sonic-config-engine/tests/sample_output/py2/zebra_frr.conf
View File

@ -23,6 +23,7 @@ log facility local4
!
! Enable nht through default route
ip nht resolve-via-default
ipv6 nht resolve-via-default
! Enable link-detect (default disabled)
interface PortChannel03
link-detect

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

@ -20,6 +20,7 @@ agentx
!
! Enable nht through default route
ip nht resolve-via-default
ipv6 nht resolve-via-default
! Enable link-detect (default disabled)
interface PortChannel01
link-detect

1
src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-vni-zebra.conf
View File

@ -26,6 +26,7 @@ vni 9000
!
! Enable nht through default route
ip nht resolve-via-default
ipv6 nht resolve-via-default
! Enable link-detect (default disabled)
interface Ethernet0
link-detect

1
src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-zebra.conf
View File

@ -26,6 +26,7 @@ vni 8000
!
! Enable nht through default route
ip nht resolve-via-default
ipv6 nht resolve-via-default
! Enable link-detect (default disabled)
interface Ethernet0
link-detect

1
src/sonic-config-engine/tests/sample_output/py3/zebra_frr.conf
View File

@ -23,6 +23,7 @@ log facility local4
!
! Enable nht through default route
ip nht resolve-via-default
ipv6 nht resolve-via-default
! Enable link-detect (default disabled)
interface PortChannel01
link-detect