Skip to content

Refactor ID handling and decouple Network Instance assignment #5381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
priyaranjannanda wants to merge 2 commits into
base: main
Choose a base branch
from
+6 −5
Open

Refactor ID handling and decouple Network Instance assignment #5381

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6a4419
Refactor interface ID handling and decouple Network Instance assignme…
priyaranjannanda Apr 24, 2026
4f46aa3
Update feature/interface/aggregate/otg_tests/aggregate_all_not_viable…
priyaranjannanda Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions ...egate/otg_tests/aggregate_all_not_viable_test/aggregate_all_not_forwarding_viable_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)
Expand Down
Loading