Modify PFC test to check ingress congestion discards as well

Summary:
As titled.

   OK : 7
   FAILED : 1
   SKIPPED : 0
   TIMEOUT : 0
```

Reviewed By: jasmeetbagga

Differential Revision: D60040839

fbshipit-source-id: eaabea2f5ebd4bbc95f159458abd01b110a1d837

fboss/agent/hw/test/dataplane_tests/HwTrafficPfcTests.cpp

@@ -446,26 +446,36 @@ class HwTrafficPfcTest : public HwLinkStateDependentTest {
       for (const auto& portId : portIds) {
         auto portStats = getHwSwitchEnsemble()->getLatestPortStats(portId);
         auto ingressDropRaw = *portStats.inDiscardsRaw_();
+        uint64_t ingressCongestionDiscards = 0;
+        std::string ingressCongestionDiscardLog{};
+        if (getHwSwitchEnsemble()->getAsic()->isSupported(
+                HwAsic::Feature::INGRESS_PRIORITY_GROUP_DROPPED_PACKETS)) {
+          ingressCongestionDiscards = *portStats.inCongestionDiscards_();
+          ingressCongestionDiscardLog = " IngressCongestionDiscards: " +
+              std::to_string(ingressCongestionDiscards);
+        }
         XLOG(DBG0) << " validateIngressDropCounters: Port: " << portId
-                   << " IngressDropRaw: " << ingressDropRaw;
+                   << " IngressDropRaw: " << ingressDropRaw
+                   << ingressCongestionDiscardLog;
         EXPECT_EVENTUALLY_GT(ingressDropRaw, 0);
+        if (getHwSwitchEnsemble()->getAsic()->isSupported(
+                HwAsic::Feature::INGRESS_PRIORITY_GROUP_DROPPED_PACKETS)) {
+          EXPECT_EVENTUALLY_GT(ingressCongestionDiscards, 0);
+        }
       }
       if (getAsic()->getAsicType() == cfg::AsicType::ASIC_TYPE_JERICHO3) {
         // Jericho3 has additional VSQ drops counters which accounts for
         // ingress buffer drops.
-        // TODO: Check if 'vsqResourceExhaustionDrops' is incrementing for
-        // now, eventually move to a new per port/PG based ingress congestion
-        // discard counter when supported via CS00012336173.
         getHwSwitchEnsemble()->getHwSwitch()->updateStats();
         fb303::ThreadCachedServiceData::get()->publishStats();
-        auto ingressCongestionDiscards = getHwSwitchEnsemble()
-                                             ->getHwSwitch()
-                                             ->getSwitchStats()
-                                             ->getVsqResourcesExhautionDrops();
+        auto vsqResourcesExhautionDrops = getHwSwitchEnsemble()
+                                              ->getHwSwitch()
+                                              ->getSwitchStats()
+                                              ->getVsqResourcesExhautionDrops();
         XLOG(DBG0)
             << " validateIngressDropCounters: vsqResourceExhaustionDrops: "
-            << ingressCongestionDiscards;
-        EXPECT_EVENTUALLY_GT(ingressCongestionDiscards, 0);
+            << vsqResourcesExhautionDrops;
+        EXPECT_EVENTUALLY_GT(vsqResourcesExhautionDrops, 0);
       }
     });
   }