Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sort the system port ID generation in minigraph parser for Chassis #20075

Merged
merged 1 commit into from
Oct 3, 2024
Merged

Sort the system port ID generation in minigraph parser for Chassis #20075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/sonic-config-engine/minigraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,14 +341,13 @@ def parse_chassis_deviceinfo_intf_metadata(device_info, chassis_linecards_info,
if linecard_name is not None:
key = "%s|%s" % (linecard_name, key)
system_ports[key] = {
"system_port_id": system_port_id,
"system_port_id": 0,
"switch_id": switch_id,
"core_index": core_id,
"core_port_index": core_port_id,
"speed": intf_speed,
"num_voq": num_voq
}
system_port_id += 1

chassis_port_alias.setdefault(slot_index, {}).update(
{(intf_sonic_name, intf_speed): intf_name})
Expand All @@ -362,8 +361,14 @@ def parse_chassis_deviceinfo_intf_metadata(device_info, chassis_linecards_info,
port_default_speed.setdefault(slot_index, {}).update(
{intf_sonic_name: intf_speed})

return system_ports, chassis_port_alias, port_default_speed
# The above loop with findall("DeviceInterfaceMetadata") was not giving interfaces from minigraph
# in document order. So doing an explict sort so that system_port_ids remain same across LCs
sorted_system_ports = { key:system_ports[key] for key in sorted(system_ports.keys()) }
for k,v in sorted_system_ports.items():
v["system_port_id"] = system_port_id
system_port_id += 1

return sorted_system_ports, chassis_port_alias, port_default_speed


def parse_chassis_deviceinfo_voq_int_intfs(device_info):
Expand Down
Loading
Loading