Revert "[202412] backport [frr]: Force disable next hop group support " (sonic-net#1792)

r12f · web-flow · commit 4d33d8f12706 · 2025-12-15T13:46:25.000-08:00
Reverts Azure/sonic-buildimage-msft#1739
diff --git a/dockers/docker-fpm-frr/docker_init.sh b/dockers/docker-fpm-frr/docker_init.sh
@@ -49,10 +49,6 @@ write_default_zebra_config()
         echo "no fpm use-next-hop-groups" >> $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
diff --git a/dockers/docker-fpm-frr/frr/zebra/zebra.conf.j2 b/dockers/docker-fpm-frr/frr/zebra/zebra.conf.j2
@@ -7,8 +7,6 @@
 {% endblock banner %}
 !
 {% block fpm %}
-! Force disable next hop group support
-no zebra nexthop kernel enable
 {% if ( ('localhost' in DEVICE_METADATA) and ('nexthop_group' in  DEVICE_METADATA['localhost']) and
         (DEVICE_METADATA['localhost']['nexthop_group'] == 'enabled') ) %}
 ! enable next hop group support
diff --git a/platform/vs/docker-sonic-vs/frr/zebra.conf b/platform/vs/docker-sonic-vs/frr/zebra.conf
@@ -1,4 +1,5 @@
-no zebra nexthop kernel enable
 no fpm use-next-hop-groups
+
 fpm address 127.0.0.1
 zebra nexthop-group keep 1
+
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf
@@ -4,8 +4,6 @@
 ! 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
 no fpm use-next-hop-groups
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-vni-zebra.conf b/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-vni-zebra.conf
@@ -4,8 +4,6 @@
 ! 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
 no fpm use-next-hop-groups
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-zebra.conf b/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-zebra.conf
@@ -4,8 +4,6 @@
 ! 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
 no fpm use-next-hop-groups
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/zebra_frr.conf b/src/sonic-config-engine/tests/sample_output/py2/zebra_frr.conf
@@ -4,8 +4,6 @@
 ! 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
 no fpm use-next-hop-groups
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/zebra_frr_dualtor.conf b/src/sonic-config-engine/tests/sample_output/py2/zebra_frr_dualtor.conf
@@ -4,8 +4,6 @@
 ! 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
 no fpm use-next-hop-groups
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-vni-zebra.conf b/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-vni-zebra.conf
@@ -4,8 +4,6 @@
 ! 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
 no fpm use-next-hop-groups
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-zebra.conf b/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-zebra.conf
@@ -4,8 +4,6 @@
 ! 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
 no fpm use-next-hop-groups
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/zebra_frr.conf b/src/sonic-config-engine/tests/sample_output/py3/zebra_frr.conf
@@ -4,8 +4,6 @@
 ! 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
 no fpm use-next-hop-groups
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/zebra_frr_dualtor.conf b/src/sonic-config-engine/tests/sample_output/py3/zebra_frr_dualtor.conf
@@ -4,8 +4,6 @@
 ! 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
 no fpm use-next-hop-groups
 !

Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,6 @@ write_default_zebra_config()`
`49`	`49`	`echo "no fpm use-next-hop-groups" >> $FILE_NAME`
`50`	`50`	`echo "fpm address 127.0.0.1" >> $FILE_NAME`
`51`	`51`	`}`
`52`		`-`
`53`		`- grep -q '^no zebra nexthop kernel enable' $FILE_NAME \|\| {`
`54`		`- echo "no zebra nexthop kernel enable" >> $FILE_NAME`
`55`		`- }`
`56`	`52`	`}`
`57`	`53`
`58`	`54`	`if [[ ! -z "$NAMESPACE_ID" ]]; then`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`	`{% endblock banner %}`
`8`	`8`	`!`
`9`	`9`	`{% block fpm %}`
`10`		`-! Force disable next hop group support`
`11`		`-no zebra nexthop kernel enable`
`12`	`10`	`{% if ( ('localhost' in DEVICE_METADATA) and ('nexthop_group' in DEVICE_METADATA['localhost']) and`
`13`	`11`	`(DEVICE_METADATA['localhost']['nexthop_group'] == 'enabled') ) %}`
`14`	`12`	`! enable next hop group support`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@`
`4`	`4`	`! file: zebra.conf`
`5`	`5`	`!`
`6`	`6`	`!`
`7`		`-! Force disable next hop group support`
`8`		`-no zebra nexthop kernel enable`
`9`	`7`	`! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages`
`10`	`8`	`no fpm use-next-hop-groups`
`11`	`9`	`!`