Skip to content

Frr phase2: multiple backup nhs in nhg #5007

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

Merged
rohit-rp merged 6 commits into from
Apr 10, 2026
+30 −8
Merged

Frr phase2: multiple backup nhs in nhg #5007

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a5a9881
multiple re-encap backup tunnels
dracazacula Jan 21, 2026
1003bd7
Nokia KNE IS-IS configuration
dracazacula Jan 21, 2026
bd781ec
Update readme
dracazacula Jan 23, 2026
9901f35
Merge branch 'main' into frr_phase2
dracazacula Apr 3, 2026
5d018f6
revert change
dracazacula Apr 3, 2026
ff7722a
Merge branch 'main' into frr_phase2
dracazacula Apr 9, 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
4 changes: 2 additions & 2 deletions feature/gribi/otg_tests/encap_frr/encap_frr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,8 +484,8 @@ func configureISIS(t *testing.T, dut *ondatra.DUTDevice, intfName, dutAreaAddres
if deviations.ISISLevelEnabled(dut) {
isisLevel2.Enabled = ygot.Bool(true)
}
if deviations.InterfaceRefInterfaceIDFormat(dut) {
intfName += ".0"
if deviations.ExplicitInterfaceInDefaultVRF(dut) || deviations.InterfaceRefInterfaceIDFormat(dut) {
intfName = intfName + ".0"
}
isisIntf := isis.GetOrCreateInterface(intfName)
isisIntf.Enabled = ygot.Bool(true)
Expand Down
1 change: 1 addition & 0 deletions feature/gribi/otg_tests/encap_frr/metadata.textproto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ platform_exceptions: {
deviations: {
explicit_interface_in_default_vrf: true
interface_enabled: true
missing_isis_interface_afi_safi_enable: true
}
}
platform_exceptions: {
Expand Down
21 changes: 20 additions & 1 deletion feature/gribi/otg_tests/encap_frr_with_reencap_vrf_test/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,8 @@ IPv4Entry {203.0.113.2/32 (REPAIR)} -> NHG#1001 (DEFAULT VRF) -> {
backup_next_hop_group: 2000 // decap and fallback to DEFAULT VRF
}
NHG#1001 (DEFAULT VRF) {
{NH#1001, DEFAULT VRF}
{NH#1001, DEFAULT VRF},
{NH#1003, DEFAULT VRF}
}
NH#1001 -> {
decapsulate_header: OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_IPV4
Expand All @@ -354,11 +355,24 @@ NH#1001 -> {
}
network_instance: "TE_VRF_222"
}
NH#1003 -> {
decapsulate_header: OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_IPV4
encapsulate_header: OPENCONFIGAFTTYPESENCAPSULATIONHEADERTYPE_IPV4
ip_in_ip {
dst_ip: "203.0.113.102"
src_ip: "ipv4_outer_src_222"
}
network_instance: "TE_VRF_222"
}

IPv4Entry {203.0.113.101/32 (TE_VRF_222)} -> NHG#4 (DEFAULT VRF) -> {
{NH#5, DEFAULT VRF, weight:1,ip_address=192.0.2.105},
backup_next_hop_group: 2000 // decap and fallback to DEFAULT VRF
}
IPv4Entry {203.0.113.102/32 (TE_VRF_222)} -> NHG#4 (DEFAULT VRF) -> {
{NH#5, DEFAULT VRF, weight:1,ip_address=192.0.2.105},
backup_next_hop_group: 2000 // decap and fallback to DEFAULT VRF
}
IPv4Entry {192.0.2.105/32 (DEFAULT VRF)} -> NHG#15 (DEFAULT VRF) -> {
{NH#16, DEFAULT VRF, weight:1,mac_address:magic_mac, interface-ref:dut-port-7-interface},
}
Expand Down Expand Up @@ -622,3 +636,8 @@ rpcs:
## Required DUT platform

- vRX

## Canonical OC
Copy link
Copy Markdown
Contributor Author

@dracazacula dracazacula Jan 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was completely missing. In the interest of time, I will not spend a lot of time to build it.

```json
{}
```
15 changes: 11 additions & 4 deletions feature/gribi/otg_tests/encap_frr_with_reencap_vrf_test/encap_frr_with_reencap_vrf_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ const (
gribiIPv4EntryVRF2222 = "203.0.113.101"
gribiIPv4EntryVRF2223 = "203.100.113.100"
gribiIPv4EntryVRF2224 = "203.100.113.101"
gribiIPv4EntryVRF2225 = "203.0.113.102"
gribiIPv4EntryEncapVRF = "138.0.11.0"

dutAreaAddress = "49.0001"
Expand Down Expand Up @@ -358,12 +359,14 @@ func configureGribiRoute(ctx context.Context, t *testing.T, dut *ondatra.DUTDevi
WithID(4).AddNextHop(5, 1).WithBackupNHG(2000),
fluent.IPv4Entry().WithNetworkInstance(niTEVRF222).WithNextHopGroupNetworkInstance(deviations.DefaultNetworkInstance(dut)).
WithPrefix(gribiIPv4EntryVRF2222+"/"+maskLen32).WithNextHopGroup(4),
fluent.IPv4Entry().WithNetworkInstance(niTEVRF222).WithNextHopGroupNetworkInstance(deviations.DefaultNetworkInstance(dut)).
WithPrefix(gribiIPv4EntryVRF2225+"/"+maskLen32).WithNextHopGroup(4),
)
if err := awaitTimeout(ctx, t, client, time.Minute); err != nil {
t.Logf("Could not program entries via client, got err, check error codes: %v", err)
}

teVRF222IPList := []string{gribiIPv4EntryVRF2221, gribiIPv4EntryVRF2222}
teVRF222IPList := []string{gribiIPv4EntryVRF2221, gribiIPv4EntryVRF2222, gribiIPv4EntryVRF2225}
for ip := range teVRF222IPList {
chk.HasResult(t, client.Results(t),
fluent.OperationResult().
Expand All @@ -388,8 +391,12 @@ func configureGribiRoute(ctx context.Context, t *testing.T, dut *ondatra.DUTDevi
WithIndex(1001).WithDecapsulateHeader(fluent.IPinIP).WithEncapsulateHeader(fluent.IPinIP).
WithIPinIP(ipv4OuterSrc222Addr, gribiIPv4EntryVRF2222).
WithNextHopNetworkInstance(niTEVRF222),
fluent.NextHopEntry().WithNetworkInstance(deviations.DefaultNetworkInstance(dut)).
WithIndex(1003).WithDecapsulateHeader(fluent.IPinIP).WithEncapsulateHeader(fluent.IPinIP).
WithIPinIP(ipv4OuterSrc222Addr, gribiIPv4EntryVRF2225).
WithNextHopNetworkInstance(niTEVRF222),
fluent.NextHopGroupEntry().WithNetworkInstance(deviations.DefaultNetworkInstance(dut)).
WithID(1001).AddNextHop(1001, 1).WithBackupNHG(2000),
WithID(1001).AddNextHop(1001, 1).AddNextHop(1003, 1).WithBackupNHG(2000),

fluent.NextHopEntry().WithNetworkInstance(deviations.DefaultNetworkInstance(dut)).
WithIndex(3000).WithNextHopNetworkInstance(niRepairVrf),
Expand Down Expand Up @@ -539,8 +546,8 @@ func configureISIS(t *testing.T, dut *ondatra.DUTDevice, intfName, dutAreaAddres
if deviations.ISISLevelEnabled(dut) {
isisLevel2.Enabled = ygot.Bool(true)
}
if deviations.InterfaceRefInterfaceIDFormat(dut) {
intfName += ".0"
if deviations.ExplicitInterfaceInDefaultVRF(dut) || deviations.InterfaceRefInterfaceIDFormat(dut) {
intfName = intfName + ".0"
}
isisIntf := isis.GetOrCreateInterface(intfName)
isisIntf.Enabled = ygot.Bool(true)
Expand Down
Loading