From b6a44197b6ed131b0955b3cef218779542d441d0 Mon Sep 17 00:00:00 2001 From: priyaranjannanda Date: Fri, 24 Apr 2026 04:57:01 -0700 Subject: [PATCH 1/2] Refactor interface ID handling and decouple Network Instance assignment from naming deviations. --- .../aggregate_all_not_forwarding_viable_test.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/feature/interface/aggregate/otg_tests/aggregate_all_not_viable_test/aggregate_all_not_forwarding_viable_test.go b/feature/interface/aggregate/otg_tests/aggregate_all_not_viable_test/aggregate_all_not_forwarding_viable_test.go index e730c5ada54..3ca147531c1 100644 --- a/feature/interface/aggregate/otg_tests/aggregate_all_not_viable_test/aggregate_all_not_forwarding_viable_test.go +++ b/feature/interface/aggregate/otg_tests/aggregate_all_not_viable_test/aggregate_all_not_forwarding_viable_test.go @@ -526,7 +526,7 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice) []string { aggPath := d.Interface(aggID) fptest.LogQuery(t, aggID, aggPath.Config(), aggInt) gnmi.Replace(t, dut, aggPath.Config(), aggInt) - if deviations.ExplicitInterfaceInDefaultVRF(dut) || deviations.InterfaceRefInterfaceIDFormat(dut) { + if deviations.ExplicitInterfaceInDefaultVRF(dut){ fptest.AssignToNetworkInstance(t, dut, aggID, deviations.DefaultNetworkInstance(dut), 0) } for _, port := range portList { @@ -762,10 +762,11 @@ func configureDUTISIS(t *testing.T, dut *ondatra.DUTDevice, aggIDs []string) { isisLevel2.Enabled = ygot.Bool(true) } for _, aggID := range aggIDs { - isisIntf := isis.GetOrCreateInterface(aggID) + intf := aggID if deviations.InterfaceRefInterfaceIDFormat(dut) { - isisIntf = isis.GetOrCreateInterface(aggID + ".0") + intf = aggID + ".0" } + isisIntf := isis.GetOrCreateInterface(intf) isisIntf.GetOrCreateInterfaceRef().Interface = ygot.String(aggID) isisIntf.GetOrCreateInterfaceRef().Subinterface = ygot.Uint32(0) @@ -807,10 +808,10 @@ func changeMetric(t *testing.T, dut *ondatra.DUTDevice, intf string, metric uint d := &oc.Root{} netInstance := d.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)) isis := netInstance.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_ISIS, isisInstance).GetOrCreateIsis() - isisIntfLevel := isis.GetOrCreateInterface(intf).GetOrCreateLevel(2) if deviations.InterfaceRefInterfaceIDFormat(dut) { - isisIntfLevel = isis.GetOrCreateInterface(intf + ".0").GetOrCreateLevel(2) + intf += ".0" } + isisIntfLevel := isis.GetOrCreateInterface(intf).GetOrCreateLevel(2) isisIntfLevelAfiv4 := isisIntfLevel.GetOrCreateAf(oc.IsisTypes_AFI_TYPE_IPV4, oc.IsisTypes_SAFI_TYPE_UNICAST) isisIntfLevelAfiv4.Metric = ygot.Uint32(metric) isisIntfLevelAfiv6 := isisIntfLevel.GetOrCreateAf(oc.IsisTypes_AFI_TYPE_IPV6, oc.IsisTypes_SAFI_TYPE_UNICAST) From 4f46aa30360f07533a70242e1a73367270eac1fd Mon Sep 17 00:00:00 2001 From: Priya Ranjan Nanda <151918045+priyaranjannanda@users.noreply.github.com> Date: Fri, 24 Apr 2026 17:36:31 +0530 Subject: [PATCH 2/2] Update feature/interface/aggregate/otg_tests/aggregate_all_not_viable_test/aggregate_all_not_forwarding_viable_test.go Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- .../aggregate_all_not_forwarding_viable_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/interface/aggregate/otg_tests/aggregate_all_not_viable_test/aggregate_all_not_forwarding_viable_test.go b/feature/interface/aggregate/otg_tests/aggregate_all_not_viable_test/aggregate_all_not_forwarding_viable_test.go index 3ca147531c1..03c1fa61111 100644 --- a/feature/interface/aggregate/otg_tests/aggregate_all_not_viable_test/aggregate_all_not_forwarding_viable_test.go +++ b/feature/interface/aggregate/otg_tests/aggregate_all_not_viable_test/aggregate_all_not_forwarding_viable_test.go @@ -526,7 +526,7 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice) []string { aggPath := d.Interface(aggID) fptest.LogQuery(t, aggID, aggPath.Config(), aggInt) gnmi.Replace(t, dut, aggPath.Config(), aggInt) - if deviations.ExplicitInterfaceInDefaultVRF(dut){ + if deviations.ExplicitInterfaceInDefaultVRF(dut) { fptest.AssignToNetworkInstance(t, dut, aggID, deviations.DefaultNetworkInstance(dut), 0) } for _, port := range portList {