meru800biab: fboss agent support

aalamsi22 · Oct 7, 2024 · 7c3dd84 · 7c3dd84
1 parent 13eeda2
commit 7c3dd84
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 7 deletions.
diff --git a/fboss/agent/FabricConnectivityManager.cpp b/fboss/agent/FabricConnectivityManager.cpp
@@ -56,7 +56,8 @@ getPlatformMappingForDsfNode(const PlatformType platformType) {
           true /*multiNpuPlatformMapping*/};
       return &meru800bfa;
     }
-    case PlatformType::PLATFORM_MERU800BIA: {
+    case PlatformType::PLATFORM_MERU800BIA:
+    case PlatformType::PLATFORM_MERU800BIAB: {
       static Meru800biaPlatformMapping meru800bia;
       return &meru800bia;
     }

diff --git a/fboss/agent/Utils.cpp b/fboss/agent/Utils.cpp
@@ -890,6 +890,7 @@ uint32_t getRemotePortOffset(const PlatformType platformType) {
     case PlatformType::PLATFORM_MERU800BFA_P1:
       return 0;
     case PlatformType::PLATFORM_MERU800BIA:
+    case PlatformType::PLATFORM_MERU800BIAB:
     case PlatformType::PLATFORM_JANGA800BIC:
       return 1024;
 

diff --git a/fboss/agent/hw/sai/diag/DiagShell.cpp b/fboss/agent/hw/sai/diag/DiagShell.cpp
@@ -163,6 +163,7 @@ std::unique_ptr<Repl> DiagShell::makeRepl() const {
     case PlatformType::PLATFORM_DARWIN:
     case PlatformType::PLATFORM_MERU400BIU:
     case PlatformType::PLATFORM_MERU800BIA:
+    case PlatformType::PLATFORM_MERU800BIAB:
     case PlatformType::PLATFORM_MERU800BFA:
     case PlatformType::PLATFORM_MERU800BFA_P1:
     case PlatformType::PLATFORM_MERU400BIA:
@@ -395,6 +396,7 @@ std::string DiagCmdServer::getDelimiterDiagCmd(const std::string& UUID) const {
     case PlatformType::PLATFORM_DARWIN:
     case PlatformType::PLATFORM_MERU400BIU:
     case PlatformType::PLATFORM_MERU800BIA:
+    case PlatformType::PLATFORM_MERU800BIAB:
     case PlatformType::PLATFORM_MERU800BFA:
     case PlatformType::PLATFORM_MERU800BFA_P1:
     case PlatformType::PLATFORM_MERU400BIA:
@@ -442,6 +444,7 @@ std::string& DiagCmdServer::cleanUpOutput(
     case PlatformType::PLATFORM_DARWIN:
     case PlatformType::PLATFORM_MERU400BIU:
     case PlatformType::PLATFORM_MERU800BIA:
+    case PlatformType::PLATFORM_MERU800BIAB:
     case PlatformType::PLATFORM_MERU800BFA:
     case PlatformType::PLATFORM_MERU800BFA_P1:
     case PlatformType::PLATFORM_MERU400BIA:

diff --git a/fboss/agent/platforms/common/PlatformMappingUtils.cpp b/fboss/agent/platforms/common/PlatformMappingUtils.cpp
@@ -148,6 +148,7 @@ std::unique_ptr<PlatformMapping> initPlatformMapping(PlatformType type) {
           ? std::make_unique<Meru400biuPlatformMapping>()
           : std::make_unique<Meru400biuPlatformMapping>(platformMappingStr);
     case PlatformType::PLATFORM_MERU800BIA:
+    case PlatformType::PLATFORM_MERU800BIAB:
       return platformMappingStr.empty()
           ? std::make_unique<Meru800biaPlatformMapping>()
           : std::make_unique<Meru800biaPlatformMapping>(platformMappingStr);

diff --git a/fboss/agent/platforms/sai/SaiPlatform.cpp b/fboss/agent/platforms/sai/SaiPlatform.cpp
@@ -351,7 +351,9 @@ void SaiPlatform::initPorts() {
       }
     } else if (platformMode == PlatformType::PLATFORM_MERU400BIU) {
       saiPort = std::make_unique<SaiMeru400biuPlatformPort>(portId, this);
-    } else if (platformMode == PlatformType::PLATFORM_MERU800BIA) {
+    } else if (
+        platformMode == PlatformType::PLATFORM_MERU800BIA ||
+        platformMode == PlatformType::PLATFORM_MERU800BIAB) {
       saiPort = std::make_unique<SaiMeru800biaPlatformPort>(portId, this);
     } else if (platformMode == PlatformType::PLATFORM_MERU400BIA) {
       saiPort = std::make_unique<SaiMeru400biaPlatformPort>(portId, this);

diff --git a/fboss/agent/platforms/sai/SaiPlatformInit.cpp b/fboss/agent/platforms/sai/SaiPlatformInit.cpp
@@ -74,7 +74,9 @@ std::unique_ptr<SaiPlatform> chooseSaiPlatform(
   } else if (productInfo->getType() == PlatformType::PLATFORM_MERU400BIU) {
     return std::make_unique<SaiMeru400biuPlatform>(
         std::move(productInfo), localMac, platformMappingStr);
-  } else if (productInfo->getType() == PlatformType::PLATFORM_MERU800BIA) {
+  } else if (
+      productInfo->getType() == PlatformType::PLATFORM_MERU800BIA ||
+      productInfo->getType() == PlatformType::PLATFORM_MERU800BIAB) {
     return std::make_unique<SaiMeru800biaPlatform>(
         std::move(productInfo), localMac, platformMappingStr);
   } else if (productInfo->getType() == PlatformType::PLATFORM_MERU800BFA) {

diff --git a/fboss/agent/test/agent_hw_tests/AgentRouteOverflowTests.cpp b/fboss/agent/test/agent_hw_tests/AgentRouteOverflowTests.cpp
@@ -87,6 +87,7 @@ TEST_F(AgentRouteOverflowTest, overflowRoutes) {
       break;
     case PlatformType::PLATFORM_MERU400BIU:
     case PlatformType::PLATFORM_MERU800BIA:
+    case PlatformType::PLATFORM_MERU800BIAB:
     case PlatformType::PLATFORM_MERU800BFA:
     case PlatformType::PLATFORM_MERU800BFA_P1:
       // No overflow test for MERU400BIU yet

diff --git a/fboss/qsfp_service/platforms/wedge/WedgeManagerInit.cpp b/fboss/qsfp_service/platforms/wedge/WedgeManagerInit.cpp
@@ -75,7 +75,9 @@ std::unique_ptr<WedgeManager> createWedgeManager() {
     return createMeru400biaWedgeManager(platformMappingStr);
   } else if (mode == PlatformType::PLATFORM_MERU400BIU) {
     return createMeru400biuWedgeManager(platformMappingStr);
-  } else if (mode == PlatformType::PLATFORM_MERU800BIA) {
+  } else if (
+      mode == PlatformType::PLATFORM_MERU800BIA ||
+      mode == PlatformType::PLATFORM_MERU800BIAB) {
     return createMeru800biaWedgeManager(platformMappingStr);
   } else if (
       mode == PlatformType::PLATFORM_MERU800BFA ||

diff --git a/fboss/qsfp_service/test/hw_test/HwXphyFirmwareTest.cpp b/fboss/qsfp_service/test/hw_test/HwXphyFirmwareTest.cpp
@@ -49,6 +49,7 @@ TEST_F(HwXphyFirmwareTest, CheckDefaultXphyFirmwareVersion) {
     case PlatformType::PLATFORM_LASSEN_DEPRECATED:
     case PlatformType::PLATFORM_MERU400BIU:
     case PlatformType::PLATFORM_MERU800BIA:
+    case PlatformType::PLATFORM_MERU800BIAB:
     case PlatformType::PLATFORM_MERU800BFA:
     case PlatformType::PLATFORM_MERU800BFA_P1:
     case PlatformType::PLATFORM_MERU400BIA:

diff --git a/fboss/util/oss/wedge_qsfp_util.cpp b/fboss/util/oss/wedge_qsfp_util.cpp
@@ -58,7 +58,8 @@ std::pair<std::unique_ptr<TransceiverI2CApi>, int> getTransceiverAPI() {
               .get();
       auto ioBus = std::make_unique<BspIOBus>(systemContainer);
       return std::make_pair(std::move(ioBus), 0);
-    } else if (FLAGS_platform == "meru800bia") {
+    } else if (
+        FLAGS_platform == "meru800bia" || FLAGS_platform == "meru800biab") {
       auto systemContainer =
           BspGenericSystemContainer<Meru800biaBspPlatformMapping>::getInstance()
               .get();
@@ -117,7 +118,9 @@ std::pair<std::unique_ptr<TransceiverI2CApi>, int> getTransceiverAPI() {
             .get();
     auto ioBus = std::make_unique<BspIOBus>(systemContainer);
     return std::make_pair(std::move(ioBus), 0);
-  } else if (mode == PlatformType::PLATFORM_MERU800BIA) {
+  } else if (
+      mode == PlatformType::PLATFORM_MERU800BIA ||
+      mode == PlatformType::PLATFORM_MERU800BIAB) {
     auto systemContainer =
         BspGenericSystemContainer<Meru800biaBspPlatformMapping>::getInstance()
             .get();
@@ -167,6 +170,8 @@ getTransceiverPlatformAPI(TransceiverI2CApi* i2cBus) {
       mode = PlatformType::PLATFORM_MERU400BIU;
     } else if (FLAGS_platform == "meru800bia") {
       mode = PlatformType::PLATFORM_MERU800BIA;
+    } else if (FLAGS_platform == "meru800biab") {
+      mode = PlatformType::PLATFORM_MERU800BIAB;
     } else if (FLAGS_platform == "meru800bfa") {
       mode = PlatformType::PLATFORM_MERU800BFA;
     } else if (FLAGS_platform == "meru800bfa_p1") {
@@ -208,7 +213,9 @@ getTransceiverPlatformAPI(TransceiverI2CApi* i2cBus) {
             .get();
     return std::make_pair(
         std::make_unique<BspTransceiverApi>(systemContainer), 0);
-  } else if (mode == PlatformType::PLATFORM_MERU800BIA) {
+  } else if (
+      mode == PlatformType::PLATFORM_MERU800BIA ||
+      mode == PlatformType::PLATFORM_MERU800BIAB) {
     auto systemContainer =
         BspGenericSystemContainer<Meru800biaBspPlatformMapping>::getInstance()
             .get();