From 4bb7539558424f08f231ff9c2b1faa89c25b50a6 Mon Sep 17 00:00:00 2001 From: aalamsi22 Date: Tue, 12 Nov 2024 20:06:52 +0000 Subject: [PATCH] add DARWIN48V platform references --- fboss/agent/hw/bcm/tests/BcmSwitchEnsemble.cpp | 3 ++- fboss/agent/hw/sai/diag/DiagShell.cpp | 3 +++ fboss/agent/hw/test/ProdConfigFactory.cpp | 1 + fboss/agent/platforms/common/PlatformMappingUtils.cpp | 1 + fboss/agent/platforms/sai/SaiPlatform.cpp | 4 +++- fboss/agent/platforms/sai/SaiPlatformInit.cpp | 4 +++- fboss/agent/platforms/tests/utils/CreateTestPlatform.cpp | 4 +++- fboss/agent/test/agent_hw_tests/AgentRouteOverflowTests.cpp | 1 + fboss/led_service/LedManagerInit.cpp | 2 +- fboss/platform/configs/darwin48v/led_manager.json | 2 +- 10 files changed, 19 insertions(+), 6 deletions(-) diff --git a/fboss/agent/hw/bcm/tests/BcmSwitchEnsemble.cpp b/fboss/agent/hw/bcm/tests/BcmSwitchEnsemble.cpp index aff3a6f735ee4..edc262b75b839 100644 --- 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 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 index e4ed57eb74dc1..197a29b4d2251 100644 --- a/fboss/agent/hw/sai/diag/DiagShell.cpp +++ b/fboss/agent/hw/sai/diag/DiagShell.cpp @@ -161,6 +161,7 @@ std::unique_ptr 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: @@ -396,6 +397,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: @@ -446,6 +448,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 index 286309aa6fa73..924aaddaaf935 100644 --- a/fboss/agent/hw/test/ProdConfigFactory.cpp +++ b/fboss/agent/hw/test/ProdConfigFactory.cpp @@ -109,6 +109,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 index 33cf32576407b..780077cbf0e5f 100644 --- a/fboss/agent/platforms/common/PlatformMappingUtils.cpp +++ b/fboss/agent/platforms/common/PlatformMappingUtils.cpp @@ -120,6 +120,7 @@ std::unique_ptr initPlatformMapping(PlatformType type) { ? std::make_unique() : std::make_unique(platformMappingStr); case PlatformType::PLATFORM_DARWIN: + case PlatformType::PLATFORM_DARWIN48V: return platformMappingStr.empty() ? std::make_unique() : std::make_unique(platformMappingStr); diff --git a/fboss/agent/platforms/sai/SaiPlatform.cpp b/fboss/agent/platforms/sai/SaiPlatform.cpp index 5f6ba55c39f26..65e040c0a408c 100644 --- a/fboss/agent/platforms/sai/SaiPlatform.cpp +++ b/fboss/agent/platforms/sai/SaiPlatform.cpp @@ -334,7 +334,9 @@ void SaiPlatform::initPorts() { platformMode == PlatformType::PLATFORM_WEDGE400 || platformMode == PlatformType::PLATFORM_WEDGE400_GRANDTETON) { saiPort = std::make_unique(portId, this); - } else if (platformMode == PlatformType::PLATFORM_DARWIN) { + } else if ( + platformMode == PlatformType::PLATFORM_DARWIN || + platformMode == PlatformType::PLATFORM_DARWIN48V) { saiPort = std::make_unique(portId, this); } else if (platformMode == PlatformType::PLATFORM_MINIPACK) { saiPort = std::make_unique(portId, this); diff --git a/fboss/agent/platforms/sai/SaiPlatformInit.cpp b/fboss/agent/platforms/sai/SaiPlatformInit.cpp index 821cfb4e2379b..e34a2cc921642 100644 --- a/fboss/agent/platforms/sai/SaiPlatformInit.cpp +++ b/fboss/agent/platforms/sai/SaiPlatformInit.cpp @@ -51,7 +51,9 @@ std::unique_ptr chooseSaiPlatform( auto type = productInfo->getType(); return std::make_unique( 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( 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 index d228fdb453b5d..86d624c7849ef 100644 --- a/fboss/agent/platforms/tests/utils/CreateTestPlatform.cpp +++ b/fboss/agent/platforms/tests/utils/CreateTestPlatform.cpp @@ -47,7 +47,9 @@ std::unique_ptr createTestPlatform() { return std::make_unique(std::move(productInfo)); } else if (mode == PlatformType::PLATFORM_WEDGE400) { return std::make_unique(std::move(productInfo)); - } else if (mode == PlatformType::PLATFORM_DARWIN) { + } else if ( + mode == PlatformType::PLATFORM_DARWIN || + mode == PlatformType::PLATFORM_DARWIN48V) { return std::make_unique(std::move(productInfo)); } else if (mode == PlatformType::PLATFORM_FUJI) { return std::make_unique(std::move(productInfo)); diff --git a/fboss/agent/test/agent_hw_tests/AgentRouteOverflowTests.cpp b/fboss/agent/test/agent_hw_tests/AgentRouteOverflowTests.cpp index 54dfc9c2c54ce..1c30da35a7646 100644 --- 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 index ea0613d204a17..13343e8acb445 100644 --- a/fboss/led_service/LedManagerInit.cpp +++ b/fboss/led_service/LedManagerInit.cpp @@ -56,4 +56,4 @@ std::unique_ptr createLedManager() { return nullptr; } -} // namespace facebook::fboss \ No newline at end of file +} // namespace facebook::fboss diff --git a/fboss/platform/configs/darwin48v/led_manager.json b/fboss/platform/configs/darwin48v/led_manager.json index 18610001fc9b5..354dac31fae0f 100644 --- a/fboss/platform/configs/darwin48v/led_manager.json +++ b/fboss/platform/configs/darwin48v/led_manager.json @@ -91,4 +91,4 @@ } } ] - } \ No newline at end of file + }