Skip to content

[Cisco] Accept one fewer forwarded WRED packet on Ebro, Yuba, and G202X. #1865

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
ram316583 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Cisco] Accept one fewer forwarded WRED packet on Ebro, Yuba, and G202X. #1865

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
19 changes: 17 additions & 2 deletions fboss/agent/test/agent_hw_tests/AgentAqmTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,21 @@ class AgentAqmTest : public AgentHwTest {
const uint64_t kExpectedOutPackets = isEct(ecnCodePoint)
? numPacketsToSend
: numPacketsToSend - expectedMarkedOrDroppedPacketCount;
// Because of the test setup, Ebro, Yuba, and G202X might forward
// one packet fewer and drop one packet more. Accept that as well
// as the exact expected forward count.
uint64_t kMinOutPackets = kExpectedOutPackets;
switch (asic->getAsicType()) {
case cfg::AsicType::ASIC_TYPE_EBRO:
case cfg::AsicType::ASIC_TYPE_YUBA:
case cfg::AsicType::ASIC_TYPE_G202X:
if (!isEct(ecnCodePoint) && kExpectedOutPackets > 0) {
kMinOutPackets = kExpectedOutPackets - 1;
}
break;
default:
break;
}

bool useQueueStatsForAqm = asic->getSwitchType() == cfg::SwitchType::VOQ;
WITH_RETRIES_N_TIMED(10, std::chrono::milliseconds(1000), {
Expand All @@ -607,7 +622,7 @@ class AgentAqmTest : public AgentHwTest {
// - In case of ECN, ensure that ECN marked packet count is >= the
// expected marked packet count, this will ensure test case
// waiting long enough to for all marked packets to be seen.
EXPECT_EVENTUALLY_GE(outPackets, kExpectedOutPackets);
EXPECT_EVENTUALLY_GE(outPackets, kMinOutPackets);
if (isEct(ecnCodePoint)) {
EXPECT_EVENTUALLY_GE(
ecnMarking + markedCountBoundaryTolerance,
Expand All @@ -628,7 +643,7 @@ class AgentAqmTest : public AgentHwTest {

// Might see more outPackets than expected due to
// utility::sendPacketsWithQueueBuildup()
EXPECT_GE(deltaOutPackets, kExpectedOutPackets);
EXPECT_GE(deltaOutPackets, kMinOutPackets);
XLOG(DBG0) << "Delta out pkts: " << deltaOutPackets;

if (verifyPacketCountFn.has_value()) {
Expand Down
Loading