From f1669f4ffec7732d6faa42c617765275ca81dd5f Mon Sep 17 00:00:00 2001
From: Vineet  Mittal <46945843+vmittal-msft@users.noreply.github.com>
Date: Wed, 1 Jul 2026 17:51:25 -0700
Subject: [PATCH] Revert "Disable bulk requests for PORT counters (#4115)"
 (#4727)

This reverts commit 2f0459b855a58598d00ba9a969931f0a29579d4a.
---
 orchagent/flex_counter/flex_counter_manager.h | 24 ++++---------------
 tests/mock_tests/flexcounter_ut.cpp           |  4 +---
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/orchagent/flex_counter/flex_counter_manager.h b/orchagent/flex_counter/flex_counter_manager.h
index a5383724..d5dff907 100644
--- a/orchagent/flex_counter/flex_counter_manager.h
+++ b/orchagent/flex_counter/flex_counter_manager.h
@@ -196,28 +196,14 @@ struct CachedObjects
             auto counter_ids = FlexCounterManager::serializeCounterStats(counter_stats);
             auto counter_type_it = FlexCounterManager::counter_id_field_lookup.find(counter_type);
 
-            // Temporary fix for SNMP PFC counter issue: disable bulk init requests for PORT counters
-            // This forces each port to be processed individually, avoiding capability mismatch
-            // for different ports in bulk requests
-            if (counter_type == CounterType::PORT)
+            auto counter_keys = group_name + ":";
+            for (const auto& oid: pending_sai_objects)
             {
-                for (const auto& oid: pending_sai_objects)
-                {
-                    auto counter_key = group_name + ":" + sai_serialize_object_id(oid);
-                    startFlexCounterPolling(switch_id, counter_key, counter_ids, counter_type_it->second);
-                }
+                counter_keys += sai_serialize_object_id(oid) + ",";
             }
-            else
-            {
-                auto counter_keys = group_name + ":";
-                for (const auto& oid: pending_sai_objects)
-                {
-                    counter_keys += sai_serialize_object_id(oid) + ",";
-                }
-                counter_keys.pop_back();
+            counter_keys.pop_back();
 
-                startFlexCounterPolling(switch_id, counter_keys, counter_ids, counter_type_it->second);
-            }
+            startFlexCounterPolling(switch_id, counter_keys, counter_ids, counter_type_it->second);
         }
 
         /* Clear all cached entries after flush */
diff --git a/tests/mock_tests/flexcounter_ut.cpp b/tests/mock_tests/flexcounter_ut.cpp
index 7b85475e..45443975 100644
--- a/tests/mock_tests/flexcounter_ut.cpp
+++ b/tests/mock_tests/flexcounter_ut.cpp
@@ -1127,9 +1127,7 @@ namespace flexcounter_test
         port_stat_manager.flush();
 
         /* SAIREDIS channel should have been called thrice, once for port1&port2&port5, port3&port4 and port6*/
-        // ASSERT_EQ(mockFlexCounterOperationCallCount, 3);
-        // Temporary fix for SNMP PFC counter issue: disabled bulk init requests for PORT counters
-        ASSERT_EQ(mockFlexCounterOperationCallCount, 6);
+        ASSERT_EQ(mockFlexCounterOperationCallCount, 3);
 
         ASSERT_TRUE(checkFlexCounter(PORT_STAT_COUNTER_FLEX_COUNTER_GROUP, port6_oid,
                                      {