Fixed link and code issue in the test

feature/gribi/mpls_in_udp/otg_tests/mpls_over_udp_tunnel_hashing_test/metadata.textproto

@@ -4,7 +4,7 @@
 uuid:  "f7622128-5fb5-4a9a-95b4-d66a6e59934e"
 plan_id:  "TE-18.4"
 description:  "ECMP hashing on outer and inner packets with MPLSoUDP encapsulation"
-testbed:  TESTBED_DUT_ATE_2LINKS
+testbed:  TESTBED_DUT_ATE_4LINKS
 platform_exceptions:  {
   platform:  {
     vendor:  ARISTA

feature/gribi/mpls_in_udp/otg_tests/mpls_over_udp_tunnel_hashing_test/mpls_over_udp_tunnel_hashing_test.go

@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"math/rand"
 	"os"
-	"slices"
 	"strings"
 	"testing"
 	"time"
@@ -157,32 +156,22 @@ func TestMPLSOverUDPTunnelHashing(t *testing.T) {
 	ConfigureDUTIntf(t, dut)
 
 	// configure ATE
-	topo := configureATE(t)
+	topo, interfaceNamesList := configureATE(t)
 	ate.OTG().PushConfig(t, topo)
-
 	ate.OTG().StartProtocols(t)
-	otgutils.WaitForARP(t, ate.OTG(), topo, "IPv4")
-	otgutils.WaitForARP(t, ate.OTG(), topo, "IPv6")
+	cfgplugins.IsIPv4InterfaceARPresolved(t, ate, cfgplugins.AddressFamilyParams{InterfaceNames: interfaceNamesList})
+	cfgplugins.IsIPv6InterfaceARPresolved(t, ate, cfgplugins.AddressFamilyParams{InterfaceNames: interfaceNamesList})
 
 	// Configure gRIBI client
-	c := gribi.Client{
-		DUT:         dut,
-		FIBACK:      true,
-		Persistence: true,
-	}
-
-	if err := c.Start(t); err != nil {
-		t.Fatalf("gRIBI Connection can not be established")
-	}
-	defer c.Close(t)
-	c.BecomeLeader(t)
-
-	// Flush all existing AFT entries and set up basic routing infrastructure
-	c.FlushAll(t)
-	programBasicEntries(t, dut, &c)
+	c := mustNewGRIBIClient(t, dut)
+	t.Cleanup(func() {
+		c.FlushAll(t)
+		c.Close(t)
+	})
+	programBasicEntries(t, dut, c)
 
 	// Verify basic infrastructure is properly installed
-	if err := c.AwaitTimeout(ctx, t, 3*time.Minute); err != nil {
+	if err := c.AwaitTimeout(ctx, t, 10*time.Second); err != nil {
 		t.Fatalf("Failed to install basic infrastructure entries: %v", err)
 	}
 
@@ -233,23 +222,7 @@ func TestMPLSOverUDPTunnelHashing(t *testing.T) {
 				WithOperationType(constants.Add).
 				AsResult(),
 		}
-		wantDelResults := []*client.OpResult{
-			fluent.OperationResult().
-				WithIPv6Operation(innerIPv6Prefix).
-				WithProgrammingResult(fluent.InstalledInRIB).
-				WithOperationType(constants.Delete).
-				AsResult(),
-			fluent.OperationResult().
-				WithNextHopGroupOperation(mplsNHGID).
-				WithProgrammingResult(fluent.InstalledInRIB).
-				WithOperationType(constants.Delete).
-				AsResult(),
-			fluent.OperationResult().
-				WithNextHopOperation(mplsNHID).
-				WithProgrammingResult(fluent.InstalledInRIB).
-				WithOperationType(constants.Delete).
-				AsResult(),
-		}
+
 		flows := []gosnappi.Flow{fa6.getFlow("ipv6", "ip6mpls", dscpEncapA1)}
 
 		c.AddEntries(t, entries, wantAddResults)
@@ -264,7 +237,7 @@ func TestMPLSOverUDPTunnelHashing(t *testing.T) {
 		}
 
 		tcArgs := &testArgs{
-			client: &c,
+			client: c,
 			dut:    dut,
 			ate:    ate,
 			topo:   topo,
@@ -292,10 +265,8 @@ func TestMPLSOverUDPTunnelHashing(t *testing.T) {
 		t.Log("Validate traffic flows")
 		validateTrafficFlows(t, ate, topo, tcArgs, flows, false, true)
 
-		// Clean up MPLS entries
-		t.Log("Deleting MPLS-in-UDP entries")
-		slices.Reverse(entries)
-		c.DeleteEntries(t, entries, wantDelResults)
+		// Flush all existing AFT entries and set up basic routing infrastructure
+		c.FlushAll(t)
 
 		// Verify traffic fails after deletion
 		t.Log("Verify traffic fails after entry deletion")
@@ -305,6 +276,24 @@ func TestMPLSOverUDPTunnelHashing(t *testing.T) {
 
 }
 
+// mustNewGRIBIClient creates a gRIBI client, starts the session, and fails the test if the client cannot be created or started.
+func mustNewGRIBIClient(t *testing.T, dut *ondatra.DUTDevice) *gribi.Client {
+	t.Helper()
+
+	c := &gribi.Client{
+		DUT:         dut,
+		FIBACK:      true,
+		Persistence: true,
+	}
+
+	if err := c.Start(t); err != nil {
+		t.Fatalf("gRIBI connection failed: %v", err)
+	}
+
+	c.BecomeLeader(t)
+	return c
+}
+
 func ConfigureDUTIntf(t *testing.T, dut *ondatra.DUTDevice) {
 	d := gnmi.OC()
 	p1 := dut.Port(t, "port1")
@@ -397,7 +386,7 @@ func configInterfaceDUT(p *ondatra.Port, a *attrs.Attributes, dut *ondatra.DUTDe
 }
 
 // configureATE sets up the ATE interfaces and BGP configurations.
-func configureATE(t *testing.T) gosnappi.Config {
+func configureATE(t *testing.T) (gosnappi.Config, []string) {
 	topo := gosnappi.NewConfig()
 	t.Log("Configure ATE interface")
 	port1 := topo.Ports().Add().SetName("port1")
@@ -437,7 +426,7 @@ func configureATE(t *testing.T) gosnappi.Config {
 	port4Ipv6 := port4Eth.Ipv6Addresses().Add().SetName(atePort4.Name + ".IPv6")
 	port4Ipv6.SetAddress(atePort4.IPv6).SetGateway(dutPort4.IPv6).SetPrefix(uint32(atePort4.IPv6Len))
 
-	return topo
+	return topo, []string{atePort1.Name, atePort2.Name, atePort3.Name, atePort4.Name}
 }
 
 func programBasicEntries(t *testing.T, dut *ondatra.DUTDevice, c *gribi.Client) {
@@ -569,9 +558,6 @@ func sendTraffic(t *testing.T, args *testArgs, flows []gosnappi.Flow, capture bo
 	otg.PushConfig(t, args.topo)
 	otg.StartProtocols(t)
 
-	otgutils.WaitForARP(t, args.ate.OTG(), args.topo, "IPv4")
-	otgutils.WaitForARP(t, args.ate.OTG(), args.topo, "IPv6")
-
 	if capture {
 		startCapture(t, args.ate)
 		defer stopCapture(t, args.ate)