Skip to content

[Nexthop][m4340nhp] Run AgentPortProfileTest on VOQ switches and Qumran4D #1886

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

Open
marif-nexthop wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[Nexthop][m4340nhp] Run AgentPortProfileTest on VOQ switches and Qumran4D #1886

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc1ed66
run AgentPortProfileTest on VOQ switches
marif-nexthop Oct 30, 2026
6072ab7
program the port profile at cold boot in AgentPortProfileTest on Qumr…
marif-nexthop Oct 30, 2026
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
45 changes: 26 additions & 19 deletions fboss/agent/test/agent_hw_tests/AgentPortProfileTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,18 @@ class AgentPortProfileTest : public AgentHwTest {
// InterfaceType::PORT), and SaiPortManager::changePortByRecreate does not
// chain delete them. Reprogramming a port to a profile with a different lane
// count therefore removes the port while its RIF is still attached, which the
// SDK rejects with OBJECT IN USE. Program the profile as part of the initial
// config instead, so the ports come up on it at cold boot and are never
// recreated.
// SDK rejects with OBJECT IN USE. Qumran4D is the same: its port RIF (an
// in-LIF and a my-MAC entry on the port) keeps the SDK from removing the
// port. Program the profile as part of the initial config instead, so the
// ports come up on it at cold boot and are never recreated.
static bool programProfileInInitialConfig(const AgentEnsemble& ensemble) {
auto l3Asics = ensemble.getHwAsicTable()->getL3Asics();
return !l3Asics.empty() &&
l3Asics.front()->getAsicVendor() ==
HwAsic::AsicVendor::ASIC_VENDOR_CHENAB;
if (l3Asics.empty()) {
return false;
}
const auto* asic = l3Asics.front();
return asic->getAsicVendor() == HwAsic::AsicVendor::ASIC_VENDOR_CHENAB ||
asic->getAsicType() == cfg::AsicType::ASIC_TYPE_QUMRAN4D;
}

cfg::SwitchConfig initialConfig(
Expand Down Expand Up @@ -240,19 +244,22 @@ class AgentPortProfileTest : public AgentHwTest {
auto setup = [=, this]() {
if (programProfileInInitialConfig(*getAgentEnsemble())) {
// Profile is already programmed by initialConfig(). Reapplying it here
// would recreate the ports, which Chenab does not support.
// would recreate the ports, which Chenab and Qumran4D do not support.
return;
}
auto lbMode =
getAgentEnsemble()->getL3Asics().front()->desiredLoopbackModes();
auto config = utility::oneL3IntfTwoPortConfig(
getAgentEnsemble()->getPlatformMapping(),
getAgentEnsemble()->getL3Asics().front(),
availablePorts[0],
availablePorts[1],
getAgentEnsemble()->supportsAddRemovePort(),
lbMode);
for (auto port : {availablePorts[0], availablePorts[1]}) {
const auto* asic = getAgentEnsemble()->getL3Asics().front();
// oneL3IntfTwoPortConfig() builds a VLAN interface, and VOQ switches
// have no VLANs; start from the per-port interface config instead.
auto config = asic->getSwitchType() == cfg::SwitchType::VOQ
? initialConfig(*getAgentEnsemble())
: utility::oneL3IntfTwoPortConfig(
getAgentEnsemble()->getPlatformMapping(),
asic,
availablePorts[0],
availablePorts[1],
getAgentEnsemble()->supportsAddRemovePort(),
asic->desiredLoopbackModes());
for (const auto& port : {availablePorts[0], availablePorts[1]}) {
utility::configurePortProfile(
getAgentEnsemble()->getPlatformMapping(),
getAgentEnsemble()->supportsAddRemovePort(),
Expand All @@ -270,8 +277,8 @@ class AgentPortProfileTest : public AgentHwTest {
// verifyPort() checks the hardware against whatever profile the port
// currently carries, so a port left on its default profile would still
// pass and the test would silently cover the wrong profile. On Chenab
// setup() is a no-op and nothing else asserts the profile was applied,
// so assert it here.
// and Qumran4D setup() is a no-op and nothing else asserts the profile
// was applied, so assert it here.
auto port = getProgrammedState()->getPorts()->getNodeIf(portID);
ASSERT_NE(port, nullptr);
EXPECT_EQ(port->getProfileID(), Profile);
Expand Down
Loading