[202311] Revert BGP suppress fib commands

Author: dgsudharsan

dockers/docker-fpm-frr/docker_init.sh

@@ -41,20 +41,6 @@ update_default_gw()
    fi
 }
 
-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
-    }
-}
-
 if [[ ! -z "$NAMESPACE_ID" ]]; then
    update_default_gw 4
    update_default_gw 6
@@ -83,11 +69,9 @@ if [ -z "$CONFIG_TYPE" ] || [ "$CONFIG_TYPE" == "separated" ]; then
 elif [ "$CONFIG_TYPE" == "split" ]; then
     echo "no service integrated-vtysh-config" > /etc/frr/vtysh.conf
     rm -f /etc/frr/frr.conf
-    write_default_zebra_config /etc/frr/zebra.conf
 elif [ "$CONFIG_TYPE" == "split-unified" ]; then
     echo "service integrated-vtysh-config" > /etc/frr/vtysh.conf
     rm -f /etc/frr/bgpd.conf /etc/frr/zebra.conf /etc/frr/staticd.conf
-    write_default_zebra_config /etc/frr/frr.conf
 elif [ "$CONFIG_TYPE" == "unified" ]; then
     CFGGEN_PARAMS=" \
         -d \

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" %}

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
 !

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
 !

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
 !

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
 !

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
 !

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
 !

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
 !

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
 !

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
 !