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

Allow NULL Buffer Profile in buffer pg/queue yang files for Dynamic B… (#10353)

Browse Source 
Why I did it
To address #10342 (Yang validation fails when Buffer profiles are configured with "NULL" values)
This commit is contained in:
AmitKaushik7 2022-03-31 22:52:03 +05:30 committed by Judy Joseph
parent b82f95cd6e
commit 6933485a92
3 changed files with 63 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sonic-yang-models/tests/yang_model_tests/tests/buffer_pg.json
View File

@ -10,6 +10,9 @@
"desc": "BUFFER_PG_WRONG_PG_VALUE pattern failure",
"eStr": "Invalid Buffer PG number"
},
"BUFFER_PG_NULL_PROFILE_VALUE": {
"desc": "BUFFER_PG_NULL_PROFILE_VALUE no failure"
},
"BUFFER_PG_WRONG_PORT_VALUE": {
"desc": "BUFFER_PG_WRONG_PORT_VALUE pattern failure",
"eStr": "wrong"

52
src/sonic-yang-models/tests/yang_model_tests/tests_config/buffer_pg.json
View File

@ -52,6 +52,58 @@
}
}
},
"BUFFER_PG_NULL_PROFILE_VALUE": {
"sonic-port:sonic-port": {
"sonic-port:PORT": {
"PORT_LIST": [
{
"admin_status": "up",
"alias": "eth0",
"description": "Ethernet0",
"lanes": "65",
"mtu": "9000",
"name": "Ethernet4",
"tpid": "0x8100",
"speed": "25000"
}
]
}
},
"sonic-buffer-pool:sonic-buffer-pool": {
"sonic-buffer-pool:BUFFER_POOL": {
"BUFFER_POOL_LIST": [
{
"name": "egress_lossless_pool",
"mode": "static",
"size": "300",
"type": "ingress"
}
]
}
},
"sonic-buffer-profile:sonic-buffer-profile": {
"sonic-buffer-profile:BUFFER_PROFILE": {
"BUFFER_PROFILE_LIST": [
{
"name": "lossless_buffer_profile",
"size": "300",
"pool": "egress_lossless_pool"
}
]
}
},
"sonic-buffer-pg:sonic-buffer-pg": {
"sonic-buffer-pg:BUFFER_PG": {
"BUFFER_PG_LIST": [
{
"port": "Ethernet4",
"pg_num": "3",
"profile": "NULL"
}
]
}
}
},
"BUFFER_PG_WRONG_PROFILE_VALUE": {
"sonic-port:sonic-port": {
"sonic-port:PORT": {

13
src/sonic-yang-models/yang-models/sonic-buffer-pg.yang
View File

@ -2,9 +2,7 @@ module sonic-buffer-pg {
namespace "http://github.com/Azure/sonic-buffer-pg";
prefix bpg;
import sonic-extension {
prefix sonic-ext;
}
yang-version 1.1;
import sonic-port {
prefix prt;
@ -54,8 +52,13 @@ module sonic-buffer-pg {
leaf profile {
default 0;
type leafref {
path "/bpf:sonic-buffer-profile/bpf:BUFFER_PROFILE/bpf:BUFFER_PROFILE_LIST/bpf:name";
type union {
type leafref {
path "/bpf:sonic-buffer-profile/bpf:BUFFER_PROFILE/bpf:BUFFER_PROFILE_LIST/bpf:name";
}
type string {
pattern "NULL";
}
}
description "Buffer Profile associated with Priority Group number for a port";
}