Skip to content

Yang model changes for additional SpineRouter roles #22285

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

Merged
qiluo-msft merged 6 commits into from
Apr 17, 2025
Merged

Yang model changes for additional SpineRouter roles #22285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d0c3ed9
Yang model changes for disagg chassis
tjchadaga Apr 3, 2025
fbcd75b
Fix typo
tjchadaga Apr 9, 2025
85d89fb
Merge branch 'master' of https://github.com/tjchadaga/sonic-buildimag…
tjchadaga Apr 16, 2025
4250c44
Modify subtype
tjchadaga Apr 16, 2025
0c46241
Merge branch 'master' of https://github.com/tjchadaga/sonic-buildimag…
tjchadaga Apr 16, 2025
fdbd94c
Modify tests for subtype change
tjchadaga Apr 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
9 changes: 9 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests/device_metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@
"DEVICE_METADATA_TYPE_CORRECT_PATTERN": {
"desc": "DEVICE_METADATA correct value for Type field"
},
"DEVICE_METADATA_TYPE_UPPER_SPINEROUTER_PATTERN": {
"desc": "DEVICE_METADATA value as UpperSpineRouter for Type field"
},
"DEVICE_METADATA_TYPE_FABRIC_SPINEROUTER_PATTERN": {
"desc": "DEVICE_METADATA value as FabricSpineRouter for Type field"
},
"DEVICE_METADATA_TYPE_BMC_MGMT_TOR_PATTERN": {
"desc": "DEVICE_METADATA value as BmcMgmtToRRouter for Type field"
},
Expand Down Expand Up @@ -124,6 +130,9 @@
"DEVICE_METADATA_VALID_SUBTYPE3": {
"desc": "Verifying valid subtype value downstreamLC"
},
"DEVICE_METADATA_VALID_SUBTYPE4": {
"desc": "Verifying valid subtype value LowerSpineRouter"
},
"DEVICE_METADATA_INVALID_SUBTYPE": {
"desc": "Verifying invalid subtype value",
"eStrKey": "Pattern"
Expand Down
39 changes: 39 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,36 @@
}
}
},
"DEVICE_METADATA_TYPE_SPINEROUTER_PATTERN": {
"sonic-device_metadata:sonic-device_metadata": {
"sonic-device_metadata:DEVICE_METADATA": {
"sonic-device_metadata:localhost": {
"bgp_asn": "65002",
"type": "SpineRouter"
}
}
}
},
"DEVICE_METADATA_TYPE_UPPER_SPINEROUTER_PATTERN": {
"sonic-device_metadata:sonic-device_metadata": {
"sonic-device_metadata:DEVICE_METADATA": {
"sonic-device_metadata:localhost": {
"bgp_asn": "65002",
"type": "UpperSpineRouter"
}
}
}
},
"DEVICE_METADATA_TYPE_FABRIC_SPINEROUTER_PATTERN": {
"sonic-device_metadata:sonic-device_metadata": {
"sonic-device_metadata:DEVICE_METADATA": {
"sonic-device_metadata:localhost": {
"bgp_asn": "65002",
"type": "FabricSpineRouter"
}
}
}
},
"DEVICE_METADATA_TYPE_BMC_MGMT_TOR_PATTERN": {
"sonic-device_metadata:sonic-device_metadata": {
"sonic-device_metadata:DEVICE_METADATA": {
Expand Down Expand Up @@ -351,6 +381,15 @@
}
}
},
"DEVICE_METADATA_VALID_SUBTYPE4": {
"sonic-device_metadata:sonic-device_metadata": {
"sonic-device_metadata:DEVICE_METADATA": {
"sonic-device_metadata:localhost": {
"subtype": "LowerSpineRouter"
}
}
}
},
"DEVICE_METADATA_INVALID_SUBTYPE": {
"sonic-device_metadata:sonic-device_metadata": {
"sonic-device_metadata:DEVICE_METADATA": {
Expand Down
6 changes: 3 additions & 3 deletions src/sonic-yang-models/yang-models/sonic-device_metadata.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ module sonic-device_metadata {

leaf type {
type string {
length 1..255;
pattern "ToRRouter|LeafRouter|SpineChassisFrontendRouter|ChassisBackendRouter|ASIC|MgmtToRRouter|MgmtLeafRouter|MgmtSpineRouter|MgmtAccessRouter|SpineRouter|BackEndToRRouter|BackEndLeafRouter|EPMS|MgmtTsToR|BmcMgmtToRRouter|SonicHost|SmartSwitchDPU|not-provisioned";
length 1..255;
pattern "ToRRouter|LeafRouter|SpineChassisFrontendRouter|ChassisBackendRouter|ASIC|MgmtToRRouter|MgmtLeafRouter|MgmtSpineRouter|MgmtAccessRouter|SpineRouter|UpperSpineRouter|FabricSpineRouter|BackEndToRRouter|BackEndLeafRouter|EPMS|MgmtTsToR|BmcMgmtToRRouter|SonicHost|SmartSwitchDPU|not-provisioned";
}
}

Expand Down Expand Up @@ -169,7 +169,7 @@ module sonic-device_metadata {

leaf subtype {
type string {
pattern "DualToR|SmartSwitch|Supervisor|UpstreamLC|DownstreamLC";
pattern "DualToR|SmartSwitch|Supervisor|UpstreamLC|DownstreamLC|LowerSpineRouter";
}
}

Expand Down
Loading