DARWIN48V: platform definition & led_manager (#293)

Summary: # Description Combines #257, #258 and #263. #263 fails builds due to a dependencies found in #257 and #258. Pull Request resolved: #293 Reviewed By: somasun, mikechoifb Differential Revision: D65801211 Pulled By: joancaneus fbshipit-source-id: 2724e1073e2369fe802c4d144555ce93e95e6c6f
facebook · Dec 4, 2024 · 08e131f · 08e131f
1 parent c645744
commit 08e131f
Show file tree

Hide file tree

Showing 14 changed files with 120 additions and 5 deletions.
diff --git a/fboss/agent/hw/bcm/tests/BcmSwitchEnsemble.cpp b/fboss/agent/hw/bcm/tests/BcmSwitchEnsemble.cpp
@@ -257,7 +257,8 @@ void BcmSwitchEnsemble::init(
       PlatformType::PLATFORM_MINIPACK,
       PlatformType::PLATFORM_YAMP,
       PlatformType::PLATFORM_WEDGE400,
-      PlatformType::PLATFORM_DARWIN};
+      PlatformType::PLATFORM_DARWIN,
+      PlatformType::PLATFORM_DARWIN48V};
   std::unordered_set<PlatformType> th4BcmPlatforms = {
       PlatformType::PLATFORM_FUJI, PlatformType::PLATFORM_ELBERT};
   bool th3Platform = false;

diff --git a/fboss/agent/hw/sai/diag/DiagShell.cpp b/fboss/agent/hw/sai/diag/DiagShell.cpp
@@ -160,6 +160,7 @@ std::unique_ptr<Repl> DiagShell::makeRepl() const {
     case PlatformType::PLATFORM_FUJI:
     case PlatformType::PLATFORM_ELBERT:
     case PlatformType::PLATFORM_DARWIN:
+    case PlatformType::PLATFORM_DARWIN48V:
     case PlatformType::PLATFORM_MERU400BIU:
     case PlatformType::PLATFORM_MERU800BIA:
     case PlatformType::PLATFORM_MERU800BIAB:
@@ -395,6 +396,7 @@ std::string DiagCmdServer::getDelimiterDiagCmd(const std::string& UUID) const {
     case PlatformType::PLATFORM_FUJI:
     case PlatformType::PLATFORM_ELBERT:
     case PlatformType::PLATFORM_DARWIN:
+    case PlatformType::PLATFORM_DARWIN48V:
     case PlatformType::PLATFORM_MERU400BIU:
     case PlatformType::PLATFORM_MERU800BIA:
     case PlatformType::PLATFORM_MERU800BIAB:
@@ -445,6 +447,7 @@ std::string& DiagCmdServer::cleanUpOutput(
     case PlatformType::PLATFORM_FUJI:
     case PlatformType::PLATFORM_ELBERT:
     case PlatformType::PLATFORM_DARWIN:
+    case PlatformType::PLATFORM_DARWIN48V:
     case PlatformType::PLATFORM_MERU400BIU:
     case PlatformType::PLATFORM_MERU800BIA:
     case PlatformType::PLATFORM_MERU800BIAB:

diff --git a/fboss/agent/hw/test/ProdConfigFactory.cpp b/fboss/agent/hw/test/ProdConfigFactory.cpp
@@ -107,6 +107,7 @@ uint16_t uplinksCountFromSwitch(PlatformType mode) {
     case PM::PLATFORM_GALAXY_LC:
     case PM::PLATFORM_GALAXY_FC:
     case PM::PLATFORM_DARWIN:
+    case PM::PLATFORM_DARWIN48V:
     case PM::PLATFORM_MONTBLANC:
       return 4;
     default:

diff --git a/fboss/agent/platforms/common/PlatformMappingUtils.cpp b/fboss/agent/platforms/common/PlatformMappingUtils.cpp
@@ -120,6 +120,7 @@ std::unique_ptr<PlatformMapping> initPlatformMapping(PlatformType type) {
           ? std::make_unique<CloudRipperPlatformMapping>()
           : std::make_unique<CloudRipperPlatformMapping>(platformMappingStr);
     case PlatformType::PLATFORM_DARWIN:
+    case PlatformType::PLATFORM_DARWIN48V:
       return platformMappingStr.empty()
           ? std::make_unique<DarwinPlatformMapping>()
           : std::make_unique<DarwinPlatformMapping>(platformMappingStr);

diff --git a/fboss/agent/platforms/sai/SaiPlatform.cpp b/fboss/agent/platforms/sai/SaiPlatform.cpp
@@ -346,7 +346,9 @@ void SaiPlatform::initPorts() {
         platformMode == PlatformType::PLATFORM_WEDGE400 ||
         platformMode == PlatformType::PLATFORM_WEDGE400_GRANDTETON) {
       saiPort = std::make_unique<SaiBcmWedge400PlatformPort>(portId, this);
-    } else if (platformMode == PlatformType::PLATFORM_DARWIN) {
+    } else if (
+        platformMode == PlatformType::PLATFORM_DARWIN ||
+        platformMode == PlatformType::PLATFORM_DARWIN48V) {
       saiPort = std::make_unique<SaiBcmDarwinPlatformPort>(portId, this);
     } else if (platformMode == PlatformType::PLATFORM_MINIPACK) {
       saiPort = std::make_unique<SaiBcmMinipackPlatformPort>(portId, this);

diff --git a/fboss/agent/platforms/sai/SaiPlatformInit.cpp b/fboss/agent/platforms/sai/SaiPlatformInit.cpp
@@ -51,7 +51,9 @@ std::unique_ptr<SaiPlatform> chooseSaiPlatform(
     auto type = productInfo->getType();
     return std::make_unique<SaiBcmWedge400Platform>(
         std::move(productInfo), type, localMac, platformMappingStr);
-  } else if (productInfo->getType() == PlatformType::PLATFORM_DARWIN) {
+  } else if (
+      productInfo->getType() == PlatformType::PLATFORM_DARWIN ||
+      productInfo->getType() == PlatformType::PLATFORM_DARWIN48V) {
     return std::make_unique<SaiBcmDarwinPlatform>(
         std::move(productInfo), localMac, platformMappingStr);
   } else if (productInfo->getType() == PlatformType::PLATFORM_MINIPACK) {

diff --git a/fboss/agent/platforms/tests/utils/CreateTestPlatform.cpp b/fboss/agent/platforms/tests/utils/CreateTestPlatform.cpp
@@ -47,7 +47,9 @@ std::unique_ptr<Platform> createTestPlatform() {
     return std::make_unique<BcmTestYampPlatform>(std::move(productInfo));
   } else if (mode == PlatformType::PLATFORM_WEDGE400) {
     return std::make_unique<BcmTestWedge400Platform>(std::move(productInfo));
-  } else if (mode == PlatformType::PLATFORM_DARWIN) {
+  } else if (
+      mode == PlatformType::PLATFORM_DARWIN ||
+      mode == PlatformType::PLATFORM_DARWIN48V) {
     return std::make_unique<BcmTestDarwinPlatform>(std::move(productInfo));
   } else if (mode == PlatformType::PLATFORM_FUJI) {
     return std::make_unique<BcmTestFujiPlatform>(std::move(productInfo));

diff --git a/fboss/agent/test/agent_hw_tests/AgentRouteOverflowTests.cpp b/fboss/agent/test/agent_hw_tests/AgentRouteOverflowTests.cpp
@@ -50,6 +50,7 @@ TEST_F(AgentRouteOverflowTest, overflowRoutes) {
     case PlatformType::PLATFORM_MINIPACK:
     case PlatformType::PLATFORM_YAMP:
     case PlatformType::PLATFORM_DARWIN:
+    case PlatformType::PLATFORM_DARWIN48V:
       /*
        * A route distribution 200,000 /128 does overflow the ASIC tables
        * but it takes 15min to generate, program and clean up such a

diff --git a/fboss/led_service/LedManagerInit.cpp b/fboss/led_service/LedManagerInit.cpp
@@ -36,7 +36,9 @@ std::unique_ptr<LedManager> createLedManager() {
     return std::make_unique<YampLedManager>();
   } else if (mode == PlatformType::PLATFORM_ELBERT) {
     return std::make_unique<ElbertLedManager>();
-  } else if (mode == PlatformType::PLATFORM_DARWIN) {
+  } else if (
+      mode == PlatformType::PLATFORM_DARWIN ||
+      mode == PlatformType::PLATFORM_DARWIN48V) {
     return std::make_unique<DarwinLedManager>();
   } else if (mode == PlatformType::PLATFORM_WEDGE400) {
     return std::make_unique<Wedge400LedManager>();

diff --git a/fboss/lib/if/fboss_common.thrift b/fboss/lib/if/fboss_common.thrift
@@ -42,4 +42,5 @@ enum PlatformType {
   PLATFORM_MERU800BFA_P1 = 34,
   PLATFORM_MERU800BIAB = 35,
   PLATFORM_YANGRA = 36,
+  PLATFORM_DARWIN48V = 37,
 }
diff --git a/fboss/lib/platforms/PlatformMode.h b/fboss/lib/platforms/PlatformMode.h
@@ -52,6 +52,8 @@ inline std::string toString(PlatformType mode) {
       return "CLOUDRIPPER";
     case PlatformType::PLATFORM_DARWIN:
       return "DARWIN";
+    case PlatformType::PLATFORM_DARWIN48V:
+      return "DARWIN48V";
     case PlatformType::PLATFORM_LASSEN_DEPRECATED:
       return "LASSEN";
     case PlatformType::PLATFORM_SANDIA:

diff --git a/fboss/lib/platforms/PlatformProductInfo.cpp b/fboss/lib/platforms/PlatformProductInfo.cpp
@@ -79,6 +79,8 @@ void PlatformProductInfo::initMode() {
     } else if (
         modelName.find("Wedge400") == 0 || modelName.find("WEDGE400") == 0) {
       type_ = PlatformType::PLATFORM_WEDGE400;
+    } else if (modelName.find("DARWIN48V") == 0) {
+      type_ = PlatformType::PLATFORM_DARWIN48V;
     } else if (
         modelName.find("Darwin") == 0 || modelName.find("DARWIN") == 0 ||
         modelName.find("DCS-7060") == 0 || modelName.find("Rackhawk") == 0) {

diff --git a/fboss/platform/configs/darwin48v/led_manager.json b/fboss/platform/configs/darwin48v/led_manager.json
@@ -0,0 +1,94 @@
+{
+    "systemLedConfig": {
+      "presentLedColor": 1,
+      "presentLedSysfsPath": "/sys/class/leds/sys_led:green:status/brightness",
+      "absentLedColor": 2,
+      "absentLedSysfsPath": "/sys/class/leds/sys_led:red:status/brightness"
+    },
+    "fruTypeLedConfigs": {
+      "FAN": {
+        "presentLedColor": 1,
+        "presentLedSysfsPath": "/sys/class/leds/fan_led:green:status/brightness",
+        "absentLedColor": 2,
+        "absentLedSysfsPath": "/sys/class/leds/fan_led:red:status/brightness"
+      },
+      "PSU": {
+        "presentLedColor": 1,
+        "presentLedSysfsPath": "/sys/class/leds/psu_led:green:status/brightness",
+        "absentLedColor": 2,
+        "absentLedSysfsPath": "/sys/class/leds/psu_led:red:status/brightness"
+      }
+    },
+    "fruConfigs": [
+      {
+        "fruName": "FAN1",
+        "fruType": "FAN",
+        "presenceDetection": {
+          "sysfsFileHandle": {
+            "presenceFilePath": "/run/devmap/sensors/FAN_CPLD/fan1_present",
+            "desiredValue": 1
+          }
+        }
+      },
+      {
+        "fruName": "FAN2",
+        "fruType": "FAN",
+        "presenceDetection": {
+          "sysfsFileHandle": {
+            "presenceFilePath": "/run/devmap/sensors/FAN_CPLD/fan2_present",
+            "desiredValue": 1
+          }
+        }
+      },
+      {
+        "fruName": "FAN3",
+        "fruType": "FAN",
+        "presenceDetection": {
+          "sysfsFileHandle": {
+            "presenceFilePath": "/run/devmap/sensors/FAN_CPLD/fan3_present",
+            "desiredValue": 1
+          }
+        }
+      },
+      {
+        "fruName": "FAN4",
+        "fruType": "FAN",
+        "presenceDetection": {
+          "sysfsFileHandle": {
+            "presenceFilePath": "/run/devmap/sensors/FAN_CPLD/fan4_present",
+            "desiredValue": 1
+          }
+        }
+      },
+      {
+        "fruName": "FAN5",
+        "fruType": "FAN",
+        "presenceDetection": {
+          "sysfsFileHandle": {
+            "presenceFilePath": "/run/devmap/sensors/FAN_CPLD/fan5_present",
+            "desiredValue": 1
+          }
+        }
+      },
+      {
+        "fruName": "FAN6",
+        "fruType": "FAN",
+        "presenceDetection": {
+          "sysfsFileHandle": {
+            "presenceFilePath": "/run/devmap/fpgas/SCD_FPGA/rackmon_present",
+            "desiredValue": 1
+          }
+        }
+      },
+      {
+        "fruName": "PSU1",
+        "fruType": "PSU",
+        "presenceDetection": {
+          "sysfsFileHandle": {
+            "presenceFilePath": "/run/devmap/fpgas/SCD_FPGA/pem_present",
+            "desiredValue": 1
+          }
+        }
+      }
+    ]
+  }
diff --git a/fboss/qsfp_service/test/hw_test/HwXphyFirmwareTest.cpp b/fboss/qsfp_service/test/hw_test/HwXphyFirmwareTest.cpp
@@ -45,6 +45,7 @@ TEST_F(HwXphyFirmwareTest, CheckDefaultXphyFirmwareVersion) {
     case PlatformType::PLATFORM_WEDGE400:
     case PlatformType::PLATFORM_WEDGE400_GRANDTETON:
     case PlatformType::PLATFORM_DARWIN:
+    case PlatformType::PLATFORM_DARWIN48V:
     case PlatformType::PLATFORM_LASSEN_DEPRECATED:
     case PlatformType::PLATFORM_MERU400BIU:
     case PlatformType::PLATFORM_MERU800BIA: