Skip to content

[DT2] Support LowerSpineRouter as subtype #22465

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

Closed
bingwang-ms wants to merge 4 commits into from
Closed

[DT2] Support LowerSpineRouter as subtype #22465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a610170
Support LowerSpineRouter as subtype
bingwang-ms Apr 29, 2025
b541098
Update simple-sample-graph-lt2.xml
bingwang-ms May 9, 2025
8ecdfd2
Read subtype from minigraph
bingwang-ms May 15, 2025
7f3170b
SubType -> SubRole
bingwang-ms May 16, 2025
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
23 changes: 16 additions & 7 deletions src/sonic-config-engine/minigraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1485,6 +1485,7 @@ def parse_meta(meta, hname):
downstream_subrole = None
switch_id = None
switch_type = None
switch_subtype = None
max_cores = None
kube_data = {}
macsec_profile = {}
Expand Down Expand Up @@ -1527,6 +1528,8 @@ def parse_meta(meta, hname):
switch_id = value
elif name == "SwitchType":
switch_type = value
elif name == "SubRole":
switch_subtype = value
elif name == "MaxCores":
max_cores = value
elif name == "KubernetesEnabled":
Expand All @@ -1543,7 +1546,7 @@ def parse_meta(meta, hname):
qos_profile = value
elif name == "RackMgmtMap":
rack_mgmt_map = value
return syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, switch_id, switch_type, max_cores, kube_data, macsec_profile, downstream_redundancy_types, redundancy_type, qos_profile, rack_mgmt_map
return syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, switch_id, switch_type, switch_subtype, max_cores, kube_data, macsec_profile, downstream_redundancy_types, redundancy_type, qos_profile, rack_mgmt_map


def parse_linkmeta(meta, hname):
Expand Down Expand Up @@ -2025,6 +2028,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
cloudtype = None
switch_id = None
switch_type = None
switch_subtype = None
max_cores = None
hostname = None
linkmetas = {}
Expand Down Expand Up @@ -2091,7 +2095,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
elif child.tag == str(QName(ns, "UngDec")):
(u_neighbors, u_devices, _, _, _, _, _, _) = parse_png(child, hostname, None)
elif child.tag == str(QName(ns, "MetadataDeclaration")):
(syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, switch_id, switch_type, max_cores, kube_data, macsec_profile, downstream_redundancy_types, redundancy_type, qos_profile, rack_mgmt_map) = parse_meta(child, hostname)
(syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, switch_id, switch_type, switch_subtype, max_cores, kube_data, macsec_profile, downstream_redundancy_types, redundancy_type, qos_profile, rack_mgmt_map) = parse_meta(child, hostname)
elif child.tag == str(QName(ns, "LinkMetadataDeclaration")):
linkmetas = parse_linkmeta(child, hostname)
elif child.tag == str(QName(ns, "DeviceInfos")):
Expand Down Expand Up @@ -2192,12 +2196,17 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw

results['DEVICE_METADATA']['localhost']['peer_switch'] = list(results['PEER_SWITCH'].keys())[0]
elif results['DEVICE_METADATA']['localhost']['type'] == 'SpineRouter':
if macsec_enabled == 'True':
results['DEVICE_METADATA']['localhost']['subtype'] = 'UpstreamLC'
elif macsec_enabled == 'False':
results['DEVICE_METADATA']['localhost']['subtype'] = 'DownstreamLC'
# If switch_subtype is set, then use the value from the minigraph
# Only limit this change to SpineRouter
if switch_subtype is not None:
results['DEVICE_METADATA']['localhost']['subtype'] = switch_subtype
else:
results['DEVICE_METADATA']['localhost']['subtype'] = 'Supervisor'
if macsec_enabled == 'True':
results['DEVICE_METADATA']['localhost']['subtype'] = 'UpstreamLC'
elif macsec_enabled == 'False':
results['DEVICE_METADATA']['localhost']['subtype'] = 'DownstreamLC'
else:
results['DEVICE_METADATA']['localhost']['subtype'] = 'Supervisor'

# Enable tunnel_qos_remap if downstream_redundancy_types(T1) or redundancy_type(T0) = Gemini/Libra
enable_tunnel_qos_map = False
Expand Down
Loading
Loading