Skip to content

Improve GNMI_CLIENT_CERT table to support multiple roles. #21849

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
merged 11 commits into from
Apr 28, 2025
Merged

Improve GNMI_CLIENT_CERT table to support multiple roles. #21849

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d6207c2
Update sonic-gnmi.yang
liuh-80 Feb 25, 2025
937740a
Update sample_config_db.json
liuh-80 Feb 25, 2025
46e151a
Update gnmi.json
liuh-80 Feb 25, 2025
f5abe50
Change GNMI_CLIENT_CERT role from RO to RW
liuh-80 Feb 25, 2025
02b1383
Remove mandatory constraint from role leaf-list
liuh-80 Feb 25, 2025
51be7f5
Add min-elements constraint to role leaf-list
liuh-80 Feb 25, 2025
8c2cc25
Update gnmi.json
liuh-80 Feb 25, 2025
b570d80
Update min-elements description and error key
liuh-80 Feb 25, 2025
fcfff8d
Merge remote-tracking branch 'origin' into dev/liuh/gnmi_multiple_role
liuh-80 Apr 5, 2025
d8508b0
Update sonic-gnmi.yang
liuh-80 Apr 22, 2025
5dda427
Update sample_config_db.json
liuh-80 Apr 28, 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
8 changes: 6 additions & 2 deletions 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 @@ -1414,10 +1414,14 @@
},
"GNMI_CLIENT_CERT": {
"testcert1": {
"role": "RW"
"role": [
"RW"
Copy link
Collaborator

Choose a reason for hiding this comment

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

  	 [](http://example.com/codeflow?start=0&length=3)

Please fix mixing tab and space.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

]
},
"testcert2": {
"role": "RO"
"role": [
"RO"
Copy link
Collaborator

@qiluo-msft qiluo-msft Apr 28, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

  	 [](http://example.com/codeflow?start=0&length=3)

The same. #Closed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

]
}
},
"TUNNEL": {
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-yang-models/tests/yang_model_tests/tests/gnmi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"GNMI_CLIENT_CERT_LIST_TABLE_WITH_MISSING_ROLE": {
"desc": "CLIENT_CERT_LIST_TABLE_WITH_MISSING_ROLE failure.",
"eStrKey": "Mandatory"
"eStrKey": "MinElements"
},
"GNMI_CLIENT_CERT_LIST_TABLE_WITH_VALID_CONFIG": {
"desc": "TABLE WITH VALID CONFIG."
Expand Down
8 changes: 6 additions & 2 deletions src/sonic-yang-models/tests/yang_model_tests/tests_config/gnmi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,15 @@
"GNMI_CLIENT_CERT_LIST": [
{
"cert_cname": "testcert1",
"role": "RW"
"role": [
"RW"
]
},
{
"cert_cname": "testcert2",
"role": "RO"
"role": [
"RO"
]
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions src/sonic-yang-models/yang-models/sonic-gnmi.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ module sonic-gnmi {
"client cert common name";
}

leaf role {
leaf-list role {
type string;
mandatory true;
min-elements 1;
description
"role of client cert common name";
}
Expand Down
Loading