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

[frr]: Force disable next hop group support. (#17344)

Browse Source 
Signed-off-by: Nazarii Hnydyn nazariig@nvidia.com

Closes #17345

This W/A was proposed by Nvidia FRR team before the long term solution is ready.

Why I did it
A W/A to fix default route installation during LAG member flap
Work item tracking
N/A
How I did it
Disabled FRR next hop group support
How to verify it
Do LAG member flap
This commit is contained in:
Nazarii Hnydyn 2023-12-06 05:09:54 +02:00 committed by mssonicbld
parent 56ba5b10b4
commit 1687a442de
10 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dockers/docker-fpm-frr/docker_init.sh
View File

@ -49,6 +49,10 @@ write_default_zebra_config()
echo "no fpm use-next-hop-groups" >> $FILE_NAME echo "no fpm use-next-hop-groups" >> $FILE_NAME
echo "fpm address 127.0.0.1" >> $FILE_NAME echo "fpm address 127.0.0.1" >> $FILE_NAME
} }
grep -q '^no zebra nexthop kernel enable' $FILE_NAME || {
echo "no zebra nexthop kernel enable" >> $FILE_NAME
}
} }
if [[ ! -z "$NAMESPACE_ID" ]]; then if [[ ! -z "$NAMESPACE_ID" ]]; then

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

@ -7,6 +7,8 @@
{% endblock banner %} {% endblock banner %}
! !
{% block fpm %} {% block fpm %}
! Force disable next hop group support
no zebra nexthop kernel enable
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages ! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
no fpm use-next-hop-groups no fpm use-next-hop-groups
! !

3
platform/vs/docker-sonic-vs/frr/zebra.conf
View File

@ -1,4 +1,3 @@
no zebra nexthop kernel enable
no fpm use-next-hop-groups no fpm use-next-hop-groups
fpm address 127.0.0.1 fpm address 127.0.0.1

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

@ -4,6 +4,8 @@
! file: zebra.conf ! file: zebra.conf
! !
! !
! Force disable next hop group support
no zebra nexthop kernel enable
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages ! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
no fpm use-next-hop-groups no fpm use-next-hop-groups
! !

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

@ -4,6 +4,8 @@
! file: zebra.conf ! file: zebra.conf
! !
! !
! Force disable next hop group support
no zebra nexthop kernel enable
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages ! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
no fpm use-next-hop-groups no fpm use-next-hop-groups
! !

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

@ -4,6 +4,8 @@
! file: zebra.conf ! file: zebra.conf
! !
! !
! Force disable next hop group support
no zebra nexthop kernel enable
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages ! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
no fpm use-next-hop-groups no fpm use-next-hop-groups
! !

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

@ -4,6 +4,8 @@
! file: zebra.conf ! file: zebra.conf
! !
! !
! Force disable next hop group support
no zebra nexthop kernel enable
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages ! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
no fpm use-next-hop-groups no fpm use-next-hop-groups
! !

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

@ -4,6 +4,8 @@
! file: zebra.conf ! file: zebra.conf
! !
! !
! Force disable next hop group support
no zebra nexthop kernel enable
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages ! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
no fpm use-next-hop-groups no fpm use-next-hop-groups
! !

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

@ -4,6 +4,8 @@
! file: zebra.conf ! file: zebra.conf
! !
! !
! Force disable next hop group support
no zebra nexthop kernel enable
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages ! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
no fpm use-next-hop-groups no fpm use-next-hop-groups
! !

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

@ -4,6 +4,8 @@
! file: zebra.conf ! file: zebra.conf
! !
! !
! Force disable next hop group support
no zebra nexthop kernel enable
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages ! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
no fpm use-next-hop-groups no fpm use-next-hop-groups
! !