Skip to content

Commit

Permalink
Update Flow tracking bits from 12 to 10 (openconfig#2577)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ANISH-GOTTAPU @frasieroh
ANISH-GOTTAPU authored and frasieroh committed Jan 25, 2024
1 parent 13cdbdc commit 1ab78bb
Showing 1 changed file with 37 additions and 58 deletions.
95 changes: 37 additions & 58 deletions feature/experimental/gribi/otg_tests/backup_nhg_action/backup_nhg_action_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ const (
nhg103ID = 103
nh104ID = 104
nhg104ID = 104
baseSrcFlowFilter = "0x02" // hexadecimal value of last 6 bits of src 198.51.100.2
baseDstFlowFilter = "0x31" // hexadecimal value of first 6 bits of dst 198.51.100.1
encapSrcFlowFilter = "0x02" // hexadecimal value of last 6 bits of src 203.0.113.2
encapDstFlowFilter = "0x32" // hexadecimal value of first 6 bits of dst 203.0.113.1
decapSrcFlowFliter = "0x3f" // hexadecimal value of last 6 bits of src 198.18.0.255
decapDstFlowFliter = "0x31" // hexadecimal value of first 6 bits of dst 198.18.0.1
baseSrcFlowFilter = "0x02" // hexadecimal value of last 5 bits of src 198.51.100.2
baseDstFlowFilter = "0x18" // hexadecimal value of first 5 bits of dst 198.51.100.1
encapSrcFlowFilter = "0x02" // hexadecimal value of last 5 bits of src 203.0.113.2
encapDstFlowFilter = "0x19" // hexadecimal value of first 5 bits of dst 203.0.113.1
decapSrcFlowFliter = "0x1f" // hexadecimal value of last 5 bits of src 198.18.0.255
decapDstFlowFliter = "0x18" // hexadecimal value of first 5 bits of dst 198.18.0.1
ethernetCsmacd = oc.IETFInterfaces_InterfaceType_ethernetCsmacd
policyID = "match-ipip"
ipOverIPProtocol = 4
Expand Down Expand Up @@ -327,23 +327,19 @@ func testBackupDecap(ctx context.Context, t *testing.T, args *testArgs) {
t.Logf("Create flows with dst %s for each path", outerDstIP1)
baseFlow := createFlow(t, args.ate, args.top, "BaseFlow", &atePort2)
decapFlow := createFlow(t, args.ate, args.top, "DecapFlow", &atePort4)
updateFlows(t, args.ate, []gosnappi.Flow{baseFlow, decapFlow})
t.Run("ValidatePrimaryPath", func(t *testing.T) {
t.Log("Validate primary path traffic recieved ate port2 and no traffic on decap flow/port4")
validateTrafficFlows(t, args.ate, []gosnappi.Flow{baseFlow}, []gosnappi.Flow{decapFlow}, baseSrcFlowFilter, baseDstFlowFilter)
})
t.Log("Shutdown Port2")
p2 := args.dut.Port(t, "port2")
if deviations.ATEPortLinkStateOperationsUnsupported(args.ate) {
setDUTInterfaceWithState(t, args.dut, &dutPort2, p2, false)
defer setDUTInterfaceWithState(t, args.dut, &dutPort2, p2, true)
} else {
portStateAction := gosnappi.NewControlState()
linkState := portStateAction.Port().Link().SetPortNames([]string{"port2"}).SetState(gosnappi.StatePortLinkState.DOWN)
args.ate.OTG().SetControlState(t, portStateAction)
// Restore port state at end of test case.
linkState.SetState(gosnappi.StatePortLinkState.UP)
defer args.ate.OTG().SetControlState(t, portStateAction)
}
portStateAction := gosnappi.NewControlState()
linkState := portStateAction.Port().Link().SetPortNames([]string{"port2"}).SetState(gosnappi.StatePortLinkState.DOWN)
args.ate.OTG().SetControlState(t, portStateAction)
// Restore port state at end of test case.
linkState.SetState(gosnappi.StatePortLinkState.UP)
defer args.ate.OTG().SetControlState(t, portStateAction)

t.Log("Capture port2 status if down")
gnmi.Await(t, args.dut, gnmi.OC().Interface(p2.Name()).OperStatus().State(), 1*time.Minute, oc.Interface_OperStatus_DOWN)
Expand Down Expand Up @@ -425,25 +421,20 @@ func testDecapEncap(ctx context.Context, t *testing.T, args *testArgs) {
baseFlow := createFlow(t, args.ate, args.top, "BaseFlow", &atePort2)
encapFLow := createFlow(t, args.ate, args.top, "DecapEncapFlow", &atePort3)
decapFLow := createFlow(t, args.ate, args.top, "DecapFlow", &atePort4)
updateFlows(t, args.ate, []gosnappi.Flow{baseFlow, encapFLow, decapFLow})

t.Run("ValidatePrimaryPath", func(t *testing.T) {
t.Logf("Validate Primary path traffic recieved on port 2 and no traffic on other flows/ate ports")
validateTrafficFlows(t, args.ate, []gosnappi.Flow{baseFlow}, []gosnappi.Flow{encapFLow, decapFLow}, baseSrcFlowFilter, baseDstFlowFilter)
})

t.Log("Shutdown Port2")
dutP2 := args.dut.Port(t, "port2")
if deviations.ATEPortLinkStateOperationsUnsupported(args.ate) {
setDUTInterfaceWithState(t, args.dut, &dutPort2, dutP2, false)
defer setDUTInterfaceWithState(t, args.dut, &dutPort2, dutP2, true)
} else {
portStateAction := gosnappi.NewControlState()
linkState := portStateAction.Port().Link().SetPortNames([]string{"port2"}).SetState(gosnappi.StatePortLinkState.DOWN)
args.ate.OTG().SetControlState(t, portStateAction)
// Restore port state at end of test case.
linkState.SetState(gosnappi.StatePortLinkState.UP)
defer args.ate.OTG().SetControlState(t, portStateAction)
}
portStateAction := gosnappi.NewControlState()
linkState := portStateAction.Port().Link().SetPortNames([]string{"port2"}).SetState(gosnappi.StatePortLinkState.DOWN)
args.ate.OTG().SetControlState(t, portStateAction)
// Restore port state at end of test case.
linkState.SetState(gosnappi.StatePortLinkState.UP)
defer args.ate.OTG().SetControlState(t, portStateAction)

t.Log("Capture port2 status if down")
gnmi.Await(t, args.dut, gnmi.OC().Interface(p2.Name()).OperStatus().State(), 1*time.Minute, oc.Interface_OperStatus_DOWN)
Expand All @@ -457,18 +448,12 @@ func testDecapEncap(ctx context.Context, t *testing.T, args *testArgs) {
})

t.Log("Shutdown Port3")
dutP3 := args.dut.Port(t, "port3")
if deviations.ATEPortLinkStateOperationsUnsupported(args.ate) {
setDUTInterfaceWithState(t, args.dut, &dutPort3, dutP3, false)
defer setDUTInterfaceWithState(t, args.dut, &dutPort3, dutP3, true)
} else {
portStateAction := gosnappi.NewControlState()
linkState := portStateAction.Port().Link().SetPortNames([]string{"port3"}).SetState(gosnappi.StatePortLinkState.DOWN)
args.ate.OTG().SetControlState(t, portStateAction)
// Restore port state at end of test case.
linkState.SetState(gosnappi.StatePortLinkState.UP)
defer args.ate.OTG().SetControlState(t, portStateAction)
}
portStateAction = gosnappi.NewControlState()
linkState = portStateAction.Port().Link().SetPortNames([]string{"port3"}).SetState(gosnappi.StatePortLinkState.DOWN)
args.ate.OTG().SetControlState(t, portStateAction)
// Restore port state at end of test case.
linkState.SetState(gosnappi.StatePortLinkState.UP)
defer args.ate.OTG().SetControlState(t, portStateAction)

t.Log("Capture port3 status if down")
p3 := args.dut.Port(t, "port3")
Expand Down Expand Up @@ -499,24 +484,28 @@ func createFlow(t *testing.T, ate *ondatra.ATEDevice, top gosnappi.Config, name
flow.EgressPacket().Add().Ethernet()
ipTracking := flow.EgressPacket().Add().Ipv4()
ipSrcTracking := ipTracking.Src().MetricTags().Add()
ipSrcTracking.SetName(srcTrackingName).SetOffset(26).SetLength(6)
ipSrcTracking.SetName(srcTrackingName).SetOffset(27).SetLength(5)
ipDstTracking := ipTracking.Dst().MetricTags().Add()
ipDstTracking.SetName(dstTrackingName).SetOffset(0).SetLength(6)
ipDstTracking.SetName(dstTrackingName).SetOffset(0).SetLength(5)

return flow
}

// TODO: Egress Tracking to verify the correctness of packet after decap or encap needs to be added
// validateTrafficFlows verifies that the flow on ATE, traffic should pass for good flow and fail for bad flow.
func validateTrafficFlows(t *testing.T, ate *ondatra.ATEDevice, good []gosnappi.Flow, bad []gosnappi.Flow, srcFlowFilter string, dstFlowFilter string) {
func updateFlows(t *testing.T, ate *ondatra.ATEDevice, flows []gosnappi.Flow) {
top := ate.OTG().FetchConfig(t)
top.Flows().Clear()
for _, flow := range append(good, bad...) {
for _, flow := range flows {
top.Flows().Append(flow)
}
ate.OTG().PushConfig(t, top)

ate.OTG().StartProtocols(t)
}

// TODO: Egress Tracking to verify the correctness of packet after decap or encap needs to be added
// validateTrafficFlows verifies that the flow on ATE, traffic should pass for good flow and fail for bad flow.
func validateTrafficFlows(t *testing.T, ate *ondatra.ATEDevice, good []gosnappi.Flow, bad []gosnappi.Flow, srcFlowFilter string, dstFlowFilter string) {
top := ate.OTG().FetchConfig(t)
ate.OTG().StartTraffic(t)

time.Sleep(15 * time.Second)
Expand Down Expand Up @@ -557,7 +546,7 @@ func validateTrafficFlows(t *testing.T, ate *ondatra.ATEDevice, good []gosnappi.
if got := ets[0].GetCounters().GetInPkts(); got != uint64(inPkts) {
t.Errorf("EgressTracking counter in-pkts got %d, want %d", got, uint64(inPkts))
} else {
t.Logf("Received %d packets with %s as the last 6 bits of the src IP and %s as first 6 bits of dst IP ", got, srcFlowFilter, dstFlowFilter)
t.Logf("Received %d packets with %s as the last 5 bits of the src IP and %s as first 5 bits of dst IP ", got, srcFlowFilter, dstFlowFilter)
}
}

Expand All @@ -572,13 +561,3 @@ func validateTrafficFlows(t *testing.T, ate *ondatra.ATEDevice, good []gosnappi.
}
}
}

// setDUTInterfaceState sets the admin state on the dut interface
func setDUTInterfaceWithState(t testing.TB, dut *ondatra.DUTDevice, dutPort *attrs.Attributes, p *ondatra.Port, state bool) {
dc := gnmi.OC()
i := &oc.Interface{}
i.Enabled = ygot.Bool(state)
i.Type = ethernetCsmacd
i.Name = ygot.String(p.Name())
gnmi.Update(t, dut, dc.Interface(p.Name()).Config(), i)
}

0 comments on commit 1ab78bb

Please sign in to comment.