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

[DPB] update flex counter yang model, fix BUFFER_POOL_WATERMARK (#6178)

Browse Source 
Looks like we have redefinition of BUFFER_POOL_WATERMARK_KEY to BUFFER_POOL_WATERMARK, so DPB fall.
c7ee75f0b9/orchagent/flexcounterorch.cpp (L18)

#define BUFFER_POOL_WATERMARK_KEY   "BUFFER_POOL_WATERMARK"


unordered_map<string, string> flexCounterGroupMap =
{
    {"PORT", PORT_STAT_COUNTER_FLEX_COUNTER_GROUP},
    {"PORT_RATES", PORT_RATE_COUNTER_FLEX_COUNTER_GROUP},
    {"PORT_BUFFER_DROP", PORT_STAT_COUNTER_FLEX_COUNTER_GROUP},
    {"QUEUE", QUEUE_STAT_COUNTER_FLEX_COUNTER_GROUP},
    {"PFCWD", PFC_WD_FLEX_COUNTER_GROUP},
    {"QUEUE_WATERMARK", QUEUE_WATERMARK_STAT_COUNTER_FLEX_COUNTER_GROUP},
    {"PG_WATERMARK", PG_WATERMARK_STAT_COUNTER_FLEX_COUNTER_GROUP},
    {BUFFER_POOL_WATERMARK_KEY, BUFFER_POOL_WATERMARK_STAT_COUNTER_FLEX_COUNTER_GROUP},
This commit is contained in:
Dmytro Shevchuk 2020-12-19 20:14:06 +02:00 committed by GitHub
parent 0755f29fe7
commit f7d082244a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sonic-yang-models/tests/yang_model_tests/yangTest.json
View File

@ -850,7 +850,7 @@
"PORT_BUFFER_DROP": { "PORT_BUFFER_DROP": {
"FLEX_COUNTER_STATUS": "enable" "FLEX_COUNTER_STATUS": "enable"
}, },
"BUFFER_POOL_WATERMARK_KEY": { "BUFFER_POOL_WATERMARK": {
"FLEX_COUNTER_STATUS": "enable" "FLEX_COUNTER_STATUS": "enable"
}, },
"QUEUE": { "QUEUE": {
@ -1689,7 +1689,7 @@
"PORT_BUFFER_DROP": { "PORT_BUFFER_DROP": {
"FLEX_COUNTER_STATUS": "enable" "FLEX_COUNTER_STATUS": "enable"
}, },
"BUFFER_POOL_WATERMARK_KEY": { "BUFFER_POOL_WATERMARK": {
"FLEX_COUNTER_STATUS": "enable" "FLEX_COUNTER_STATUS": "enable"
}, },
"QUEUE": { "QUEUE": {

2
src/sonic-yang-models/yang-models/sonic-flex_counter.yang
View File

@ -27,7 +27,7 @@ module sonic-flex_counter {
/* below are in alphabetical order */ /* below are in alphabetical order */
container BUFFER_POOL_WATERMARK_KEY { container BUFFER_POOL_WATERMARK {
/* BUFFER_POOL_WATERMARK_STAT_COUNTER_FLEX_COUNTER_GROUP */ /* BUFFER_POOL_WATERMARK_STAT_COUNTER_FLEX_COUNTER_GROUP */
leaf FLEX_COUNTER_STATUS { leaf FLEX_COUNTER_STATUS {
type flex_status; type flex_status;