Skip to content

Fix a race condition in tunnel_test and basic_traffic_test #761

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

Merged
sonikajindal merged 2 commits into from
Oct 21, 2026
Merged

Fix a race condition in tunnel_test and basic_traffic_test #761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c671d0
Update basic_traffic_test.go
gavinz-ship-it Oct 21, 2026
35655e2
Update tunnel_test.go
gavinz-ship-it Oct 21, 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
16 changes: 6 additions & 10 deletions integration_tests/dataplane/basictraffic/basic_traffic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,7 @@ func TestTraffic(t *testing.T) {
dut := ondatra.DUT(t, "dut")
configureDUT(t, dut)

loss := testTraffic(t, ate, ateTop, atePort1, dutPort1, atePort2)
if loss > 1 {
t.Errorf("loss %f, greater than 1", loss)
}
testTraffic(t, ate, ateTop, atePort1, dutPort1, atePort2)
}

// configureATE configures port1 and port2 on the ATE.
Expand All @@ -207,9 +204,9 @@ func configureATE(t *testing.T, ate *ondatra.ATEDevice) gosnappi.Config {
}

// testTraffic generates traffic flow from source network to
// destination network via srcEndPoint to dstEndPoint and checks for
// packet loss and returns loss percentage as float.
func testTraffic(t *testing.T, ate *ondatra.ATEDevice, top gosnappi.Config, srcEndPoint, srcPeerEndpoint, dstEndPoint attrs.Attributes) float32 {
// destination network via srcEndPoint to dstEndPoint and checks that
// all packets are received.
func testTraffic(t *testing.T, ate *ondatra.ATEDevice, top gosnappi.Config, srcEndPoint, srcPeerEndpoint, dstEndPoint attrs.Attributes) {
otg := ate.OTG()
top.Flows().Clear().Items()

Expand All @@ -233,9 +230,8 @@ func testTraffic(t *testing.T, ate *ondatra.ATEDevice, top gosnappi.Config, srcE

otg.PushConfig(t, top)
otg.StartTraffic(t)
defer otg.StopTraffic(t)

gnmi.Await(t, otg, gnmi.OTG().Flow("Flow").Counters().OutPkts().State(), 5*time.Second, txPkts)
rxPkts := gnmi.Get(t, otg, gnmi.OTG().Flow("Flow").Counters().InPkts().State())
lossPct := (txPkts - rxPkts) * 100 / txPkts
return float32(lossPct)
gnmi.Await(t, otg, gnmi.OTG().Flow("Flow").Counters().InPkts().State(), 5*time.Second, txPkts)
}
16 changes: 6 additions & 10 deletions integration_tests/dataplane/tunnel/tunnel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,10 +318,7 @@ func TestTunnelEncapDecap(t *testing.T) {
createTunnelDecapEntry(t, dut2, dut2Rif2, 0, saipb.TunnelType_TUNNEL_TYPE_IPINIP, "", "20.20.20.20/32")
createConnectedRouteAndNeighbor(t, dut2, dut2Rif2, 0, fmt.Sprint(dut2Port2.IPv4, "/", dut2Port2.IPv4Len), atePort2.IPv4, atePort2.MAC)

loss := testTraffic(t, ate, ateTop, atePort1, atePort2)
if loss > 1 {
t.Errorf("loss %f, greater than 1", loss)
}
testTraffic(t, ate, ateTop, atePort1, atePort2)
}

// configureATE configures port1 and port2 on the ATE.
Expand All @@ -337,9 +334,9 @@ func configureATE(t *testing.T, ate *ondatra.ATEDevice) gosnappi.Config {
}

// testTraffic generates traffic flow from source network to
// destination network via srcEndPoint to dstEndPoint and checks for
// packet loss and returns loss percentage as float.
func testTraffic(t *testing.T, ate *ondatra.ATEDevice, top gosnappi.Config, srcEndPoint, dstEndPoint attrs.Attributes) float32 {
// destination network via srcEndPoint to dstEndPoint and checks that
// all packets are received.
func testTraffic(t *testing.T, ate *ondatra.ATEDevice, top gosnappi.Config, srcEndPoint, dstEndPoint attrs.Attributes) {
otg := ate.OTG()
top.Flows().Clear().Items()

Expand All @@ -364,9 +361,8 @@ func testTraffic(t *testing.T, ate *ondatra.ATEDevice, top gosnappi.Config, srcE
otg.PushConfig(t, top)

otg.StartTraffic(t)
defer otg.StopTraffic(t)

gnmi.Await(t, otg, gnmi.OTG().Flow("Flow").Counters().OutPkts().State(), 5*time.Second, txPkts)
rxPkts := gnmi.Get(t, otg, gnmi.OTG().Flow("Flow").Counters().InPkts().State())
lossPct := (txPkts - rxPkts) * 100 / txPkts
return float32(lossPct)
gnmi.Await(t, otg, gnmi.OTG().Flow("Flow").Counters().InPkts().State(), 5*time.Second, txPkts)
}
Loading