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

[yang]: Update DEVICE_METADATA yang models to support 'sub_role' #10161

Merged
merged 3 commits into from
Mar 10, 2022
Merged

[yang]: Update DEVICE_METADATA yang models to support 'sub_role' #10161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4528ae7
[yang]: Update DEVICE_METADATA yang models to support 'sub_role'
wen587 Mar 7, 2022
db0776b
Add description for sub_role
wen587 Mar 8, 2022
5704fa7
typo
wen587 Mar 9, 2022
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
3 changes: 2 additions & 1 deletion src/sonic-yang-models/tests/files/sample_config_db.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,8 @@
"asic_name": "Asic0",
"switch_id": "2",
"switch_type": "voq",
"max_cores": "8"
"max_cores": "8",
"sub_role": "FrondEnd"
}
},
"VLAN": {
Expand Down
5 changes: 4 additions & 1 deletion 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 @@ -100,6 +100,9 @@
},
"DEVICE_METADATA_CORRECT_VOQ_CONFIG": {
"desc": "Verifying VOQ configuration."
}
},
"DEVICE_METADATA_VALID_SUB_ROLE_CONFIG": {
"desc": "Verifying valid sub_role configuration."
}

}
9 changes: 9 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 @@ -274,5 +274,14 @@
}
}
}
},
"DEVICE_METADATA_VALID_SUB_ROLE_CONFIG": {
"sonic-device_metadata:sonic-device_metadata": {
"sonic-device_metadata:DEVICE_METADATA": {
"sonic-device_metadata:localhost": {
"sub_role": "FrontEnd"
}
}
}
}
}
5 changes: 5 additions & 0 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 @@ -127,6 +127,11 @@ module sonic-device_metadata {
type string;
}

leaf sub_role {
type string;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add description.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @venkatmahalingam Could you provide a description message?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could use the description provided here: https://github.com/Azure/SONiC/blob/master/doc/multi_asic/SONiC_multi_asic_hld.md#2432-device_metadata

description "sub_role indicates if ASIC is FrondEnd or BackEnd.";
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the field take FrontEnd or BackEnd alone? If yes should we restrict it with pattern?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have only seen one example with 'FrondEnd'. I also checked design doc. Seems 'Backend' and 'Frontend' are valid. https://github.com/Azure/SONiC/blob/master/doc/multi_asic/SONiC_multi_asic_hld.md#2432-device_metadata

I am not sure if I should restrict it with the pattern 'Front[Ee]nd|Back[Ee]nd' or simply a string instead.

}

leaf downstream_subrole {
type string;
}
Expand Down