TE-3.7_otg_mac_fix

feature/gribi/otg_tests/base_hierarchical_nhg_update/base_hierarchical_nhg_update_test.go

@@ -136,21 +136,25 @@ var (
 	}
 	atePort1 = attrs.Attributes{
 		Name:    "atePort1",
+		MAC:     "02:00:01:01:01:01",
 		IPv4:    "192.0.2.2",
 		IPv4Len: 30,
 	}
 	atePort2 = attrs.Attributes{
 		Name:    "atePort2",
+		MAC:     "02:00:02:01:01:01",
 		IPv4:    "192.0.2.6",
 		IPv4Len: 30,
 	}
 	atePort3 = attrs.Attributes{
 		Name:    "atePort3",
+		MAC:     "02:00:03:01:01:01",
 		IPv4:    "192.0.2.10",
 		IPv4Len: 30,
 	}
 	atePort4 = attrs.Attributes{
 		Name:    "atePort4",
+		MAC:     "02:00:04:01:01:01",
 		IPv4:    "192.0.2.14",
 		IPv4Len: 30,
 	}
@@ -197,9 +201,6 @@ func TestBaseHierarchicalNHGUpdate(t *testing.T) {
 	ate := ondatra.ATE(t, "ate")
 	top := configureATE(t, ate)
 
-	ate.OTG().PushConfig(t, top)
-	ate.OTG().StartProtocols(t)
-
 	tests := []struct {
 		name string
 		desc string
@@ -255,6 +256,9 @@ func testBaseHierarchialNHG(ctx context.Context, t *testing.T, args *testArgs) {
 	p2Flow := createFlow(t, p2flow, args.top, &atePort2)
 	p3Flow := createFlow(t, p3flow, args.top, &atePort3)
 
+	args.ate.OTG().PushConfig(t, args.top)
+	args.ate.OTG().StartProtocols(t)
+
 	defer func() {
 
 		t.Log("Unconfig interfaces")
@@ -482,7 +486,7 @@ func configStaticArp(p string, ipv4addr string, macAddr string, trunk bool) *oc.
 
 // TE3.7 case2 - Drain Implementation test.
 func testImplementDrain(ctx context.Context, t *testing.T, args *testArgs) {
-	if deviations.GRIBIMACOverrideWithStaticARP(args.dut) {
+	if !deviations.GRIBIMACOverrideWithStaticARP(args.dut) {
 		t.Skip()
 		//Testcase skipped as static arp and route config needed for other vendors
 	}
@@ -591,6 +595,9 @@ func testImplementDrain(ctx context.Context, t *testing.T, args *testArgs) {
 	p3Flow := createFlow(t, p3flow, args.top, &atePort3)
 	p4Flow := createFlow(t, p4flow, args.top, &atePort4)
 
+	args.ate.OTG().PushConfig(t, args.top)
+	args.ate.OTG().StartProtocols(t)
+
 	t.Log("Validate primary path traffic received at ate port2, ate port3 and no traffic on ate port4")
 	waitOTGARPEntry(t)
 	validateTrafficFlows(t, args.ate, nil, nil, []gosnappi.Flow{p2Flow, p3Flow}, pMACFilter)