matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cherry pick to 202305 - Enable fib suppress for leafrouter by default #17101

Browse Source 
Why I did it
Cherry pick #17072

Work item tracking
Microsoft ADO (25564723):
How I did it
How to verify it
This commit is contained in:
StormLiangMS 2023-11-06 23:05:31 +08:00 committed by GitHub
parent 7117fed404
commit 0e5bac9821
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sonic-config-engine/minigraph.py
View File

@ -40,6 +40,8 @@ chassis_backend_role = 'ChassisBackendRouter'
backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter'] backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter']
console_device_types = ['MgmtTsToR'] console_device_types = ['MgmtTsToR']
dhcp_server_enabled_device_types = ['BmcMgmtToRRouter'] dhcp_server_enabled_device_types = ['BmcMgmtToRRouter']
leafrouter_device_types = ['LeafRouter']
VLAN_SUB_INTERFACE_SEPARATOR = '.' VLAN_SUB_INTERFACE_SEPARATOR = '.'
VLAN_SUB_INTERFACE_VLAN_ID = '10' VLAN_SUB_INTERFACE_VLAN_ID = '10'
@ -2067,6 +2069,10 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
if current_device and current_device['type'] in dhcp_server_enabled_device_types: if current_device and current_device['type'] in dhcp_server_enabled_device_types:
results['DEVICE_METADATA']['localhost']['dhcp_server'] = 'enabled' results['DEVICE_METADATA']['localhost']['dhcp_server'] = 'enabled'
# Enable bgp-suppress-fib by default for leafrouter
if current_device and current_device['type'] in leafrouter_device_types:
results['DEVICE_METADATA']['localhost']['suppress-fib-pending'] = 'enabled'
return results return results
def get_tunnel_entries(tunnel_intfs, tunnel_intfs_qos_remap_config, lo_intfs, tunnel_qos_remap, mux_tunnel_name, peer_switch_ip): def get_tunnel_entries(tunnel_intfs, tunnel_intfs_qos_remap_config, lo_intfs, tunnel_qos_remap, mux_tunnel_name, peer_switch_ip):