From 13cdbdc5ec35bb9776177f5d719294381b173753 Mon Sep 17 00:00:00 2001 From: Marc Charlebois <105758144+MarcCharlebois@users.noreply.github.com> Date: Thu, 25 Jan 2024 00:36:51 -0800 Subject: [PATCH] Adding vendor Deviations (#2576) * Adding vendor deviation "This code is a Contribution to the OpenConfig Feature Profiles project ("Work") made under the Google Software Grant and Corporate Contributor License Agreement ("CLA") and governed by the Apache License 2.0. No other rights or licenses in or to any of Nokia's intellectual property are granted for any other purpose. This code is provided on an "as is" basis without any warranties of any kind." * empty line at eof "This code is a Contribution to the OpenConfig Feature Profiles project ("Work") made under the Google Software Grant and Corporate Contributor License Agreement ("CLA") and governed by the Apache License 2.0. No other rights or licenses in or to any of Nokia's intellectual property are granted for any other purpose. This code is provided on an "as is" basis without any warranties of any kind." --- .../ipv6_link_local_test/ipv6_link_local_test.go | 5 +++++ .../otg_tests/ipv6_link_local_test/metadata.textproto | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/feature/interface/ip/ipv6_link_local/otg_tests/ipv6_link_local_test/ipv6_link_local_test.go b/feature/interface/ip/ipv6_link_local/otg_tests/ipv6_link_local_test/ipv6_link_local_test.go index 66b3ff627fd..45a19cd1024 100644 --- a/feature/interface/ip/ipv6_link_local/otg_tests/ipv6_link_local_test/ipv6_link_local_test.go +++ b/feature/interface/ip/ipv6_link_local/otg_tests/ipv6_link_local_test/ipv6_link_local_test.go @@ -20,6 +20,7 @@ import ( "github.com/open-traffic-generator/snappi/gosnappi" "github.com/openconfig/featureprofiles/internal/attrs" + "github.com/openconfig/featureprofiles/internal/deviations" "github.com/openconfig/featureprofiles/internal/fptest" "github.com/openconfig/featureprofiles/internal/otgutils" "github.com/openconfig/ondatra" @@ -182,6 +183,10 @@ func configureDUTLinkLocalInterface(t *testing.T, dut *ondatra.DUTDevice) { dstIntf := dutDst.NewOCInterface(p2.Name(), dut) dstIntf.GetOrCreateSubinterface(0).GetOrCreateIpv6().GetOrCreateAddress(dutDst.IPv6).SetType(oc.IfIp_Ipv6AddressType_LINK_LOCAL_UNICAST) gnmi.Replace(t, dut, gnmi.OC().Interface(p2.Name()).Config(), dstIntf) + if deviations.ExplicitInterfaceInDefaultVRF(dut) { + fptest.AssignToNetworkInstance(t, dut, p1.Name(), deviations.DefaultNetworkInstance(dut), 0) + fptest.AssignToNetworkInstance(t, dut, p2.Name(), deviations.DefaultNetworkInstance(dut), 0) + } } func configureOTGInterface(t *testing.T, ate *ondatra.ATEDevice, top gosnappi.Config) { diff --git a/feature/interface/ip/ipv6_link_local/otg_tests/ipv6_link_local_test/metadata.textproto b/feature/interface/ip/ipv6_link_local/otg_tests/ipv6_link_local_test/metadata.textproto index fcb3dc040b9..79291e1f1a5 100644 --- a/feature/interface/ip/ipv6_link_local/otg_tests/ipv6_link_local_test/metadata.textproto +++ b/feature/interface/ip/ipv6_link_local/otg_tests/ipv6_link_local_test/metadata.textproto @@ -14,3 +14,12 @@ platform_exceptions: { default_network_instance: "default" } } +platform_exceptions: { + platform: { + vendor: NOKIA + } + deviations: { + explicit_interface_in_default_vrf: true + interface_enabled: true + } +}