P4RT-5.3: Cisco fix (#5650)

* local p4rt changes

* draft p4rt-5.3

* test commit

* better defer

Author: karthikeya-remilla

feature/p4rt/otg_tests/traceroute_packetin_with_vrf_selection_test/metadata.textproto

@@ -41,3 +41,17 @@ platform_exceptions: {
     interface_ref_interface_id_format: true
   }
 }
+platform_exceptions: {
+  platform: {
+    vendor: CISCO
+  }
+  deviations: {
+    interface_id_format_required_for_policy_forwarding: true
+    pf_require_match_default_rule: true
+    pf_require_sequential_order_pbr_rules: true
+    isis_single_topology_required: true
+    gribi_mac_override_with_static_arp: true
+    use_interface_name_for_ibgp_neighbor_transport_ipv4_local_address: true
+  }
+}
+

feature/p4rt/otg_tests/traceroute_packetin_with_vrf_selection_test/packetin_test.go

@@ -104,6 +104,7 @@ func decodePacket6(t *testing.T, packetData []byte) uint8 {
 // number of packets sent out.
 func testTraffic(t *testing.T, top gosnappi.Config, ate *ondatra.ATEDevice, flows []gosnappi.Flow, srcEndPoint gosnappi.Port, duration int, cs gosnappi.ControlState) int {
 	t.Helper()
+	initialOutPkts := make(map[string]uint64, len(flows))
 	top.Flows().Clear()
 	for _, flow := range flows {
 		flow.TxRx().Port().SetTxName(srcEndPoint.Name()).SetRxName(srcEndPoint.Name())
@@ -113,17 +114,20 @@ func testTraffic(t *testing.T, top gosnappi.Config, ate *ondatra.ATEDevice, flow
 	ate.OTG().PushConfig(t, top)
 	ate.OTG().StartProtocols(t)
 	time.Sleep(30 * time.Second)
+	for _, flow := range flows {
+		initialOutPkts[flow.Name()] = gnmi.Get(t, ate.OTG(), gnmi.OTG().Flow(flow.Name()).Counters().OutPkts().State())
+	}
 	ate.OTG().StartTraffic(t)
 	time.Sleep(time.Duration(duration) * time.Second)
 	ate.OTG().StopTraffic(t)
 
 	cs.Port().Capture().SetState(gosnappi.StatePortCaptureState.STOP)
 	ate.OTG().SetControlState(t, cs)
 
-	outPkts := gnmi.GetAll(t, ate.OTG(), gnmi.OTG().FlowAny().Counters().OutPkts().State())
 	total := 0
-	for _, count := range outPkts {
-		total += int(count)
+	for _, flow := range flows {
+		current := gnmi.Get(t, ate.OTG(), gnmi.OTG().Flow(flow.Name()).Counters().OutPkts().State())
+		total += int(current - initialOutPkts[flow.Name()])
 	}
 	return total
 }
@@ -132,21 +136,15 @@ func testTraffic(t *testing.T, top gosnappi.Config, ate *ondatra.ATEDevice, flow
 // then validates packetin message metadata and payload.
 func testPacketIn(ctx context.Context, t *testing.T, args *testArgs, isIPv4 bool, cs gosnappi.ControlState, flowValues []*flowArgs, EgressPortMap map[string]bool) []float64 {
 	leader := args.leader
-	if isIPv4 {
-		// Insert p4rtutils acl entry on the DUT
-		if err := programmTableEntry(leader, args.packetIO, false, isIPv4); err != nil {
-			t.Fatalf("There is error when programming entry")
-		}
-		// Delete p4rtutils acl entry on the device
-		defer programmTableEntry(leader, args.packetIO, true, isIPv4)
-	} else {
-		// Insert p4rtutils acl entry on the DUT
-		if err := programmTableEntry(leader, args.packetIO, false, false); err != nil {
-			t.Fatalf("There is error when programming entry")
-		}
-		// Delete p4rtutils acl entry on the device
-		defer programmTableEntry(leader, args.packetIO, true, false)
+	if err := programmTableEntry(leader, args.packetIO, false, true); err != nil {
+		t.Fatalf("There is error when programming IPv4 entry")
 	}
+	defer programmTableEntry(leader, args.packetIO, true, true)
+	if err := programmTableEntry(leader, args.packetIO, false, false); err != nil {
+		t.Fatalf("There is error when programming IPv6 entry")
+	}
+	defer programmTableEntry(leader, args.packetIO, true, false)
+
 	streamChan := args.leader.StreamChannelGet(&streamName)
 	qSize := 12000
 	streamChan.SetArbQSize(qSize)
@@ -215,13 +213,13 @@ func testPacketIn(ctx context.Context, t *testing.T, args *testArgs, isIPv4 bool
 					}
 					if wantPacket.TTL != nil {
 						// TTL/HopLimit comparison for IPV4 & IPV6
-						if isIPv4 {
+						switch etherType {
+						case layers.EthernetTypeIPv4:
 							captureTTL := decodePacket4(t, packet.Pkt.GetPayload())
 							if captureTTL != TTL1 {
 								t.Fatalf("Packet in PacketIn message is not matching wanted packet=IPV4 TTL1")
 							}
-
-						} else {
+						case layers.EthernetTypeIPv6:
 							captureHopLimit := decodePacket6(t, packet.Pkt.GetPayload())
 							if captureHopLimit != HopLimit1 {
 								t.Fatalf("Packet in PacketIn message is not matching wanted packet=IPV6 HopLimit1")

feature/p4rt/otg_tests/traceroute_packetin_with_vrf_selection_test/traceroute_packetin_with_vrf_selection_test.go

@@ -742,6 +742,11 @@ func configureISIS(t *testing.T, dut *ondatra.DUTDevice, intfName, dutAreaAddres
 	globalISIS.Net = []string{fmt.Sprintf("%v.%v.00", dutAreaAddress, dutSysID)}
 	globalISIS.GetOrCreateAf(oc.IsisTypes_AFI_TYPE_IPV4, oc.IsisTypes_SAFI_TYPE_UNICAST).Enabled = ygot.Bool(true)
 	globalISIS.GetOrCreateAf(oc.IsisTypes_AFI_TYPE_IPV6, oc.IsisTypes_SAFI_TYPE_UNICAST).Enabled = ygot.Bool(true)
+	if deviations.ISISSingleTopologyRequired(dut) {
+		afv6 := globalISIS.GetOrCreateAf(oc.IsisTypes_AFI_TYPE_IPV6, oc.IsisTypes_SAFI_TYPE_UNICAST)
+		afv6.GetOrCreateMultiTopology().SetAfiName(oc.IsisTypes_AFI_TYPE_IPV4)
+		afv6.GetOrCreateMultiTopology().SetSafiName(oc.IsisTypes_SAFI_TYPE_UNICAST)
+	}
 
 	lspBit := globalISIS.GetOrCreateLspBit().GetOrCreateOverloadBit()
 	lspBit.SetBit = ygot.Bool(false)
@@ -808,7 +813,11 @@ func bgpCreateNbr(localAs uint32, dut *ondatra.DUTDevice) *oc.NetworkInstance_Pr
 	bgpNbr.PeerAs = ygot.Uint32(localAs)
 	bgpNbr.Enabled = ygot.Bool(true)
 	bgpNbrT := bgpNbr.GetOrCreateTransport()
-	bgpNbrT.LocalAddress = ygot.String(dutlo0Attrs.IPv4)
+	localAddressLeaf := dutlo0Attrs.IPv4
+	if deviations.UseInterfaceNameForIBGPNeighborTransportIpv4LocalAddress(dut) {
+		localAddressLeaf = loopbackIntfName
+	}
+	bgpNbrT.LocalAddress = ygot.String(localAddressLeaf)
 	af4 := bgpNbr.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST)
 	af4.Enabled = ygot.Bool(true)
 	af6 := bgpNbr.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST)
@@ -1163,7 +1172,7 @@ func testTunnelTrafficDecapEncap(ctx context.Context, t *testing.T, dut *ondatra
 	validateTrafficDistribution(t, args.ate, LoadBalancePercent, gotWeights)
 }
 
-// testTraceRoute  is to test Test FRR behaviors with encapsulation scenarios
+// testTraceRoute  is to test FRR behaviors with encapsulation scenarios
 func TestTraceRoute(t *testing.T) {
 	ctx := context.Background()
 	dut := ondatra.DUT(t, "dut")
@@ -1202,6 +1211,9 @@ func TestTraceRoute(t *testing.T) {
 		// staticARPWithMagicUniversalIP(t, dut)
 		baseScenario.StaticARPWithMagicUniversalIP(t, dut)
 	}
+	if deviations.GRIBIMACOverrideWithStaticARP(dut) {
+		baseScenario.StaticARPWithSpecificIP(t, dut)
+	}
 
 	t.Log("Install BGP route resolved by ISIS.")
 	t.Log("Configure ISIS on DUT")