[202311][zebra] remove dplane_fpm_nl config from zebra.conf

Signed-off-by: Stepan Blyschak <[email protected]>
stepanblyschak · Jul 1, 2024 · d027145 · d027145
1 parent 3bab55c
commit d027145
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 45 deletions.
diff --git a/dockers/docker-fpm-frr/docker_init.sh b/dockers/docker-fpm-frr/docker_init.sh
@@ -45,11 +45,6 @@ write_default_zebra_config()
 {
     FILE_NAME=${1}
 
-    grep -q '^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
-    }
-
     grep -q '^no zebra nexthop kernel enable' $FILE_NAME || {
         echo "no zebra nexthop kernel enable" >> $FILE_NAME
     }

diff --git a/dockers/docker-fpm-frr/frr/zebra/zebra.conf.j2 b/dockers/docker-fpm-frr/frr/zebra/zebra.conf.j2
@@ -9,10 +9,6 @@
 {% 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
-no fpm use-next-hop-groups
-!
-fpm address 127.0.0.1
 {% endblock fpm %}
 !
 {% include "common/daemons.common.conf.j2" %}

diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf
@@ -6,10 +6,6 @@
 !
 ! 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
-!
-fpm address 127.0.0.1
 !
 ! template: common/daemons.common.conf.j2
 !

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
@@ -6,10 +6,6 @@
 !
 ! 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
-!
-fpm address 127.0.0.1
 !
 ! template: common/daemons.common.conf.j2
 !

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
@@ -6,10 +6,6 @@
 !
 ! 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
-!
-fpm address 127.0.0.1
 !
 ! template: common/daemons.common.conf.j2
 !

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
@@ -6,10 +6,6 @@
 !
 ! 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
-!
-fpm address 127.0.0.1
 !
 ! template: common/daemons.common.conf.j2
 !

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
@@ -6,10 +6,6 @@
 !
 ! 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
-!
-fpm address 127.0.0.1
 !
 ! template: common/daemons.common.conf.j2
 !

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
@@ -6,10 +6,6 @@
 !
 ! 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
-!
-fpm address 127.0.0.1
 !
 ! template: common/daemons.common.conf.j2
 !

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
@@ -6,10 +6,6 @@
 !
 ! 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
-!
-fpm address 127.0.0.1
 !
 ! template: common/daemons.common.conf.j2
 !

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
@@ -6,10 +6,6 @@
 !
 ! 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
-!
-fpm address 127.0.0.1
 !
 ! template: common/daemons.common.conf.j2
 !

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
@@ -6,10 +6,6 @@
 !
 ! 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
-!
-fpm address 127.0.0.1
 !
 ! template: common/daemons.common.conf.j2
 !