[bgp-suppress-fib-pending] Implement BGP suppress FIB pending feature

dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2

@@ -11,7 +11,7 @@
 ip prefix-list PL_LoopbackV4 permit {{ get_ipv4_loopback_address(LOOPBACK_INTERFACE, "Loopback0") | ip }}/32
 !
 {% if get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback0") != 'None' %}
-{% if ( ('localhost' in DEVICE_METADATA) and ('bgp_adv_lo_prefix_as_128' in  DEVICE_METADATA['localhost']) and 
+{% if ( ('localhost' in DEVICE_METADATA) and ('bgp_adv_lo_prefix_as_128' in  DEVICE_METADATA['localhost']) and
         (DEVICE_METADATA['localhost']['bgp_adv_lo_prefix_as_128'] == 'true') ) %}
 ipv6 prefix-list PL_LoopbackV6 permit {{ get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback0") | ip_network }}/128
 {% else %}
@@ -77,6 +77,9 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
   bgp graceful-restart select-defer-time {{ constants.bgp.graceful_restart.select_defer_time | default(45) }}
+{% if DEVICE_METADATA['localhost']['bgp-suppress-fib-pending'] == 'enabled' -%}
+  bgp suppress-fib-pending
+{% endif -%}
 {% endif %}
 !
 {# set router-id #}
@@ -94,7 +97,7 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
 !
 {% if get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback0") != 'None' %}
   address-family ipv6
-{% if ( ('localhost' in DEVICE_METADATA) and ('bgp_adv_lo_prefix_as_128' in  DEVICE_METADATA['localhost']) and 
+{% if ( ('localhost' in DEVICE_METADATA) and ('bgp_adv_lo_prefix_as_128' in  DEVICE_METADATA['localhost']) and
         (DEVICE_METADATA['localhost']['bgp_adv_lo_prefix_as_128'] == 'true') ) %}
     network {{ get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback0") | ip }}/128
 {% else %}

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

@@ -30,7 +30,10 @@ stderr_logfile=syslog
 dependent_startup=true
 
 [program:zebra]
-command=/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M fpm -M snmp
+{% if DEVICE_METADATA['localhost']['bgp-suppress-fib-pending'] == 'enabled' -%}
+{% set zebra_extra_arguments = "--asic-offload=notify_on_offload" %}
+{% endif -%}
+command=/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M dplane_fpm_nl -M snmp {{ zebra_extra_arguments }}
 priority=4
 autostart=false
 autorestart=false

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

@@ -6,6 +6,13 @@
 !
 {% endblock banner %}
 !
+{% block fpm %}
+! 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" %}
 !
 {% include "zebra.interfaces.conf.j2" %}

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

@@ -4,6 +4,11 @@
 ! file: zebra.conf
 !
 !
+! 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
 !
 hostname SpineFront01

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

@@ -4,6 +4,11 @@
 ! file: zebra.conf
 !
 !
+! 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
 !
 hostname SpineFront01

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

@@ -4,6 +4,11 @@
 ! file: zebra.conf
 !
 !
+! 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
 !
 hostname switch-t0