Resolving conflicts

openconfig · May 31, 2024 · 5bb4cdf · 5bb4cdf
1 parent 89ec484
commit 5bb4cdf
Show file tree

Hide file tree

Showing 2 changed files with 113 additions and 192 deletions.
diff --git a/feature/interface/staticarp/otg_tests/static_arp_test/static_arp_test.go b/feature/interface/staticarp/otg_tests/static_arp_test/static_arp_test.go
@@ -293,13 +293,12 @@ func testFlow(
 }
 
 func TestStaticARP(t *testing.T) {
-	// Configure the ATE
-	ate := ondatra.ATE(t, "ate")
-	config := configureATE(t)
-
 	// Configure the DUT with dynamic ARP.
 	configureDUT(t, noStaticMAC)
 
+	// Configure the ATE
+	ate := ondatra.ATE(t, "ate")
+	config := configureATE(t)
 	ate.OTG().StartProtocols(t)
 	otgutils.WaitForARP(t, ate.OTG(), config, "IPv4")
 	dstMac := gnmi.Get(t, ate.OTG(), gnmi.OTG().Interface(ateSrc.Name+".Eth").Ipv4Neighbor(dutSrc.IPv4).LinkLayerAddress().State())