Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ const (
routeCount = 1
vrf1 = "TE_VRF_111"
vrf2 = "vrfB"
fps = 1000000 // traffic frames per second
switchovertime = 250.0 // switchovertime during interface shut in milliseconds
fps = 10000 // traffic frames per second
switchovertime = 250.0 // switchovertime during interface shut in milliseconds
ethernetCsmacd = oc.IETFInterfaces_InterfaceType_ethernetCsmacd
decapFlowSrc = "198.51.100.111"
dscpEncapA1 = 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ const (
routeCount = 1
vrf1 = "vrfA"
vrf2 = "vrfB"
fps = 1000000 // traffic frames per second
switchovertime = 250.0 // switchovertime during interface shut in milliseconds
fps = 10000 // traffic frames per second
switchovertime = 250.0 // switchovertime during interface shut in milliseconds
ethernetCsmacd = oc.IETFInterfaces_InterfaceType_ethernetCsmacd
)

Expand Down
2 changes: 2 additions & 0 deletions feature/gribi/otg_tests/ipv4_entry_test/ipv4_entry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,7 @@ func createTrafficFlows(t *testing.T, ate *ondatra.ATEDevice, good, bad []string
if len(good) == 0 && len(bad) == 0 {
otg.PushConfig(t, ateTop)
otg.StartProtocols(t)
otgutils.WaitForARP(t, otg, ateTop, "IPv4")
return newGoodFlows, newBadFlows
}
ateTop.Flows().Clear().Items()
Expand Down Expand Up @@ -574,6 +575,7 @@ func createTrafficFlows(t *testing.T, ate *ondatra.ATEDevice, good, bad []string
}
otg.PushConfig(t, ateTop)
otg.StartProtocols(t)
otgutils.WaitForARP(t, otg, ateTop, "IPv4")
return newGoodFlows, newBadFlows
}

Expand Down
15 changes: 11 additions & 4 deletions feature/gribi/otg_tests/ordering_ack_test/ordering_ack_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (
"github.com/openconfig/ondatra"
"github.com/openconfig/ondatra/gnmi"
"github.com/openconfig/ondatra/gnmi/oc"
"github.com/openconfig/ygnmi/ygnmi"
"github.com/openconfig/ygot/ygot"
)

Expand Down Expand Up @@ -369,8 +370,11 @@ func testModifyNHGIPv4(t *testing.T, args *testArgs) {
}
}
ipv4Path := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(args.dut)).Afts().Ipv4Entry(ateDstNetCIDR)
if got, want := gnmi.Get(t, args.dut, ipv4Path.State()).GetPrefix(), ateDstNetCIDR; got != want {
t.Errorf("ipv4-entry/state/prefix got %s, want %s", got, want)
if got, ok := gnmi.Watch(t, args.dut, ipv4Path.State(), time.Minute, func(val *ygnmi.Value[*oc.NetworkInstance_Afts_Ipv4Entry]) bool {
ipv4Entry, present := val.Val()
return present && ipv4Entry.GetPrefix() == ateDstNetCIDR
}).Await(t); !ok {
t.Errorf("ipv4-entry/state/prefix got %v, want %s", got, ateDstNetCIDR)
}
Comment thread
snaragund marked this conversation as resolved.
Outdated
}
})
Expand Down Expand Up @@ -449,8 +453,11 @@ func testModifyIPv4AddDelAdd(t *testing.T, args *testArgs) {

t.Run("Telemetry", func(t *testing.T) {
ipv4Path := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(args.dut)).Afts().Ipv4Entry(ateDstNetCIDR)
if got, want := gnmi.Get(t, args.dut, ipv4Path.State()).GetPrefix(), ateDstNetCIDR; got != want {
t.Errorf("ipv4-entry/state/prefix got %s, want %s", got, want)
if got, ok := gnmi.Watch(t, args.dut, ipv4Path.State(), time.Minute, func(val *ygnmi.Value[*oc.NetworkInstance_Afts_Ipv4Entry]) bool {
ipv4Entry, present := val.Val()
return present && ipv4Entry.GetPrefix() == ateDstNetCIDR
}).Await(t); !ok {
t.Errorf("ipv4-entry/state/prefix got %v, want %s", got, ateDstNetCIDR)
}
Comment thread
snaragund marked this conversation as resolved.
Outdated
})

Expand Down
Loading