From 9718afdd12fd1294c239caa99a2ddbf99f9dff3b Mon Sep 17 00:00:00 2001 From: cprabha Date: Mon, 23 Dec 2024 16:56:20 -0800 Subject: [PATCH] resolving conflicts --- .../otg_tests/static_lsp_test/static_lsp_test.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 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 index 49b180cc4d5..5fc7e073ab5 100644 --- 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) - } } }