Skip to content

Commit a2a9efd

Browse files
stepanblyschakstepanblyschak
committed
Revert BGP suppress FIB pending enablement
Signed-off-by: Stepan Blyschak <[email protected]>
1 parent c78f119 commit a2a9efd

File tree

28 files changed

+5
-83
lines changed

28 files changed

+5
-83
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
6666
!
6767
{% block bgp_init %}
6868
bgp log-neighbor-changes
69-
bgp suppress-fib-pending
7069
no bgp default ipv4-unicast
7170
no bgp ebgp-requires-policy
7271
{% if (DEVICE_METADATA is defined) and ('localhost' in DEVICE_METADATA) and ('subtype' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['subtype'].lower() == 'dualtor') %}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ stderr_logfile=syslog
3030
dependent_startup=true
3131

3232
[program:zebra]
33-
command=/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M fpm -M snmp --asic-offload=notify_on_offload
33+
command=/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M fpm -M snmp
3434
priority=4
3535
autostart=false
3636
autorestart=false

‎platform/vs/docker-sonic-vs/supervisord.conf.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ environment=ASAN_OPTIONS="log_path=/var/log/asan/teammgrd-asan.log{{ asan_extra_
164164
{% endif %}
165165

166166
[program:zebra]
167-
command=/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M fpm --asic-offload=notify_on_offload
167+
command=/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M fpm
168168
priority=13
169169
autostart=false
170170
autorestart=false

‎src/sonic-bgpcfgd/bgpcfgd/managers_bgp.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -304,11 +304,10 @@ def apply_op(self, cmd, vrf):
304304
:return: True if no errors, False if there are errors
305305
"""
306306
bgp_asn = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]["bgp_asn"]
307-
enable_bgp_suppress_fib_pending_cmd = 'bgp suppress-fib-pending'
308307
if vrf == 'default':
309-
cmd = ('router bgp %s\n %s\n' % (bgp_asn, enable_bgp_suppress_fib_pending_cmd)) + cmd
308+
cmd = ('router bgp %s\n' % bgp_asn) + cmd
310309
else:
311-
cmd = ('router bgp %s vrf %s\n %s\n' % (bgp_asn, vrf, enable_bgp_suppress_fib_pending_cmd)) + cmd
310+
cmd = ('router bgp %s vrf %s\n' % (bgp_asn, vrf)) + cmd
312311
self.cfg_mgr.push(cmd)
313312
return True
314313

‎src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ route-map HIDE_INTERNAL permit 20
5555
router bgp 55555
5656
!
5757
bgp log-neighbor-changes
58-
bgp suppress-fib-pending
5958
no bgp default ipv4-unicast
6059
no bgp ebgp-requires-policy
6160
!

‎src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ route-map HIDE_INTERNAL permit 10
3434
router bgp 55555
3535
!
3636
bgp log-neighbor-changes
37-
bgp suppress-fib-pending
3837
no bgp default ipv4-unicast
3938
no bgp ebgp-requires-policy
4039
!

‎src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/base.conf

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ ip prefix-list PL_LoopbackV4 permit 55.55.55.55/32
1212
router bgp 55555
1313
!
1414
bgp log-neighbor-changes
15-
bgp suppress-fib-pending
1615
no bgp default ipv4-unicast
1716
no bgp ebgp-requires-policy
1817
!

‎src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ route-map HIDE_INTERNAL permit 10
3434
router bgp 55555
3535
!
3636
bgp log-neighbor-changes
37-
bgp suppress-fib-pending
3837
no bgp default ipv4-unicast
3938
no bgp ebgp-requires-policy
4039
!

‎src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/ipv6_lo.conf

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ ipv6 prefix-list PL_LoopbackV6 permit fc00::1/128
1414
router bgp 55555
1515
!
1616
bgp log-neighbor-changes
17-
bgp suppress-fib-pending
1817
no bgp default ipv4-unicast
1918
no bgp ebgp-requires-policy
2019
!

‎src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/packet_chassis.conf

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ route-map HIDE_INTERNAL permit 10
3434
router bgp 55555
3535
!
3636
bgp log-neighbor-changes
37-
bgp suppress-fib-pending
3837
no bgp default ipv4-unicast
3938
no bgp ebgp-requires-policy
4039
!

‎src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/voq_chassis.conf

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ route-map HIDE_INTERNAL permit 10
3434
router bgp 55555
3535
!
3636
bgp log-neighbor-changes
37-
bgp suppress-fib-pending
3837
no bgp default ipv4-unicast
3938
no bgp ebgp-requires-policy
4039
!

‎src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf

-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ route-map HIDE_INTERNAL permit 10
7171
router bgp 55555
7272
!
7373
bgp log-neighbor-changes
74-
bgp suppress-fib-pending
7574
no bgp default ipv4-unicast
7675
no bgp ebgp-requires-policy
7776
!

‎src/sonic-config-engine/minigraph.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ def parse_dpg(dpg, hname):
607607
else:
608608
prefix = prefix + "/32"
609609
static_routes[prefix] = {'nexthop': ",".join(nexthop), 'ifname': ",".join(ifname), 'advertise': advertise}
610-
610+
611611
if port_nhipv4_map and port_nhipv6_map:
612612
subnet_check_ip = list(port_nhipv4_map.values())[0]
613613
for subnet_range in ip_intfs_map:
@@ -2077,10 +2077,6 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
20772077
if current_device and current_device['type'] in mgmt_device_types:
20782078
results["FLEX_COUNTER_TABLE"] = {counter: {"FLEX_COUNTER_STATUS": "disable"} for counter in mgmt_disabled_counters}
20792079

2080-
# Enable bgp-suppress-fib by default for leafrouter
2081-
if current_device and current_device['type'] in leafrouter_device_types:
2082-
results['DEVICE_METADATA']['localhost']['suppress-fib-pending'] = 'enabled'
2083-
20842080
return results
20852081

20862082
def get_tunnel_entries(tunnel_intfs, tunnel_intfs_qos_remap_config, lo_intfs, tunnel_qos_remap, mux_tunnel_name, peer_switch_ip):

‎src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.0.0/27
4242
router bgp 65100
4343
!
4444
bgp log-neighbor-changes
45-
bgp suppress-fib-pending
4645
no bgp default ipv4-unicast
4746
no bgp ebgp-requires-policy
4847
!

‎src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ route-map HIDE_INTERNAL permit 10
5353
router bgp 65100
5454
!
5555
bgp log-neighbor-changes
56-
bgp suppress-fib-pending
5756
no bgp default ipv4-unicast
5857
no bgp ebgp-requires-policy
5958
!

‎src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_dualtor.conf

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.0.0/27
4242
router bgp 65100
4343
!
4444
bgp log-neighbor-changes
45-
bgp suppress-fib-pending
4645
no bgp default ipv4-unicast
4746
no bgp ebgp-requires-policy
4847
coalesce-time 10000

‎src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ route-map HIDE_INTERNAL permit 10
5353
router bgp 65100
5454
!
5555
bgp log-neighbor-changes
56-
bgp suppress-fib-pending
5756
no bgp default ipv4-unicast
5857
no bgp ebgp-requires-policy
5958
!

‎src/sonic-config-engine/tests/sample_output/py2/frr.conf

-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.0.0/27
6262
router bgp 65100
6363
!
6464
bgp log-neighbor-changes
65-
bgp suppress-fib-pending
6665
no bgp default ipv4-unicast
6766
no bgp ebgp-requires-policy
6867
!

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

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ ip prefix-list PL_LoopbackV4 permit 4.0.0.0/32
5858
router bgp 4000
5959
!
6060
bgp log-neighbor-changes
61-
bgp suppress-fib-pending
6261
no bgp default ipv4-unicast
6362
no bgp ebgp-requires-policy
6463
!

‎src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.200.0/27
4242
router bgp 65100
4343
!
4444
bgp log-neighbor-changes
45-
bgp suppress-fib-pending
4645
no bgp default ipv4-unicast
4746
no bgp ebgp-requires-policy
4847
!

‎src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ route-map HIDE_INTERNAL permit 10
5353
router bgp 65100
5454
!
5555
bgp log-neighbor-changes
56-
bgp suppress-fib-pending
5756
no bgp default ipv4-unicast
5857
no bgp ebgp-requires-policy
5958
!

‎src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_dualtor.conf

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.200.0/27
4242
router bgp 65100
4343
!
4444
bgp log-neighbor-changes
45-
bgp suppress-fib-pending
4645
no bgp default ipv4-unicast
4746
no bgp ebgp-requires-policy
4847
coalesce-time 10000

‎src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ route-map HIDE_INTERNAL permit 10
5353
router bgp 65100
5454
!
5555
bgp log-neighbor-changes
56-
bgp suppress-fib-pending
5756
no bgp default ipv4-unicast
5857
no bgp ebgp-requires-policy
5958
!

‎src/sonic-config-engine/tests/sample_output/py3/frr.conf

-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.200.0/27
6262
router bgp 65100
6363
!
6464
bgp log-neighbor-changes
65-
bgp suppress-fib-pending
6665
no bgp default ipv4-unicast
6766
no bgp ebgp-requires-policy
6867
!

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

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ ip prefix-list PL_LoopbackV4 permit 4.0.0.0/32
5858
router bgp 4000
5959
!
6060
bgp log-neighbor-changes
61-
bgp suppress-fib-pending
6261
no bgp default ipv4-unicast
6362
no bgp ebgp-requires-policy
6463
!

‎src/sonic-yang-models/tests/yang_model_tests/tests/device_metadata.json

-10
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,6 @@
126126
"DEVICE_METADATA_ADVERTISE_LO_PREFIX_AS_128": {
127127
"desc": "Verifying advertising lo prefix as /128."
128128
},
129-
"DEVICE_METADATA_SUPPRESS_PENDING_FIB_ENABLED": {
130-
"desc": "Enable bgp-suppress-fib-pending"
131-
},
132-
"DEVICE_METADATA_SUPPRESS_PENDING_FIB_DISABLED": {
133-
"desc": "Disable bgp-suppress-fib-pending"
134-
},
135-
"DEVICE_METADATA_SUPPRESS_PENDING_FIB_ENABLED_SYNCHRONOUS_MODE_DISABLED": {
136-
"desc": "Enable bgp-suppress-fib-pending when synchronous mode is disabled",
137-
"eStr": ["ASIC synchronous mode must be enabled in order to enable suppress FIB pending feature"]
138-
},
139129
"DEVICE_METADATA_VALID_RACK_MGMT_MAP": {
140130
"desc": "Verifying rack_mgmt_map configuration."
141131
},

‎src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json

-30
Original file line numberDiff line numberDiff line change
@@ -333,36 +333,6 @@
333333
}
334334
}
335335
},
336-
"DEVICE_METADATA_SUPPRESS_PENDING_FIB_ENABLED": {
337-
"sonic-device_metadata:sonic-device_metadata": {
338-
"sonic-device_metadata:DEVICE_METADATA": {
339-
"sonic-device_metadata:localhost": {
340-
"synchronous_mode": "enable",
341-
"suppress-fib-pending": "enabled"
342-
}
343-
}
344-
}
345-
},
346-
"DEVICE_METADATA_SUPPRESS_PENDING_FIB_DISABLED": {
347-
"sonic-device_metadata:sonic-device_metadata": {
348-
"sonic-device_metadata:DEVICE_METADATA": {
349-
"sonic-device_metadata:localhost": {
350-
"synchronous_mode": "disable",
351-
"suppress-fib-pending": "disabled"
352-
}
353-
}
354-
}
355-
},
356-
"DEVICE_METADATA_SUPPRESS_PENDING_FIB_ENABLED_SYNCHRONOUS_MODE_DISABLED": {
357-
"sonic-device_metadata:sonic-device_metadata": {
358-
"sonic-device_metadata:DEVICE_METADATA": {
359-
"sonic-device_metadata:localhost": {
360-
"synchronous_mode": "disable",
361-
"suppress-fib-pending": "enabled"
362-
}
363-
}
364-
}
365-
},
366336
"DEVICE_METADATA_VALID_RACK_MGMT_MAP": {
367337
"sonic-device_metadata:sonic-device_metadata": {
368338
"sonic-device_metadata:DEVICE_METADATA": {

‎src/sonic-yang-models/yang-models/sonic-device_metadata.yang

-12
Original file line numberDiff line numberDiff line change
@@ -205,18 +205,6 @@ module sonic-device_metadata {
205205
By default SONiC advertises /128 subnet prefix in Loopback0 as /64 subnet route";
206206
}
207207

208-
leaf suppress-fib-pending {
209-
description "Enable BGP suppress FIB pending feature. BGP will wait for route FIB installation before announcing routes";
210-
type enumeration {
211-
enum enabled;
212-
enum disabled;
213-
}
214-
default disabled;
215-
216-
must "((current() = 'disabled') or (current() = 'enabled' and ../synchronous_mode = 'enable'))" {
217-
error-message "ASIC synchronous mode must be enabled in order to enable suppress FIB pending feature";
218-
}
219-
}
220208
leaf rack_mgmt_map {
221209
type string {
222210
length 0..128 {

0 commit comments

Comments
 (0)