Merge branch 'main' into ZR_TRANSCEIVER-5_changes

openconfig · Nov 28, 2024 · dd7efc1 · dd7efc1
2 parents a8bae65 + 9490804
commit dd7efc1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/feature/gribi/otg_tests/basic_encap_test/basic_encap_test.go b/feature/gribi/otg_tests/basic_encap_test/basic_encap_test.go
@@ -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 {
@@ -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) {

diff --git a/feature/gribi/otg_tests/basic_encap_test/metadata.textproto b/feature/gribi/otg_tests/basic_encap_test/metadata.textproto
@@ -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