Skip to content

[Nexthop] Guard getNonSflowSampledInterfacePort against an unconfigured management port #1377

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
sazeed-nexthop wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −2
Open

[Nexthop] Guard getNonSflowSampledInterfacePort against an unconfigured management port #1377

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions fboss/agent/test/agent_hw_tests/AgentSflowMirrorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,13 +329,17 @@ class AgentSflowMirrorTest : public AgentHwTest {
}

PortID getNonSflowSampledInterfacePort() const {
return checkSameAndGetAsic()->isSupported(HwAsic::Feature::MANAGEMENT_PORT)
return checkSameAndGetAsic()->isSupported(
HwAsic::Feature::MANAGEMENT_PORT) &&
!masterLogicalPortIds({cfg::PortType::MANAGEMENT_PORT}).empty()
? masterLogicalPortIds({cfg::PortType::MANAGEMENT_PORT})[0]
: masterLogicalInterfacePortIds()[0];
}

cfg::PortType getNonSflowSampledInterfacePortType() const {
return checkSameAndGetAsic()->isSupported(HwAsic::Feature::MANAGEMENT_PORT)
return checkSameAndGetAsic()->isSupported(
HwAsic::Feature::MANAGEMENT_PORT) &&
!masterLogicalPortIds({cfg::PortType::MANAGEMENT_PORT}).empty()
? cfg::PortType::MANAGEMENT_PORT
: cfg::PortType::INTERFACE_PORT;
}
Expand Down