Skip to content

Commit

Permalink
[FRR template]Add missing exit to avoid config nht via default route …
Browse files Browse the repository at this point in the history
…in vrf (sonic-net#19587)

Why I did it
The 'ip nht resolve-via-default' is configured in vrf config by mistake instead of the global setting when vrf is configured causing the bgpl cannot to be established.

Work item tracking
Microsoft ADO (number only): 28726407
How I did it
Add the missing 'exit' line in FRR zebra.interfaces.conf.j2 file to exit vrf config block and ensure the 'ip nht resolve-via-default' is configured in the global setting.
  • Loading branch information
Gfrom2016 authored Aug 27, 2024
1 parent f626233 commit 94e0668
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions dockers/docker-fpm-frr/frr/zebra/zebra.interfaces.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{% for vnet_name, vnet_metadata in VNET.items() %}
vrf {{ vnet_name }}
vni {{ vnet_metadata['vni'] }}
exit
!
{% endfor %}
{% endif %}
Expand Down
2 changes: 2 additions & 0 deletions src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ log facility local4
!
vrf First
vni 10
exit
!
vrf Second
vni 20
exit
!
! Enable nht through default route
ip nht resolve-via-default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ log facility local4
!
vrf VnetFE
vni 9000
exit
!
!
! Enable nht through default route
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ log facility local4
!
vrf VnetFE
vni 8000
exit
!
!
! Enable nht through default route
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ log facility local4
!
vrf VnetFE
vni 9000
exit
!
!
! Enable nht through default route
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ log facility local4
!
vrf VnetFE
vni 8000
exit
!
!
! Enable nht through default route
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ enable password zebra
!
vrf VnetFE
vni 8000
exit
!
!
! Enable nht through default route
Expand Down

0 comments on commit 94e0668

Please sign in to comment.