Skip to content

Rectify buffer_port_profile(ing/egr) yang files & related tests #10334

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
AmitKaushik7 wants to merge 1 commit into from
Closed

Rectify buffer_port_profile(ing/egr) yang files & related tests #10334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 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 @@ -65,12 +65,12 @@
},
"BUFFER_PORT_INGRESS_PROFILE_LIST": {
"Ethernet9": {
"profile_list": ["ingress_lossy_profile"]
"profile_list": "ingress_lossy_profile"
}
},
"BUFFER_PORT_EGRESS_PROFILE_LIST": {
"Ethernet9": {
"profile_list": ["egress_lossless_profile", "egress_lossy_profile"]
"profile_list": "egress_lossless_profile, egress_lossy_profile"
}
},
"PORTCHANNEL": {
Expand Down
6 changes: 3 additions & 3 deletions src/sonic-yang-models/tests/yang_model_tests/tests/buffer_port_egress_profile_list.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"BUFFER_PORT_EGRESS_PROFILE_LIST_CORRECT_PROFILE_VALUE": {
"desc": "BUFFER_PORT_EGRESS_PROFILE_LIST_CORRECT_PROFILE_VALUE no failure"
},
"BUFFER_PORT_EGRESS_PROFILE_LIST_WRONG_PROFILE_VALUE": {
"desc": "BUFFER_PORT_EGRESS_PROFILE_LIST_WRONG_PROFILE_VALUE pattern failure",
"eStr": "wrong"
"BUFFER_PORT_EGRESS_PROFILE_LIST_MANDATORY_PROFILE_VALUE": {
"desc": "BUFFER_PORT_EGRESS_PROFILE_LIST_MANDATORY_PROFILE_VALUE no profile",
"eStrKey": "Mandatory"
},
"BUFFER_PORT_EGRESS_PROFILE_LIST_WRONG_PORT_VALUE": {
"desc": "BUFFER_PORT_EGRESS_PROFILE_LIST_WRONG_PORT_VALUE pattern failure",
Expand Down
6 changes: 3 additions & 3 deletions src/sonic-yang-models/tests/yang_model_tests/tests/buffer_port_ingress_profile_list.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"BUFFER_PORT_INGRESS_PROFILE_LIST_CORRECT_PROFILE_VALUE": {
"desc": "BUFFER_PORT_INGRESS_PROFILE_LIST_CORRECT_PROFILE_VALUE no failure"
},
"BUFFER_PORT_INGRESS_PROFILE_LIST_WRONG_PROFILE_VALUE": {
"desc": "BUFFER_PORT_INGRESS_PROFILE_LIST_WRONG_PROFILE_VALUE pattern failure",
"eStr": "wrong"
"BUFFER_PORT_INGRESS_PROFILE_LIST_MANDATORY_PROFILE_VALUE": {
"desc": "BUFFER_PORT_INGRESS_PROFILE_LIST_MANDATORY_PROFILE_VALUE no profile",
"eStrKey": "Mandatory"
},
"BUFFER_PORT_INGRESS_PROFILE_LIST_WRONG_PORT_VALUE": {
"desc": "BUFFER_PORT_INGRESS_PROFILE_LIST_WRONG_PORT_VALUE pattern failure",
Expand Down
9 changes: 4 additions & 5 deletions ...onic-yang-models/tests/yang_model_tests/tests_config/buffer_port_egress_profile_list.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@
"BUFFER_PORT_EGRESS_PROFILE_LIST_LIST": [
{
"port": "Ethernet4",
"profile_list": ["lossless_buffer_profile", "lossless_buffer_profile2"]
"profile_list": "lossless_buffer_profile, lossless_buffer_profile2"
}
]
}
}
},
"BUFFER_PORT_EGRESS_PROFILE_LIST_WRONG_PROFILE_VALUE": {
"BUFFER_PORT_EGRESS_PROFILE_LIST_MANDATORY_PROFILE_VALUE": {
"sonic-port:sonic-port": {
"sonic-port:PORT": {
"PORT_LIST": [
Expand Down Expand Up @@ -100,8 +100,7 @@
"sonic-buffer-port-egress-profile-list:BUFFER_PORT_EGRESS_PROFILE_LIST": {
"BUFFER_PORT_EGRESS_PROFILE_LIST_LIST": [
{
"port": "Ethernet4",
"profile_list": ["wrong"]
"port": "Ethernet4"
}
]
}
Expand Down Expand Up @@ -151,7 +150,7 @@
"BUFFER_PORT_EGRESS_PROFILE_LIST_LIST": [
{
"port": "wrong",
"profile_list": ["lossless_buffer_profile"]
"profile_list": "lossless_buffer_profile"
}
]
}
Expand Down
9 changes: 4 additions & 5 deletions ...nic-yang-models/tests/yang_model_tests/tests_config/buffer_port_ingress_profile_list.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@
"BUFFER_PORT_INGRESS_PROFILE_LIST_LIST": [
{
"port": "Ethernet4",
"profile_list": ["lossless_buffer_profile", "lossless_buffer_profile2"]
"profile_list": "lossless_buffer_profile, lossless_buffer_profile2"
}
]
}
}
},
"BUFFER_PORT_INGRESS_PROFILE_LIST_WRONG_PROFILE_VALUE": {
"BUFFER_PORT_INGRESS_PROFILE_LIST_MANDATORY_PROFILE_VALUE": {
"sonic-port:sonic-port": {
"sonic-port:PORT": {
"PORT_LIST": [
Expand Down Expand Up @@ -100,8 +100,7 @@
"sonic-buffer-port-ingress-profile-list:BUFFER_PORT_INGRESS_PROFILE_LIST": {
"BUFFER_PORT_INGRESS_PROFILE_LIST_LIST": [
{
"port": "Ethernet4",
"profile_list": ["wrong"]
"port": "Ethernet4"
}
]
}
Expand Down Expand Up @@ -151,7 +150,7 @@
"BUFFER_PORT_INGRESS_PROFILE_LIST_LIST": [
{
"port": "wrong",
"profile_list": ["lossless_buffer_profile"]
"profile_list": "lossless_buffer_profile"
}
]
}
Expand Down
7 changes: 3 additions & 4 deletions src/sonic-yang-models/yang-models/sonic-buffer-port-egress-profile-list.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,9 @@ module sonic-buffer-port-egress-profile-list {
}
}

leaf-list profile_list {
type leafref {
path "/bpf:sonic-buffer-profile/bpf:BUFFER_PROFILE/bpf:BUFFER_PROFILE_LIST/bpf:name";
}
leaf profile_list {
type string;
mandatory true;
description "a list of references to BUFFER_PROFILE_TABLE object for a port";
}

Expand Down
7 changes: 3 additions & 4 deletions src/sonic-yang-models/yang-models/sonic-buffer-port-ingress-profile-list.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,9 @@ module sonic-buffer-port-ingress-profile-list {
}
}

leaf-list profile_list {
type leafref {
path "/bpf:sonic-buffer-profile/bpf:BUFFER_PROFILE/bpf:BUFFER_PROFILE_LIST/bpf:name";
}
leaf profile_list {
type string;
mandatory true;
description "a list of references to BUFFER_PROFILE_TABLE object for a port";
}

Expand Down