diff --git a/fboss/agent/test/agent_hw_tests/AgentSflowMirrorTest.cpp b/fboss/agent/test/agent_hw_tests/AgentSflowMirrorTest.cpp index f867658e99c3e..7e15e3208da4b 100644 --- a/fboss/agent/test/agent_hw_tests/AgentSflowMirrorTest.cpp +++ b/fboss/agent/test/agent_hw_tests/AgentSflowMirrorTest.cpp @@ -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; }