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

[action] [PR:20754] Support bulk chunk size in bulk counter polling operation #21500

Merged
merged 1 commit into from
Feb 1, 2025
+176 −0
Merged

[action] [PR:20754] Support bulk chunk size in bulk counter polling operation #21500

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
8 changes: 8 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests/flex_counter.json
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,14 @@
"eStrKey": "Range",
"eStr": "100..4294967295"
},
"FLEX_COUNTER_TABLE_WITH_VALID_BULK_CHUNK_SIZE": {
"desc": "FLEX_COUNTER_TABLE_WITH_VALID_BULK_CHUNK_SIZE no failure."
},
"FLEX_COUNTER_TABLE_WITH_INVALID_BULK_CHUNK_SIZE": {
"desc": "Out of range bulk chunk size.",
"eStrKey": "Range",
"eStr": "1..4294967295"
},
"FLOW_COUNTER_ROUTE_PATTERN_TABLE_WITH_VRF": {
"desc": "FLOW_COUNTER_ROUTE_PATTERN_TABLE_WITH_VRF no failure."
},
144 changes: 144 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests_config/flex_counter.json
View file
Original file line number Diff line number Diff line change
@@ -137,6 +137,150 @@
}
}
},
"FLEX_COUNTER_TABLE_WITH_VALID_BULK_CHUNK_SIZE": {
"sonic-flex_counter:sonic-flex_counter": {
"sonic-flex_counter:FLEX_COUNTER_TABLE": {
"BUFFER_POOL_WATERMARK": {
"FLEX_COUNTER_STATUS": "enable",
"POLL_INTERVAL": 10000
},
"DEBUG_COUNTER": {
"FLEX_COUNTER_STATUS": "enable"
},
"PFCWD": {
"FLEX_COUNTER_STATUS": "enable"
},
"PG_DROP": {
"FLEX_COUNTER_STATUS": "enable",
"BULK_CHUNK_SIZE": 100,
"POLL_INTERVAL": 10000
},
"PG_WATERMARK": {
"FLEX_COUNTER_STATUS": "enable",
"BULK_CHUNK_SIZE": 100,
"POLL_INTERVAL": 10000
},
"PORT": {
"FLEX_COUNTER_STATUS": "enable",
"BULK_CHUNK_SIZE": 100,
"POLL_INTERVAL": 1000
},
"PORT_BUFFER_DROP": {
"FLEX_COUNTER_STATUS": "enable",
"POLL_INTERVAL": 60000
},
"PORT_RATES": {
"FLEX_COUNTER_STATUS": "enable"
},
"QUEUE": {
"FLEX_COUNTER_STATUS": "enable",
"BULK_CHUNK_SIZE": 100,
"POLL_INTERVAL": 10000
},
"QUEUE_WATERMARK": {
"FLEX_COUNTER_STATUS": "enable",
"BULK_CHUNK_SIZE": 100,
"POLL_INTERVAL": 10000
},
"ACL": {
"FLEX_COUNTER_STATUS": "enable",
"POLL_INTERVAL": 10000
},
"TUNNEL": {
"FLEX_COUNTER_STATUS": "enable",
"POLL_INTERVAL": 10000
},
"FLOW_CNT_TRAP": {
"FLEX_COUNTER_STATUS": "enable",
"POLL_INTERVAL": 10000
},
"FLOW_CNT_ROUTE": {
"FLEX_COUNTER_STATUS": "enable",
"POLL_INTERVAL": 10000
},
"WRED_ECN_QUEUE": {
"FLEX_COUNTER_STATUS": "enable",
"POLL_INTERVAL": 10000
},
"WRED_ECN_PORT": {
"FLEX_COUNTER_STATUS": "enable",
"POLL_INTERVAL": 1000
}
}
}
},
"FLEX_COUNTER_TABLE_WITH_INVALID_BULK_CHUNK_SIZE": {
"sonic-flex_counter:sonic-flex_counter": {
"sonic-flex_counter:FLEX_COUNTER_TABLE": {
"BUFFER_POOL_WATERMARK": {
"FLEX_COUNTER_STATUS": "enable",
"POLL_INTERVAL": 10000
},
"DEBUG_COUNTER": {
"FLEX_COUNTER_STATUS": "enable"
},
"PFCWD": {
"FLEX_COUNTER_STATUS": "enable"
},
"PG_DROP": {
"FLEX_COUNTER_STATUS": "enable",
"BULK_CHUNK_SIZE": 0,
"POLL_INTERVAL": 10000
},
"PG_WATERMARK": {
"FLEX_COUNTER_STATUS": "enable",
"BULK_CHUNK_SIZE": 0,
"POLL_INTERVAL": 10000
},
"PORT": {
"FLEX_COUNTER_STATUS": "enable",
"BULK_CHUNK_SIZE": 0,
"POLL_INTERVAL": 1000
},
"PORT_BUFFER_DROP": {
"FLEX_COUNTER_STATUS": "enable",
"POLL_INTERVAL": 60000
},
"PORT_RATES": {
"FLEX_COUNTER_STATUS": "enable"
},
"QUEUE": {
"FLEX_COUNTER_STATUS": "enable",
"BULK_CHUNK_SIZE": 0,
"POLL_INTERVAL": 10000
},
"QUEUE_WATERMARK": {
"FLEX_COUNTER_STATUS": "enable",
"BULK_CHUNK_SIZE": 0,
"POLL_INTERVAL": 10000
},
"ACL": {
"FLEX_COUNTER_STATUS": "enable",
"POLL_INTERVAL": 10000
},
"TUNNEL": {
"FLEX_COUNTER_STATUS": "enable",
"POLL_INTERVAL": 10000
},
"FLOW_CNT_TRAP": {
"FLEX_COUNTER_STATUS": "enable",
"POLL_INTERVAL": 10000
},
"FLOW_CNT_ROUTE": {
"FLEX_COUNTER_STATUS": "enable",
"POLL_INTERVAL": 10000
},
"WRED_ECN_QUEUE": {
"FLEX_COUNTER_STATUS": "enable",
"POLL_INTERVAL": 10000
},
"WRED_ECN_PORT": {
"FLEX_COUNTER_STATUS": "enable",
"POLL_INTERVAL": 1000
}
}
}
},
"FLOW_COUNTER_ROUTE_PATTERN_TABLE_WITH_VRF": {
"sonic-vrf:sonic-vrf":{
"sonic-vrf:VRF": {
24 changes: 24 additions & 0 deletions src/sonic-yang-models/yang-models/sonic-flex_counter.yang
View file
Original file line number Diff line number Diff line change
@@ -41,6 +41,12 @@ module sonic-flex_counter {
}
}

typedef bulk_chunk_size {
type uint32 {
range 1..4294967295;
}
}

description "FLEX_COUNTER_TABLE part of config_db.json";

/* below are in alphabetical order */
@@ -102,6 +108,9 @@ module sonic-flex_counter {
leaf POLL_INTERVAL {
type poll_interval;
}
leaf BULK_CHUNK_SIZE {
type bulk_chunk_size;
}
}

container PG_WATERMARK {
@@ -115,6 +124,9 @@ module sonic-flex_counter {
leaf POLL_INTERVAL {
type poll_interval;
}
leaf BULK_CHUNK_SIZE {
type bulk_chunk_size;
}
}

container PORT {
@@ -128,6 +140,9 @@ module sonic-flex_counter {
leaf POLL_INTERVAL {
type poll_interval;
}
leaf BULK_CHUNK_SIZE {
type bulk_chunk_size;
}
}

container PORT_RATES {
@@ -151,6 +166,9 @@ module sonic-flex_counter {
leaf POLL_INTERVAL {
type poll_interval;
}
leaf BULK_CHUNK_SIZE {
type bulk_chunk_size;
}
}

container QUEUE {
@@ -164,6 +182,9 @@ module sonic-flex_counter {
leaf POLL_INTERVAL {
type poll_interval;
}
leaf BULK_CHUNK_SIZE {
type bulk_chunk_size;
}
}

container QUEUE_WATERMARK {
@@ -177,6 +198,9 @@ module sonic-flex_counter {
leaf POLL_INTERVAL {
type poll_interval;
}
leaf BULK_CHUNK_SIZE {
type bulk_chunk_size;
}
}

container RIF {