resolving conflicts

openconfig · Dec 24, 2024 · 9718afd · 9718afd
1 parent ef74469
commit 9718afd
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/feature/gribi/otg_tests/static_lsp_test/static_lsp_test.go b/feature/gribi/otg_tests/static_lsp_test/static_lsp_test.go
@@ -187,13 +187,13 @@ func configureStaticLSP(t *testing.T, dut *ondatra.DUTDevice, lspName string, in
 		}
 	} else {
 		d := &oc.Root{}
-    dni := deviations.DefaultNetworkInstance(dut)
-	defPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut))
-	gnmi.Update(t, dut, defPath.Config(), &oc.NetworkInstance{
-		Name: ygot.String(deviations.DefaultNetworkInstance(dut)),
-		Type: oc.NetworkInstanceTypes_NETWORK_INSTANCE_TYPE_DEFAULT_INSTANCE,
-	})
-	
+		dni := deviations.DefaultNetworkInstance(dut)
+		defPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut))
+		gnmi.Update(t, dut, defPath.Config(), &oc.NetworkInstance{
+			Name: ygot.String(deviations.DefaultNetworkInstance(dut)),
+			Type: oc.NetworkInstanceTypes_NETWORK_INSTANCE_TYPE_DEFAULT_INSTANCE,
+		})
+
 		mplsCfg := d.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)).GetOrCreateMpls()
 		staticMplsCfg := mplsCfg.GetOrCreateLsps().GetOrCreateStaticLsp(lspName)
 		staticMplsCfg.GetOrCreateEgress().SetIncomingLabel(oc.UnionUint32(incomingLabel))
@@ -297,7 +297,6 @@ func ValidatePackets(t *testing.T,
 				// increment the unexpected packet counter
 				unexpectedMPLSPackets++
 				t.Errorf("Found MPLS packet with label: %v", mpls.Label)
-
 			}
 		}
 	}