fix BcmLabeledEgressTest on TH4

Summary:
as titled, this diff fixes BcmLabeledEgressTest on TH4 by calling new bcm ecmp
egress traverse api on TH4.

Reviewed By: phshaikh

Differential Revision: D25130941

fbshipit-source-id: 629559e8f9ed174a2405f163ad3804fb1f6960f8

fboss/agent/hw/bcm/BcmEcmpUtils.cpp

@@ -50,6 +50,52 @@ int getEcmpSizeInHw(const BcmSwitch* hw, bcm_if_t ecmp, int sizeInSw) {
   return getEcmpGroupInHw(hw, ecmp, sizeInSw).size();
 }
 
+template <typename T>
+bcm_if_t toIntfId(T egress) {
+  return egress;
+}
+
+#ifdef BCM_L3_ECMP_MEMBER_WEIGHTED
+template <>
+bcm_if_t toIntfId(bcm_l3_ecmp_member_t egress) {
+  return egress.egress_if;
+}
+#endif
+
+template <typename T>
+int bcm_l3_ecmp_traverse_cb(
+    int /*unit*/,
+    bcm_l3_egress_ecmp_t* /*ecmp*/,
+    int memberCount,
+    T* memberArray,
+    void* userData) {
+  if (!userData) {
+    return 0;
+  }
+  auto* outvec = reinterpret_cast<std::vector<bcm_if_t>*>(userData);
+  for (auto i = 0; i < memberCount; i++) {
+    outvec->push_back(toIntfId<T>(memberArray[i]));
+  }
+  return 0;
+}
+
+std::vector<bcm_if_t> getEcmpMembersInHw(const BcmSwitch* hw) {
+  std::vector<bcm_if_t> ecmpMembers;
+  if (hw->getPlatform()->getAsic()->isSupported(
+          HwAsic::Feature::WEIGHTED_NEXTHOPGROUP_MEMBER)) {
+#ifdef BCM_L3_ECMP_MEMBER_WEIGHTED
+    bcm_l3_ecmp_traverse(
+        hw->getUnit(),
+        bcm_l3_ecmp_traverse_cb<bcm_l3_ecmp_member_t>,
+        &ecmpMembers);
+#endif
+  } else {
+    bcm_l3_egress_ecmp_traverse(
+        hw->getUnit(), bcm_l3_ecmp_traverse_cb<bcm_if_t>, &ecmpMembers);
+  }
+  return ecmpMembers;
+}
+
 bcm_if_t getEgressIdForRoute(
     const BcmSwitch* hw,
     const folly::IPAddress& ip,

fboss/agent/hw/bcm/BcmEcmpUtils.h

@@ -11,6 +11,7 @@
 #pragma once
 
 #include <set>
+#include <vector>
 
 extern "C" {
 #include <bcm/l3.h>
@@ -31,6 +32,8 @@ int getEcmpSizeInHw(const BcmSwitch* hw, bcm_if_t ecmp, int sizeInSw);
 std::multiset<bcm_if_t>
 getEcmpGroupInHw(const BcmSwitch* hw, bcm_if_t ecmp, int sizeInSw);
 
+std::vector<bcm_if_t> getEcmpMembersInHw(const BcmSwitch* hw);
+
 bcm_if_t getEgressIdForRoute(
     const BcmSwitch* hw,
     const folly::IPAddress& ip,

fboss/agent/hw/bcm/tests/BcmLabeledEgressTest.cpp

@@ -2,6 +2,7 @@
 
 #include "fboss/agent/hw/bcm/BcmLabeledEgress.h"
 
+#include "fboss/agent/hw/bcm/BcmEcmpUtils.h"
 #include "fboss/agent/hw/bcm/BcmEgressManager.h"
 #include "fboss/agent/hw/bcm/BcmHost.h"
 #include "fboss/agent/hw/bcm/BcmIntf.h"
@@ -90,22 +91,6 @@ class BcmLabeledEgressTest : public BcmTest {
     return 0;
   }
 
-  static int bcm_l3_egress_ecmp_traverse_cb(
-      int /*unit*/,
-      bcm_l3_egress_ecmp_t* /*ecmp*/,
-      int intf_count,
-      bcm_if_t* intf_array,
-      void* user_data) {
-    if (!user_data) {
-      return 0;
-    }
-    auto* outvec = reinterpret_cast<std::vector<bcm_if_t>*>(user_data);
-    for (auto i = 0; i < intf_count; i++) {
-      outvec->push_back(intf_array[i]);
-    }
-    return 0;
-  }
-
   BcmLabeledEgress* makeLabeledEgress(bcm_mpls_label_t label) {
     auto var = std::make_unique<BcmLabeledEgress>(getHwSwitch(), label);
     auto* rv = var.get();
@@ -252,11 +237,7 @@ TEST_F(BcmLabeledEgressTest, LabeledEgressWithEcmp) {
     return state;
   };
   auto verify = [=]() {
-    std::vector<bcm_if_t> ecmpMembers;
-    bcm_l3_egress_ecmp_traverse(
-        getHwSwitch()->getUnit(),
-        &BcmLabeledEgressTest::bcm_l3_egress_ecmp_traverse_cb,
-        &ecmpMembers);
+    auto ecmpMembers = utility::getEcmpMembersInHw(getHwSwitch());
 
     EXPECT_EQ(ecmpMembers.size(), 4);
 
@@ -294,11 +275,7 @@ TEST_F(BcmLabeledEgressTest, labeledTunnelEgressWithEcmp) {
     return state;
   };
   auto verify = [=]() {
-    std::vector<bcm_if_t> ecmpMembers;
-    bcm_l3_egress_ecmp_traverse(
-        getHwSwitch()->getUnit(),
-        &BcmLabeledEgressTest::bcm_l3_egress_ecmp_traverse_cb,
-        &ecmpMembers);
+    auto ecmpMembers = utility::getEcmpMembersInHw(getHwSwitch());
 
     EXPECT_EQ(ecmpMembers.size(), 4);
 
@@ -340,11 +317,7 @@ TEST_F(BcmLabeledEgressTest, labeledTunnelEgressCommonTunnel) {
     return state;
   };
   auto verify = [=]() {
-    std::vector<bcm_if_t> ecmpMembers;
-    bcm_l3_egress_ecmp_traverse(
-        getHwSwitch()->getUnit(),
-        &BcmLabeledEgressTest::bcm_l3_egress_ecmp_traverse_cb,
-        &ecmpMembers);
+    auto ecmpMembers = utility::getEcmpMembersInHw(getHwSwitch());
 
     EXPECT_EQ(ecmpMembers.size(), 4);
 
@@ -383,11 +356,7 @@ TEST_F(BcmLabeledEgressTest, labeledTunnelEgressWithOneLabel) {
     return state;
   };
   auto verify = [=]() {
-    std::vector<bcm_if_t> ecmpMembers;
-    bcm_l3_egress_ecmp_traverse(
-        getHwSwitch()->getUnit(),
-        &BcmLabeledEgressTest::bcm_l3_egress_ecmp_traverse_cb,
-        &ecmpMembers);
+    auto ecmpMembers = utility::getEcmpMembersInHw(getHwSwitch());
 
     EXPECT_EQ(ecmpMembers.size(), 4);
 
@@ -423,11 +392,7 @@ TEST_F(BcmLabeledEgressTest, LabeledUnlabeledEgressWithEcmp) {
     return state;
   };
   auto verify = [=]() {
-    std::vector<bcm_if_t> ecmpMembers;
-    bcm_l3_egress_ecmp_traverse(
-        getHwSwitch()->getUnit(),
-        &BcmLabeledEgressTest::bcm_l3_egress_ecmp_traverse_cb,
-        &ecmpMembers);
+    auto ecmpMembers = utility::getEcmpMembersInHw(getHwSwitch());
 
     EXPECT_EQ(ecmpMembers.size(), 4);