RT-2.12: Updating config order (openconfig#2592)

Updating config order to avoid very intermittent failure.

"This code is a Contribution to the OpenConfig Feature Profiles project ("Work") made under the Google Software Grant and Corporate Contributor License Agreement ("CLA") and governed by the Apache License 2.0. No other rights or licenses in or to any of Nokia's intellectual property are granted for any other purpose. This code is provided on an "as is" basis without any warranties of any kind."

feature/experimental/isis/otg_tests/isis_drain_test/isis_drain_test.go

@@ -213,12 +213,6 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice) {
 	}
 
 	// handle deviations for ports and lags
-	if deviations.ExplicitPortSpeed(dut) {
-		for _, port := range dut.Ports() {
-			fptest.SetPortSpeed(t, port)
-		}
-	}
-
 	fptest.ConfigureDefaultNetworkInstance(t, dut)
 
 	if deviations.ExplicitInterfaceInDefaultVRF(dut) {
@@ -227,6 +221,12 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice) {
 		fptest.AssignToNetworkInstance(t, dut, agg3ID, deviations.DefaultNetworkInstance(dut), 0)
 	}
 
+	if deviations.ExplicitPortSpeed(dut) {
+		for _, port := range dut.Ports() {
+			fptest.SetPortSpeed(t, port)
+		}
+	}
+
 	// configure ISIS
 	configureISISDUT(t, dut, []string{agg2ID, agg3ID})
 }
@@ -476,8 +476,9 @@ func TestDrain(t *testing.T) {
 	dut := ondatra.DUT(t, "dut")
 	ate := ondatra.ATE(t, "ate")
 	otg := ate.OTG()
-	ateTopo := configureATE(t, otg)
+
 	configureDUT(t, dut)
+	ateTopo := configureATE(t, otg)
 
 	ecmpFlows := createFlow(t, ateTopo, "ecmp-flow", atePort2.Name+".IPv4", atePort3.Name+".IPv4")
 	lag2Flow := createFlow(t, ateTopo, "trunk2-flow", atePort2.Name+".IPv4")