From 00bc515ced96263d8a1dc191525b7aac7578f409 Mon Sep 17 00:00:00 2001 From: ijernoiu Date: Wed, 2 Sep 2026 13:14:49 +0000 Subject: [PATCH 1/2] Skip applying decap policy on interface when oc unsupported --- .../mpls_gre_udp_decap_test/mpls_gre_udp_decap_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/feature/policy_forwarding/otg_tests/mpls_gre_udp_decap_test/mpls_gre_udp_decap_test.go b/feature/policy_forwarding/otg_tests/mpls_gre_udp_decap_test/mpls_gre_udp_decap_test.go index ac781f46321..55a9d3eb286 100644 --- a/feature/policy_forwarding/otg_tests/mpls_gre_udp_decap_test/mpls_gre_udp_decap_test.go +++ b/feature/policy_forwarding/otg_tests/mpls_gre_udp_decap_test/mpls_gre_udp_decap_test.go @@ -317,6 +317,9 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice) { } func configureInputPolicy(t *testing.T, dut *ondatra.DUTDevice, tc testCase) { + if deviations.InterfacePolicyForwardingOCUnsupported(dut) { + return + } defaultNIName := deviations.DefaultNetworkInstance(dut) interfaceName := dut.Port(t, port1).Name() var policyName string From 6ee1dbd4386d11e476fc84e2c0c7343e643b1b48 Mon Sep 17 00:00:00 2001 From: ijernoiu Date: Wed, 2 Sep 2026 13:26:48 +0000 Subject: [PATCH 2/2] Add missing gnmi call --- .../otg_tests/mpls_gre_udp_decap_test/mpls_gre_udp_decap_test.go | 1 + internal/cfgplugins/policyforwarding.go | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/policy_forwarding/otg_tests/mpls_gre_udp_decap_test/mpls_gre_udp_decap_test.go b/feature/policy_forwarding/otg_tests/mpls_gre_udp_decap_test/mpls_gre_udp_decap_test.go index 55a9d3eb286..383ad372ee9 100644 --- a/feature/policy_forwarding/otg_tests/mpls_gre_udp_decap_test/mpls_gre_udp_decap_test.go +++ b/feature/policy_forwarding/otg_tests/mpls_gre_udp_decap_test/mpls_gre_udp_decap_test.go @@ -336,6 +336,7 @@ func configureInputPolicy(t *testing.T, dut *ondatra.DUTDevice, tc testCase) { AppliedPolicyName: policyName, } cfgplugins.InterfacePolicyForwardingConfig(t, dut, nil, "", pf, ocPFParams) + gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(defaultNIName).PolicyForwarding().Interface(interfaceName).Config(), pf.GetInterface(interfaceName)) } func configureDecapPolicyForwarding(t *testing.T, dut *ondatra.DUTDevice, interfaceName string) { diff --git a/internal/cfgplugins/policyforwarding.go b/internal/cfgplugins/policyforwarding.go index 2a96fd46a65..c956b0ca7b3 100644 --- a/internal/cfgplugins/policyforwarding.go +++ b/internal/cfgplugins/policyforwarding.go @@ -451,7 +451,6 @@ func InterfacePolicyForwardingConfig(t *testing.T, dut *ondatra.DUTDevice, a *at } } else { ApplyPolicyToInterfaceOC(t, pf, params.InterfaceID, params.AppliedPolicyName) - } }