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

[bgp]: Enable next-hop-tracking through default (#5600)

Browse Source 
**- Why I did it**
FRR introduced [next hop tracking](http://docs.frrouting.org/projects/dev-guide/en/latest/next-hop-tracking.html) functionality. 
That functionality requires resolving BGP neighbors before setting BGP connection (or explicit ebgp-multihop command). Sometimes (BGP MONITORS) our neighbors are not directly connected and sessions are IBGP. In this case current configuration prevents FRR to establish BGP connections.  Reason would be "waiting for NHT". To fix that we need either add static routes for each not-directly connected ibgp neighbor, or enable command `ip nht resolve-via-default`

**- How I did it**
Put `ip nht resolve-via-default` into the config

**- How to verify it**
Build an image. Enable BGP_MONITOR entry and check that entry is Established or Connecting in FRR

Co-authored-by: Pavel Shirshov <pavel.contrib@gmail.com>
This commit is contained in:
pavel-shirshov 2020-10-13 22:21:28 -07:00 committed by GitHub
parent 1e2e0199fa
commit 812e1a3489
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -18,6 +18,8 @@ agentx
!
!
!
! Enable nht through default route
ip nht resolve-via-default
! Enable link-detect (default disabled)
interface Ethernet4
link-detect

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

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

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

@ -22,6 +22,8 @@ vrf First
vni 10
!
!
! Enable nht through default route
ip nht resolve-via-default
! Enable link-detect (default disabled)
interface Ethernet4
link-detect

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

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

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

@ -19,6 +19,8 @@ vrf VnetFE
vni 9000
!
!
! Enable nht through default route
ip nht resolve-via-default
! Enable link-detect (default disabled)
interface Ethernet8
link-detect

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

@ -19,6 +19,8 @@ vrf VnetFE
vni 8000
!
!
! Enable nht through default route
ip nht resolve-via-default
! Enable link-detect (default disabled)
interface Ethernet8
link-detect

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

@ -16,6 +16,8 @@ log facility local4
! end of template: common/daemons.common.conf.j2!
!
!
! Enable nht through default route
ip nht resolve-via-default
! Enable link-detect (default disabled)
interface PortChannel03
link-detect

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

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

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

@ -19,6 +19,8 @@ vrf VnetFE
vni 9000
!
!
! Enable nht through default route
ip nht resolve-via-default
! Enable link-detect (default disabled)
interface Ethernet0
link-detect

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

@ -19,6 +19,8 @@ vrf VnetFE
vni 8000
!
!
! Enable nht through default route
ip nht resolve-via-default
! Enable link-detect (default disabled)
interface Ethernet0
link-detect

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

@ -16,6 +16,8 @@ log facility local4
! end of template: common/daemons.common.conf.j2!
!
!
! Enable nht through default route
ip nht resolve-via-default
! Enable link-detect (default disabled)
interface PortChannel01
link-detect

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

@ -12,6 +12,8 @@ vrf VnetFE
vni 8000
!
!
! Enable nht through default route
ip nht resolve-via-default
! Enable link-detect (default disabled)
interface PortChannel0
link-detect