Skip to content

[DASH] Fix FlexCounter bulk get DASH ENI meter class range #1669

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
prabhataravind merged 2 commits into from
Nov 4, 2025
Merged

[DASH] Fix FlexCounter bulk get DASH ENI meter class range #1669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a96dcf
Fix DASH FlexCounter bulk get ENI meter class range
mukeshmv Oct 18, 2025
8d04b1d
Merge branch 'master' into master
prabhataravind Oct 31, 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
4 changes: 3 additions & 1 deletion syncd/FlexCounter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2031,7 +2031,9 @@ class DashMeterCounterContext : public BaseCounterContext
sai_object_key_t object_key;
object_key.key.meter_bucket_entry.eni_id = rid;
object_key.key.meter_bucket_entry.switch_id = m_switchId;
for (uint32_t i = 0; i < m_meterBucketsPerEni; ++i) {
// Populate object keys for ENI meter classes: 1 - max-capable.
// 0 is not a valid meter class since its used to denote traffic that is not metered
for (uint32_t i = 1; i <= m_meterBucketsPerEni; ++i) {
object_key.key.meter_bucket_entry.meter_class = i;
ctx.object_keys.push_back(object_key);
}
Expand Down
1 change: 1 addition & 0 deletions tests/aspell.en.pws
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ DPU
EAPOL
ECN
EIO
ENI
ETERM
ecmp
ECMP
Expand Down
5 changes: 3 additions & 2 deletions unittest/syncd/TestFlexCounter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1921,7 +1921,7 @@ TEST(FlexCounter, addRemoveDashMeterCounter)
EXPECT_EQ(number_of_counters, 2);
for (uint32_t i = 0; i < object_count; ++i)
{
EXPECT_EQ(object_keys[i].key.meter_bucket_entry.meter_class, i);
EXPECT_EQ(object_keys[i].key.meter_bucket_entry.meter_class, i + 1);
dash_meter_fill_values(i, number_of_counters, &(counters[i * number_of_counters]), nullptr);
object_status[i] = SAI_STATUS_SUCCESS;
}
Expand All @@ -1933,7 +1933,8 @@ TEST(FlexCounter, addRemoveDashMeterCounter)
std::string value;
for (uint32_t i = 0; i < (expectedValues.size()/counterIdNames.size()); i++)
{
auto entry_key = sai_meter_bucket_entry_t {.switch_id = 0, .eni_id = eni_id, .meter_class = i*100};
auto entry_key = sai_meter_bucket_entry_t {.switch_id = 0, .eni_id = eni_id,
.meter_class = (i*100) + 1};
auto key = sai_serialize_meter_bucket_entry(entry_key);
for (size_t j = 0; j < 2; ++j) {
countersTable.hget(key, counterIdNames[j], value);
Expand Down
Loading