Skip to content
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

updated metadata for nokia with deviations #3608

Merged
merged 1 commit into from
Nov 27, 2024
Merged

updated metadata for nokia with deviations #3608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions feature/gribi/otg_tests/basic_encap_test/basic_encap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,8 +578,6 @@ func getPbrRules(dut *ondatra.DUTDevice, clusterFacing bool) []pbrRule {
pbrRules = append(pbrRules, encapRules...)
}

pbrRules = append(pbrRules, splitDefaultClassRules...)

if deviations.PfRequireMatchDefaultRule(dut) {
pbrRules = append(pbrRules, splitDefaultClassRules...)
} else {
Expand Down Expand Up @@ -803,6 +801,13 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice) {
// configure base PBF policies and network-instances
configureBaseconfig(t, dut)

if deviations.ExplicitInterfaceInDefaultVRF(dut) {
fptest.AssignToNetworkInstance(t, dut, p1.Name(), deviations.DefaultNetworkInstance(dut), 0)
fptest.AssignToNetworkInstance(t, dut, p2.Name(), deviations.DefaultNetworkInstance(dut), 0)
fptest.AssignToNetworkInstance(t, dut, p3.Name(), deviations.DefaultNetworkInstance(dut), 0)
fptest.AssignToNetworkInstance(t, dut, p4.Name(), deviations.DefaultNetworkInstance(dut), 0)
fptest.AssignToNetworkInstance(t, dut, p5.Name(), deviations.DefaultNetworkInstance(dut), 0)
}
// apply PBF to src interface.
applyForwardingPolicy(t, dut, p1.Name())
if deviations.GRIBIMACOverrideWithStaticARP(dut) {
Expand Down
11 changes: 11 additions & 0 deletions feature/gribi/otg_tests/basic_encap_test/metadata.textproto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,15 @@ platform_exceptions: {
omit_l2_mtu: true
}
}
platform_exceptions: {
platform: {
vendor: NOKIA
}
deviations: {
interface_enabled: true
explicit_interface_in_default_vrf: true
static_protocol_name: "static"
ttl_copy_unsupported: true
}
}
tags: TAGS_DATACENTER_EDGE
Loading