Skip to content

Commit ec4cf85

Browse files
authored
[202503] backport [frr]: Force disable next hop group support (sonic-net#1740)
[202411][frr]: Force disable next hop group support <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md ** Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it backport sonic-net#23459 ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it #### How to verify it <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
2 parents 56a24f9 + bff6395 commit ec4cf85

12 files changed

Lines changed: 25 additions & 2 deletions

File tree

dockers/docker-fpm-frr/docker_init.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ write_default_zebra_config()
4949
echo "no fpm use-next-hop-groups" >> $FILE_NAME
5050
echo "fpm address 127.0.0.1" >> $FILE_NAME
5151
}
52+
53+
grep -q '^no zebra nexthop kernel enable' $FILE_NAME || {
54+
echo "no zebra nexthop kernel enable" >> $FILE_NAME
55+
}
5256
}
5357

5458
if [[ ! -z "$NAMESPACE_ID" ]]; then

dockers/docker-fpm-frr/frr/zebra/zebra.conf.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
{% endblock banner %}
88
!
99
{% block fpm %}
10+
! Force disable next hop group support
11+
no zebra nexthop kernel enable
1012
{% if ( ('localhost' in DEVICE_METADATA) and ('nexthop_group' in DEVICE_METADATA['localhost']) and
1113
(DEVICE_METADATA['localhost']['nexthop_group'] == 'enabled') ) %}
1214
! enable next hop group support
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1+
no zebra nexthop kernel enable
12
no fpm use-next-hop-groups
2-
33
fpm address 127.0.0.1
44
zebra nexthop-group keep 1
5-

src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
! file: zebra.conf
55
!
66
!
7+
! Force disable next hop group support
8+
no zebra nexthop kernel enable
79
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
810
no fpm use-next-hop-groups
911
!

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
! file: zebra.conf
55
!
66
!
7+
! Force disable next hop group support
8+
no zebra nexthop kernel enable
79
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
810
no fpm use-next-hop-groups
911
!

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
! file: zebra.conf
55
!
66
!
7+
! Force disable next hop group support
8+
no zebra nexthop kernel enable
79
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
810
no fpm use-next-hop-groups
911
!

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
! file: zebra.conf
55
!
66
!
7+
! Force disable next hop group support
8+
no zebra nexthop kernel enable
79
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
810
no fpm use-next-hop-groups
911
!

src/sonic-config-engine/tests/sample_output/py2/zebra_frr_dualtor.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
! file: zebra.conf
55
!
66
!
7+
! Force disable next hop group support
8+
no zebra nexthop kernel enable
79
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
810
no fpm use-next-hop-groups
911
!

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
! file: zebra.conf
55
!
66
!
7+
! Force disable next hop group support
8+
no zebra nexthop kernel enable
79
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
810
no fpm use-next-hop-groups
911
!

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
! file: zebra.conf
55
!
66
!
7+
! Force disable next hop group support
8+
no zebra nexthop kernel enable
79
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
810
no fpm use-next-hop-groups
911
!

0 commit comments

Comments
 (0)