Exclude validateIngressPoolParamChange test on J3

Summary: Exclude validateIngressPoolParamChange test on J3 as changing ingress pool size separately is not supported.

Reviewed By: jasmeetbagga

Differential Revision:
D67675210

Privacy Context Container: L1125642

fbshipit-source-id: 663efb02a5a585a9081378dca54b5f70d5df5315

fboss/agent/test/agent_hw_tests/AgentIngressBufferTests.cpp

@@ -199,35 +199,6 @@ TEST_F(AgentIngressBufferTest, validateConfig) {
   verifyAcrossWarmBoots(setup, verify);
 }
 
-// Create PG, Ingress pool config, associate with PFC config.
-// Modify the ingress pool params only and ensure that it is
-// getting re-programmed
-TEST_F(AgentIngressBufferTest, validateIngressPoolParamChange) {
-  auto setup = [&]() {
-    setupHelper();
-    auto portId = masterLogicalInterfacePortIds()[0];
-    auto switchId = getSw()->getScopeResolver()->scope(portId).switchId();
-    auto asic = getSw()->getHwAsicTable()->getHwAsic(switchId);
-    // setup bufferPool
-    std::map<std::string, cfg::BufferPoolConfig> bufferPoolCfgMap;
-    bufferPoolCfgMap.insert(make_pair(
-        static_cast<std::string>(kBufferPoolName),
-        getBufferPoolConfig(asic->getPacketBufferUnitSize(), 1)));
-    cfg_.bufferPoolConfigs() = bufferPoolCfgMap;
-    // update one PG, and see ifs reflected in the HW
-    applyNewConfig(cfg_);
-  };
-
-  auto verify = [&]() {
-    WITH_RETRIES({
-      EXPECT_EVENTUALLY_TRUE(checkSwHwPgCfgMatch(
-          masterLogicalInterfacePortIds()[0], true /*pfcEnable*/));
-    });
-  };
-
-  verifyAcrossWarmBoots(setup, verify);
-}
-
 // Create PG config, associate with PFC config. Modify the PG
 // config params and ensure that its getting re-programmed.
 TEST_F(AgentIngressBufferTest, validatePGParamChange) {
@@ -400,4 +371,43 @@ TEST_F(AgentIngressBufferTest, validatePGQueueChanges) {
   verifyAcrossWarmBoots(setup, verify);
 }
 
+class AgentIngressBufferPoolTest : public AgentIngressBufferTest {
+  std::vector<production_features::ProductionFeature>
+  getProductionFeaturesVerified() const override {
+    auto features = AgentIngressBufferTest::getProductionFeaturesVerified();
+    features.push_back(production_features::ProductionFeature::
+                           SEPARATE_INGRESS_EGRESS_BUFFER_POOL);
+    return features;
+  }
+};
+
+// Create PG, Ingress pool config, associate with PFC config.
+// Modify the ingress pool params only and ensure that it is
+// getting re-programmed
+TEST_F(AgentIngressBufferPoolTest, validateIngressPoolParamChange) {
+  auto setup = [&]() {
+    setupHelper();
+    auto portId = masterLogicalInterfacePortIds()[0];
+    auto switchId = getSw()->getScopeResolver()->scope(portId).switchId();
+    auto asic = getSw()->getHwAsicTable()->getHwAsic(switchId);
+    // setup bufferPool
+    std::map<std::string, cfg::BufferPoolConfig> bufferPoolCfgMap;
+    bufferPoolCfgMap.insert(make_pair(
+        static_cast<std::string>(kBufferPoolName),
+        getBufferPoolConfig(asic->getPacketBufferUnitSize(), 1)));
+    cfg_.bufferPoolConfigs() = bufferPoolCfgMap;
+    // update one PG, and see ifs reflected in the HW
+    applyNewConfig(cfg_);
+  };
+
+  auto verify = [&]() {
+    WITH_RETRIES({
+      EXPECT_EVENTUALLY_TRUE(checkSwHwPgCfgMatch(
+          masterLogicalInterfacePortIds()[0], true /*pfcEnable*/));
+    });
+  };
+
+  verifyAcrossWarmBoots(setup, verify);
+}
+
 } // namespace facebook::fboss

fboss/agent/test/production_features.thrift

@@ -61,6 +61,7 @@ enum ProductionFeature {
   LINERATE_SFLOW = 48,
   MIRROR_ON_DROP = 49,
   PAUSE = 50,
+  SEPARATE_INGRESS_EGRESS_BUFFER_POOL = 51,
   # production feature which is present on all platforms, keep it at the end
   HW_SWITCH = 65536,
 }