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

[yang-models] Add chassis fields to device_metadata (#10006)

Browse Source 
This change is adding asic_name, switch_id, switch_type and max_cores to sonic-device_metadata.yang
This should fix issue #9575

Co-authored-by: Maxime Lorrillere <mlorrillere@arista.com>
This commit is contained in:
Maxime Lorrillere 2022-03-02 00:10:04 -08:00 committed by GitHub
parent 3bb87c03a1
commit 7891760fd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 62 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sonic-yang-models/tests/files/sample_config_db.json
View File

@ -293,7 +293,11 @@
"hwsku": "Stone",
"buffer_model": "dynamic",
"cloudtype": "Public",
"region": "usfoo"
"region": "usfoo",
"asic_name": "Asic0",
"switch_id": "2",
"switch_type": "voq",
"max_cores": "8"
}
},
"VLAN": {

9
src/sonic-yang-models/tests/yang_model_tests/tests/device_metadata.json
View File

@ -93,6 +93,13 @@
"DEVICE_METADATA_INVALID_STORAGE_DEVICE": {
"desc": "Verifying invalid storage device value",
"eStrKey": "InvalidValue"
}
},
"DEVICE_METADATA_INCORRECT_VOQ_CONFIG": {
"desc": "Verifying incorrect switch_type configuration.",
"eStrKey": "Pattern"
},
"DEVICE_METADATA_CORRECT_VOQ_CONFIG": {
"desc": "Verifying VOQ configuration."
}
}

24
src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json
View File

@ -250,5 +250,29 @@
}
}
}
},
"DEVICE_METADATA_INCORRECT_VOQ_CONFIG": {
"sonic-device_metadata:sonic-device_metadata": {
"sonic-device_metadata:DEVICE_METADATA": {
"sonic-device_metadata:localhost": {
"asic_name": "Asic0",
"switch_id": "2",
"switch_type": "incorrect_pattern",
"max_cores": "8"
}
}
}
},
"DEVICE_METADATA_CORRECT_VOQ_CONFIG": {
"sonic-device_metadata:sonic-device_metadata": {
"sonic-device_metadata:DEVICE_METADATA": {
"sonic-device_metadata:localhost": {
"asic_name": "Asic0",
"switch_id": "2",
"switch_type": "voq",
"max_cores": "8"
}
}
}
}
}

25
src/sonic-yang-models/yang-models/sonic-device_metadata.yang
View File

@ -153,6 +153,31 @@ module sonic-device_metadata {
leaf storage_device {
type boolean;
}
leaf asic_name {
type string;
description "On a VoQ switch, the ASIC Name is used as a qualifier in global
database keys to create a system wide unique key.";
}
leaf switch_id {
type uint16;
description "Vendor specific switch ID. Identifies switch chip.";
}
leaf switch_type {
type string {
pattern "chassis-packet|fabric|npu|voq";
}
description "Type of switch. Default is NPU, on a VOQ switch voq is used for a regular
switching device while fabric is used for a fabric device.
chassis-packet is used for chassis in packet mode.";
}
leaf max_cores {
type uint8;
description "Maximum number of cores in a VoQ Switch (chassis).";
}
}
/* end of container localhost */
}