Skip to content

Meru800biac: define new platform, add platform and port mapping #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
huyc-arista wants to merge 4 commits into from
Closed

Meru800biac: define new platform, add platform and port mapping #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f2b4bc1
Meru800biac: platform definition
huyc-arista Jul 25, 2025
c0fe766
Merge branch 'main' into meru800biac_platform_support
huyc-arista Jul 30, 2025
da20c8c
Meru800biac: Update platform enum
huyc-arista Aug 5, 2025
3b7641d
Meru80biac: reference meru800bia platform mapping, platform port mapping
huyc-arista Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions fboss/agent/platforms/common/PlatformMappingUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ std::unique_ptr<PlatformMapping> initPlatformMapping(PlatformType type) {
: std::make_unique<Meru400biuPlatformMapping>(platformMappingStr);
case PlatformType::PLATFORM_MERU800BIA:
case PlatformType::PLATFORM_MERU800BIAB:
case PlatformType::PLATFORM_MERU800BIAC:
return platformMappingStr.empty()
? std::make_unique<Meru800biaPlatformMapping>()
: std::make_unique<Meru800biaPlatformMapping>(platformMappingStr);
Expand Down
3 changes: 2 additions & 1 deletion fboss/agent/platforms/sai/SaiPlatform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,8 @@ void SaiPlatform::initPorts() {
saiPort = std::make_unique<SaiMeru400biuPlatformPort>(portId, this);
} else if (
platformMode == PlatformType::PLATFORM_MERU800BIA ||
platformMode == PlatformType::PLATFORM_MERU800BIAB) {
platformMode == PlatformType::PLATFORM_MERU800BIAB ||
platformMode == PlatformType::PLATFORM_MERU800BIAC) {
saiPort = std::make_unique<SaiMeru800biaPlatformPort>(portId, this);
} else if (platformMode == PlatformType::PLATFORM_MERU400BIA) {
saiPort = std::make_unique<SaiMeru400biaPlatformPort>(portId, this);
Expand Down
3 changes: 2 additions & 1 deletion fboss/agent/platforms/sai/SaiPlatformInit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ std::unique_ptr<SaiPlatform> chooseSaiPlatform(
std::move(productInfo), localMac, platformMappingStr);
} else if (
productInfo->getType() == PlatformType::PLATFORM_MERU800BIA ||
productInfo->getType() == PlatformType::PLATFORM_MERU800BIAB) {
productInfo->getType() == PlatformType::PLATFORM_MERU800BIAB ||
productInfo->getType() == PlatformType::PLATFORM_MERU800BIAC) {
return std::make_unique<SaiMeru800biaPlatform>(
std::move(productInfo), localMac, platformMappingStr);
} else if (productInfo->getType() == PlatformType::PLATFORM_MERU800BFA) {
Expand Down
1 change: 1 addition & 0 deletions fboss/lib/if/fboss_common.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ enum PlatformType {
PLATFORM_DARWIN48V = 37,
PLATFORM_MINIPACK3N = 38,
PLATFORM_ICECUBE800BC = 39,
PLATFORM_MERU800BIAC = 40,

# Placeholder for unknown platform type
PLATFORM_UNKNOWN = 1000,
Expand Down
2 changes: 2 additions & 0 deletions fboss/lib/platforms/PlatformMode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ inline std::string toString(PlatformType mode) {
return "MERU800BIA";
case PlatformType::PLATFORM_MERU800BIAB:
return "MERU800BIAB";
case PlatformType::PLATFORM_MERU800BIAC:
return "MERU800BIAC";
case PlatformType::PLATFORM_MERU800BFA:
return "MERU800BFA";
case PlatformType::PLATFORM_MERU800BFA_P1:
Expand Down
6 changes: 6 additions & 0 deletions fboss/lib/platforms/PlatformProductInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ void PlatformProductInfo::initMode() {
modelName.find("DCS-DL-7700R4C-38PE-B-AC-F") == 0 ||
modelName.find("DCS-DL-7700R4C-38PE-B-DC-F") == 0) {
type_ = PlatformType::PLATFORM_MERU800BIAB;
} else if (
modelName.find("Meru800biac") == 0 ||
modelName.find("MERU800BIAC") == 0) {
type_ = PlatformType::PLATFORM_MERU800BIAC;
} else if (
modelName.find("Meru800bfa") == 0 ||
modelName.find("MERU800BFA") == 0 ||
Expand Down Expand Up @@ -218,6 +222,8 @@ void PlatformProductInfo::initMode() {
type_ = PlatformType::PLATFORM_MERU800BIA;
} else if (FLAGS_mode == "meru800biab") {
type_ = PlatformType::PLATFORM_MERU800BIAB;
} else if (FLAGS_mode == "meru800biac") {
type_ = PlatformType::PLATFORM_MERU800BIAC;
} else if (FLAGS_mode == "meru800bfa") {
type_ = PlatformType::PLATFORM_MERU800BFA;
} else if (FLAGS_mode == "meru800bfa_p1") {
Expand Down