From cedbeabcdbea008ebb070ed6952346ae0178a953 Mon Sep 17 00:00:00 2001
From: cprabha <cprabha@juniper.net>
Date: Mon, 11 Nov 2024 11:52:25 -0800
Subject: [PATCH 01/14] Rt 1.54 bgp_override_as_path_split_horizon_test.go
 (#3432)

* Initial commit for RT-1.54, passes on JunOS EVO ptx so far
---
 .../README.md                                 |   9 +-
 ...bgp_override_as_path_split_horizon_test.go | 503 ++++++++++++++++++
 .../metadata.textproto                        |  37 ++
 internal/cfgplugins/bgp.go                    |  62 +++
 internal/deviations/deviations.go             |   5 +
 proto/metadata.proto                          |   5 +-
 proto/metadata_go_proto/metadata.pb.go        | 110 ++--
 7 files changed, 681 insertions(+), 50 deletions(-)
 create mode 100644 feature/bgp/otg_tests/bgp_override_as_path_split_horizon_test/bgp_override_as_path_split_horizon_test.go
 create mode 100644 feature/bgp/otg_tests/bgp_override_as_path_split_horizon_test/metadata.textproto

diff --git a/feature/bgp/otg_tests/bgp_override_as_path_split_horizon_test/README.md b/feature/bgp/otg_tests/bgp_override_as_path_split_horizon_test/README.md
index b74ba3fad48..b5a15e90e4e 100644
--- a/feature/bgp/otg_tests/bgp_override_as_path_split_horizon_test/README.md
+++ b/feature/bgp/otg_tests/bgp_override_as_path_split_horizon_test/README.md
@@ -6,21 +6,27 @@ BGP Override AS-path split-horizon
 
 ## Topology
 
- ATE Port1 (AS 65502) --- DUT Port1 (AS 65501) DUT Port2 ---eBGP --- ATE Port2 (AS 65503)
+ATE Port1 (AS 65502) --- eBGP --------- DUT Port1 (DUT Local AS 65501)
+ATE Port2 (AS 65503) --- eBGP --------- DUT Port2 (DUT Local AS 64513)
 
 ## Procedure
 
 *  Establish BGP Session: Configure and establish an eBGP session between the DUT (Port1) and the ATE (Port1).
+*  
+### RT-1.54.1  Test no allow-own-in
 *  Baseline Test (No "allow-own-in"):
     *  Advertise a prefix from the ATE (e.g., 192.168.1.0/24) with an AS-path that includes AS 65501 (DUT's AS) in the middle (e.g., AS-path: 65502 65500 65501 65499).
     *  Verify that the ATE Port2 doesn't receive the route. due to the presence of its own AS in the path.
     *  Validate session state and capabilities received on DUT using telemetry.
+
+### RT-1.54.2  Test "allow-own-as 1"
 *  Test "allow-own-as 1":
     *  Enable "allow-own-as 1" on the DUT.
         *  Re-advertise the prefix from the ATE with the same AS-path.
         *  Verify that the DUT accepts the route.
         *  Verify that the ATE Port2 receives the route.
         *  Validate session state and capabilities received on DUT using telemetry.
+### RT-1.54.3  Test "allow-own-as 3"
 *  Test "allow-own-as 3":
     *  Change the DUT's configuration to "allow-own-as 3".
     *  Test with the following AS-path occurrences:
@@ -29,6 +35,7 @@ BGP Override AS-path split-horizon
         *  4 Occurrences: 65502 65501 65501 65501 65501 65499 (Should be rejected)
     *  Verify that the ATE Port2 receives the route with 1 and 3 occurrences of AS 65501 but rejects it with 4 occurrences.
     *  Validate session state and capabilities received on DUT using telemetry.
+### RT-1.54.4  Test "allow-own-as 4"
 *  Test "allow-own-as 4:
     *  Change the DUT's configuration to "allow-own-as 4".
     *  Test with the following AS-path occurrences:
diff --git a/feature/bgp/otg_tests/bgp_override_as_path_split_horizon_test/bgp_override_as_path_split_horizon_test.go b/feature/bgp/otg_tests/bgp_override_as_path_split_horizon_test/bgp_override_as_path_split_horizon_test.go
new file mode 100644
index 00000000000..d40b62036ec
--- /dev/null
+++ b/feature/bgp/otg_tests/bgp_override_as_path_split_horizon_test/bgp_override_as_path_split_horizon_test.go
@@ -0,0 +1,503 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package bgp_override_as_path_split_horizon_test
+
+import (
+	"testing"
+	"time"
+
+	"github.com/open-traffic-generator/snappi/gosnappi"
+	"github.com/openconfig/featureprofiles/internal/attrs"
+	"github.com/openconfig/featureprofiles/internal/cfgplugins"
+	"github.com/openconfig/featureprofiles/internal/deviations"
+	"github.com/openconfig/featureprofiles/internal/fptest"
+	"github.com/openconfig/ondatra"
+	"github.com/openconfig/ondatra/gnmi"
+	"github.com/openconfig/ondatra/gnmi/oc"
+	otgtelemetry "github.com/openconfig/ondatra/gnmi/otg"
+	otg "github.com/openconfig/ondatra/otg"
+	"github.com/openconfig/ygnmi/ygnmi"
+	"github.com/openconfig/ygot/ygot"
+)
+
+func TestMain(m *testing.M) {
+	fptest.RunTests(m)
+}
+
+const (
+	advertisedRoutesv4CIDR   = "203.0.113.1/32"
+	advertisedRoutesv4Net    = "203.0.113.1"
+	advertisedRoutesv4Prefix = 32
+	peerGrpName1             = "BGP-PEER-GROUP1"
+	peerGrpName2             = "BGP-PEER-GROUP2"
+	dutGlobalAS              = 64512
+	dutLocalAS1              = 65501
+	dutLocalAS2              = 64513
+	ateAS1                   = 65502
+	ateAS2                   = 65503
+	plenIPv4                 = 30
+	plenIPv6                 = 126
+	policyName               = "ALLOW"
+)
+
+var (
+	dutPort1 = attrs.Attributes{
+		Desc:    "DUT to ATE Port1",
+		IPv4:    "192.0.2.1",
+		IPv6:    "2001:db8::192:0:2:1",
+		IPv4Len: plenIPv4,
+		IPv6Len: plenIPv6,
+	}
+	atePort1 = attrs.Attributes{
+		Name:    "atePort1",
+		IPv4:    "192.0.2.2",
+		IPv6:    "2001:db8::192:0:2:2",
+		MAC:     "02:00:01:01:01:01",
+		IPv4Len: plenIPv4,
+		IPv6Len: plenIPv6,
+	}
+	dutPort2 = attrs.Attributes{
+		Desc:    "DUT to ATE Port2",
+		IPv4:    "192.0.2.5",
+		IPv6:    "2001:db8::192:0:2:5",
+		IPv4Len: plenIPv4,
+		IPv6Len: plenIPv6,
+	}
+	atePort2 = attrs.Attributes{
+		Name:    "atePort2",
+		IPv4:    "192.0.2.6",
+		IPv6:    "2001:db8::192:0:2:6",
+		MAC:     "02:00:02:01:01:01",
+		IPv4Len: plenIPv4,
+		IPv6Len: plenIPv6,
+	}
+
+	nbr1 = &cfgplugins.BgpNeighbor{LocalAS: dutLocalAS1, PeerAS: ateAS1, Neighborip: atePort1.IPv4, IsV4: true, PeerGrp: peerGrpName1}
+	nbr2 = &cfgplugins.BgpNeighbor{LocalAS: dutLocalAS2, PeerAS: ateAS2, Neighborip: atePort2.IPv4, IsV4: true, PeerGrp: peerGrpName2}
+
+	otgPort1V4Peer = "atePort1.BGP4.peer"
+	otgPort2V4Peer = "atePort2.BGP4.peer"
+)
+
+// configureDUT configures all the interfaces on the DUT.
+func configureDUT(t *testing.T, dut *ondatra.DUTDevice) {
+	t.Helper()
+	dc := gnmi.OC()
+	i1 := dutPort1.NewOCInterface(dut.Port(t, "port1").Name(), dut)
+	gnmi.Replace(t, dut, dc.Interface(i1.GetName()).Config(), i1)
+
+	i2 := dutPort2.NewOCInterface(dut.Port(t, "port2").Name(), dut)
+	gnmi.Replace(t, dut, dc.Interface(i2.GetName()).Config(), i2)
+}
+
+// bgpCreateNbr creates a BGP object with neighbors pointing to atePort1 and atePort2
+func bgpCreateNbr(t *testing.T, dut *ondatra.DUTDevice) *oc.NetworkInstance_Protocol {
+	t.Helper()
+	dutOcRoot := &oc.Root{}
+	ni1 := dutOcRoot.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut))
+	niProto := ni1.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
+	bgp := niProto.GetOrCreateBgp()
+	global := bgp.GetOrCreateGlobal()
+	global.RouterId = ygot.String(dutPort2.IPv4)
+	global.As = ygot.Uint32(dutGlobalAS)
+
+	// Note: we have to define the peer group even if we aren't setting any policy because it's
+	// invalid OC for the neighbor to be part of a peer group that doesn't exist.
+
+	for _, nbr := range []*cfgplugins.BgpNeighbor{nbr1, nbr2} {
+
+		pg := bgp.GetOrCreatePeerGroup(nbr.PeerGrp)
+		pg.PeerAs = ygot.Uint32(nbr.PeerAS)
+		pg.LocalAs = ygot.Uint32(nbr.LocalAS)
+		pg.PeerGroupName = ygot.String(nbr.PeerGrp)
+
+		nv4 := bgp.GetOrCreateNeighbor(nbr.Neighborip)
+		nv4.PeerGroup = ygot.String(nbr.PeerGrp)
+		nv4.PeerAs = ygot.Uint32(nbr.PeerAS)
+		nv4.Enabled = ygot.Bool(true)
+		af4 := nv4.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST)
+		af4.Enabled = ygot.Bool(true)
+
+		if deviations.RoutePolicyUnderAFIUnsupported(dut) {
+			rpl := pg.GetOrCreateApplyPolicy()
+			rpl.ImportPolicy = []string{policyName}
+			rpl.ExportPolicy = []string{policyName}
+		} else {
+			pgaf := pg.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST)
+			pgaf.Enabled = ygot.Bool(true)
+			rpl := pgaf.GetOrCreateApplyPolicy()
+			rpl.ImportPolicy = []string{policyName}
+			rpl.ExportPolicy = []string{policyName}
+		}
+	}
+	return niProto
+}
+
+// configureOTG configures the interfaces and BGP protocols on an ATE.
+func configureOTG(t *testing.T, otg *otg.OTG) (gosnappi.BgpV4Peer, gosnappi.DeviceIpv4, gosnappi.Config) {
+	t.Helper()
+	config := gosnappi.NewConfig()
+	port1 := config.Ports().Add().SetName("port1")
+	port2 := config.Ports().Add().SetName("port2")
+
+	iDut1Dev := config.Devices().Add().SetName(atePort1.Name)
+	iDut1Eth := iDut1Dev.Ethernets().Add().SetName(atePort1.Name + ".Eth").SetMac(atePort1.MAC)
+	iDut1Eth.Connection().SetPortName(port1.Name())
+	iDut1Ipv4 := iDut1Eth.Ipv4Addresses().Add().SetName(atePort1.Name + ".IPv4")
+	iDut1Ipv4.SetAddress(atePort1.IPv4).SetGateway(dutPort1.IPv4).SetPrefix(uint32(atePort1.IPv4Len))
+	iDut1Ipv6 := iDut1Eth.Ipv6Addresses().Add().SetName(atePort1.Name + ".IPv6")
+	iDut1Ipv6.SetAddress(atePort1.IPv6).SetGateway(dutPort1.IPv6).SetPrefix(uint32(atePort1.IPv6Len))
+
+	iDut2Dev := config.Devices().Add().SetName(atePort2.Name)
+	iDut2Eth := iDut2Dev.Ethernets().Add().SetName(atePort2.Name + ".Eth").SetMac(atePort2.MAC)
+	iDut2Eth.Connection().SetPortName(port2.Name())
+	iDut2Ipv4 := iDut2Eth.Ipv4Addresses().Add().SetName(atePort2.Name + ".IPv4")
+	iDut2Ipv4.SetAddress(atePort2.IPv4).SetGateway(dutPort2.IPv4).SetPrefix(uint32(atePort2.IPv4Len))
+	iDut2Ipv6 := iDut2Eth.Ipv6Addresses().Add().SetName(atePort2.Name + ".IPv6")
+	iDut2Ipv6.SetAddress(atePort2.IPv6).SetGateway(dutPort2.IPv6).SetPrefix(uint32(atePort2.IPv6Len))
+
+	iDut1Bgp := iDut1Dev.Bgp().SetRouterId(iDut1Ipv4.Address())
+	iDut2Bgp := iDut2Dev.Bgp().SetRouterId(iDut2Ipv4.Address())
+
+	iDut1Bgp4Peer := iDut1Bgp.Ipv4Interfaces().Add().SetIpv4Name(iDut1Ipv4.Name()).Peers().Add().SetName(otgPort1V4Peer)
+	iDut1Bgp4Peer.SetPeerAddress(iDut1Ipv4.Gateway()).SetAsNumber(ateAS1).SetAsType(gosnappi.BgpV4PeerAsType.EBGP)
+	iDut1Bgp4Peer.Capability().SetIpv4UnicastAddPath(true).SetIpv6UnicastAddPath(true)
+	iDut1Bgp4Peer.LearnedInformationFilter().SetUnicastIpv4Prefix(true).SetUnicastIpv6Prefix(true)
+
+	iDut2Bgp4Peer := iDut2Bgp.Ipv4Interfaces().Add().SetIpv4Name(iDut2Ipv4.Name()).Peers().Add().SetName(otgPort2V4Peer)
+	iDut2Bgp4Peer.SetPeerAddress(iDut2Ipv4.Gateway()).SetAsNumber(ateAS2).SetAsType(gosnappi.BgpV4PeerAsType.EBGP)
+	iDut2Bgp4Peer.Capability().SetIpv4UnicastAddPath(true).SetIpv6UnicastAddPath(true)
+	iDut2Bgp4Peer.LearnedInformationFilter().SetUnicastIpv4Prefix(true).SetUnicastIpv6Prefix(true)
+
+	t.Logf("Pushing config to OTG and starting protocols...")
+	otg.PushConfig(t, config)
+	time.Sleep(30 * time.Second)
+	otg.StartProtocols(t)
+	time.Sleep(30 * time.Second)
+
+	return iDut1Bgp4Peer, iDut1Ipv4, config
+}
+
+// advBGPRouteFromOTG is to advertise prefix with specific AS sequence set.
+func advBGPRouteFromOTG(t *testing.T, args *otgTestArgs, asSeg []uint32) {
+
+	args.otgBgpPeer.V4Routes().Clear()
+
+	bgpNeti1Bgp4PeerRoutes := args.otgBgpPeer.V4Routes().Add().SetName(atePort1.Name + ".BGP4.Route")
+	bgpNeti1Bgp4PeerRoutes.SetNextHopIpv4Address(args.otgIPv4Device.Address()).
+		SetNextHopAddressType(gosnappi.BgpV4RouteRangeNextHopAddressType.IPV4).
+		SetNextHopMode(gosnappi.BgpV4RouteRangeNextHopMode.MANUAL)
+	bgpNeti1Bgp4PeerRoutes.Addresses().Add().
+		SetAddress(advertisedRoutesv4Net).
+		SetPrefix(uint32(advertisedRoutesv4Prefix)).
+		SetCount(1)
+
+	bgpNeti1AsPath := bgpNeti1Bgp4PeerRoutes.AsPath().SetAsSetMode(gosnappi.BgpAsPathAsSetMode.INCLUDE_AS_SET)
+	bgpNeti1AsPath.Segments().Add().SetAsNumbers(asSeg).SetType(gosnappi.BgpAsPathSegmentType.AS_SEQ)
+
+	t.Logf("Pushing config to OTG and starting protocols...")
+	args.otg.PushConfig(t, args.otgConfig)
+	time.Sleep(30 * time.Second)
+	args.otg.StartProtocols(t)
+	time.Sleep(30 * time.Second)
+}
+
+// verifyPrefixesTelemetry confirms that the dut shows the correct numbers of installed,
+// sent and received IPv4 prefixes.
+func verifyPrefixesTelemetry(t *testing.T, dut *ondatra.DUTDevice, nbr string, wantInstalled, wantSent uint32) {
+	t.Helper()
+	statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp()
+	prefixesv4 := statePath.Neighbor(nbr).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Prefixes()
+	if gotInstalled := gnmi.Get(t, dut, prefixesv4.Installed().State()); gotInstalled != wantInstalled {
+		t.Errorf("Installed prefixes mismatch: got %v, want %v", gotInstalled, wantInstalled)
+	}
+	if gotSent := gnmi.Get(t, dut, prefixesv4.Sent().State()); gotSent != wantSent {
+		t.Errorf("Sent prefixes mismatch: got %v, want %v", gotSent, wantSent)
+	}
+}
+
+// configreRoutePolicy adds route-policy config.
+func configureRoutePolicy(t *testing.T, dut *ondatra.DUTDevice, name string, pr oc.E_RoutingPolicy_PolicyResultType) {
+	d := &oc.Root{}
+	rp := d.GetOrCreateRoutingPolicy()
+	pd := rp.GetOrCreatePolicyDefinition(name)
+	st, err := pd.AppendNewStatement("id-1")
+	if err != nil {
+		t.Fatal(err)
+	}
+	stc := st.GetOrCreateConditions()
+	stc.InstallProtocolEq = oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP
+	st.GetOrCreateActions().PolicyResult = pr
+	gnmi.Replace(t, dut, gnmi.OC().RoutingPolicy().Config(), rp)
+}
+
+// verifyOTGPrefixTelemetry is to Validate prefix received on OTG por2.
+func verifyOTGPrefixTelemetry(t *testing.T, otg *otg.OTG, wantPrefix bool) {
+	t.Helper()
+	_, ok := gnmi.WatchAll(t, otg, gnmi.OTG().BgpPeer(atePort2.Name+".BGP4.peer").UnicastIpv4PrefixAny().State(),
+		time.Minute, func(v *ygnmi.Value[*otgtelemetry.BgpPeer_UnicastIpv4Prefix]) bool {
+			return v.IsPresent()
+		}).Await(t)
+
+	if ok {
+		bgpPrefixes := gnmi.GetAll(t, otg, gnmi.OTG().BgpPeer(atePort2.Name+".BGP4.peer").UnicastIpv4PrefixAny().State())
+		for _, prefix := range bgpPrefixes {
+			if prefix.GetAddress() == advertisedRoutesv4Net {
+				if wantPrefix {
+					gotASPath := prefix.AsPath[len(prefix.AsPath)-1].GetAsNumbers()
+					t.Logf("Received prefix %v on otg as expected with AS-PATH %v", prefix.GetAddress(), gotASPath)
+				} else {
+					t.Errorf("Prefix %v is not received on otg", prefix.GetAddress())
+				}
+			}
+		}
+	}
+}
+
+// ### RT-1.54.1  Test no allow-own-in
+func testSplitHorizonNoAllowOwnIn(t *testing.T, args *otgTestArgs) {
+	t.Log("Baseline Test No allow-own-in")
+
+	t.Log("Advertise a prefix from the ATE with an AS-path that includes AS dutLocalAS1 (DUT's AS) in the middle (e.g., AS-path: 65500 dutLocalAS1 65499")
+	advBGPRouteFromOTG(t, args, []uint32{65500, dutLocalAS1, 65499})
+
+	t.Log("Validate session state and capabilities received on DUT using telemetry.")
+	cfgplugins.VerifyDUTBGPEstablished(t, args.dut)
+	cfgplugins.VerifyBGPCapabilities(t, args.dut, []*cfgplugins.BgpNeighbor{nbr1, nbr2})
+
+	t.Log("Verify that the ATE Port2 doesn't receive the route. due to the presence of its own AS in the path.")
+	verifyPrefixesTelemetry(t, args.dut, nbr1.Neighborip, 0, 0)
+	verifyPrefixesTelemetry(t, args.dut, nbr2.Neighborip, 0, 0)
+	verifyOTGPrefixTelemetry(t, args.otg, false)
+}
+
+// ### RT-1.54.2  Test "allow-own-as 1"
+func testSplitHorizonAllowOwnAs1(t *testing.T, args *otgTestArgs) {
+	t.Log("Test allow-own-as 1, Enable allow-own-as 1 on the DUT.")
+	dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(args.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
+	if deviations.BgpAllowownasDiffDefaultValue(args.dut) {
+		gnmi.Replace(t, args.dut, dutConfPath.Bgp().PeerGroup(peerGrpName1).AsPathOptions().AllowOwnAs().Config(), 2)
+	} else {
+		gnmi.Replace(t, args.dut, dutConfPath.Bgp().PeerGroup(peerGrpName1).AsPathOptions().AllowOwnAs().Config(), 1)
+	}
+
+	t.Log("Re-advertise the prefix from the ATE with the same AS-path.")
+	advBGPRouteFromOTG(t, args, []uint32{65500, dutLocalAS1, 65499})
+
+	t.Log("Validate session state and capabilities received on DUT using telemetry.")
+	cfgplugins.VerifyDUTBGPEstablished(t, args.dut)
+	cfgplugins.VerifyBGPCapabilities(t, args.dut, []*cfgplugins.BgpNeighbor{nbr1, nbr2})
+
+	t.Log("Verify that the DUT accepts the route.")
+	verifyPrefixesTelemetry(t, args.dut, nbr1.Neighborip, 1, 0)
+	verifyPrefixesTelemetry(t, args.dut, nbr2.Neighborip, 0, 1)
+
+	t.Log("Verify that the ATE Port2 receives the route.")
+	verifyOTGPrefixTelemetry(t, args.otg, true)
+
+}
+
+// ### RT-1.54.3  Test "allow-own-as 3"
+func testSplitHorizonAllowOwnAs3(t *testing.T, args *otgTestArgs) {
+	t.Log("Test allow-own-as 3, Enable allow-own-as 3 on the DUT.")
+	dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(args.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
+	if deviations.BgpAllowownasDiffDefaultValue(args.dut) {
+		gnmi.Replace(t, args.dut, dutConfPath.Bgp().PeerGroup(peerGrpName1).AsPathOptions().AllowOwnAs().Config(), 4)
+	} else {
+		gnmi.Replace(t, args.dut, dutConfPath.Bgp().PeerGroup(peerGrpName1).AsPathOptions().AllowOwnAs().Config(), 3)
+	}
+
+	t.Run("Re-advertise the prefix from the ATE with 1 Occurrence: 65500 dutLocalAS1 65499", func(t *testing.T) {
+		advBGPRouteFromOTG(t, args, []uint32{65500, dutLocalAS1, 65499})
+
+		t.Log("Validate session state and capabilities received on DUT using telemetry.")
+		cfgplugins.VerifyDUTBGPEstablished(t, args.dut)
+		cfgplugins.VerifyBGPCapabilities(t, args.dut, []*cfgplugins.BgpNeighbor{nbr1, nbr2})
+
+		t.Log("Verify that the DUT accepts the route.")
+		verifyPrefixesTelemetry(t, args.dut, nbr1.Neighborip, 1, 0)
+		verifyPrefixesTelemetry(t, args.dut, nbr2.Neighborip, 0, 1)
+
+		t.Log("Verify that the ATE Port2 receives the route.")
+		verifyOTGPrefixTelemetry(t, args.otg, true)
+	})
+
+	t.Run("Re-advertise the prefix from the ATE with 3 Occurrences: dutLocalAS1, dutLocalAS1, dutLocalAS1, 65499", func(t *testing.T) {
+		advBGPRouteFromOTG(t, args, []uint32{dutLocalAS1, dutLocalAS1, dutLocalAS1, 65499})
+
+		t.Log("Validate session state and capabilities received on DUT using telemetry.")
+		cfgplugins.VerifyDUTBGPEstablished(t, args.dut)
+
+		t.Log("Verify that the DUT accepts the route.")
+		verifyPrefixesTelemetry(t, args.dut, nbr1.Neighborip, 1, 0)
+		verifyPrefixesTelemetry(t, args.dut, nbr2.Neighborip, 0, 1)
+
+		t.Log("Verify that the ATE Port2 receives the route.")
+		verifyOTGPrefixTelemetry(t, args.otg, true)
+	})
+
+	t.Run("Re-advertise the prefix from the ATE with 4 Occurrences: dutLocalAS1, dutLocalAS1, dutLocalAS1, dutLocalAS1, 65499 (Should be rejected)", func(t *testing.T) {
+		advBGPRouteFromOTG(t, args, []uint32{dutLocalAS1, dutLocalAS1, dutLocalAS1, dutLocalAS1, 65499})
+
+		t.Log("Validate session state and capabilities received on DUT using telemetry.")
+		cfgplugins.VerifyDUTBGPEstablished(t, args.dut)
+		cfgplugins.VerifyBGPCapabilities(t, args.dut, []*cfgplugins.BgpNeighbor{nbr1, nbr2})
+
+		t.Log("Verify that the DUT accepts the route.")
+		verifyPrefixesTelemetry(t, args.dut, nbr1.Neighborip, 0, 0)
+		verifyPrefixesTelemetry(t, args.dut, nbr2.Neighborip, 0, 0)
+
+		t.Log("Verify that the ATE Port2 receives the route.")
+		verifyOTGPrefixTelemetry(t, args.otg, false)
+	})
+}
+
+// ### RT-1.54.4  Test "allow-own-as 4"
+func testSplitHorizonAllowOwnAs4(t *testing.T, args *otgTestArgs) {
+	t.Log("Test allow-own-as 4, Enable allow-own-as 4 on the DUT.")
+	dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(args.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
+	if deviations.BgpAllowownasDiffDefaultValue(args.dut) {
+		gnmi.Replace(t, args.dut, dutConfPath.Bgp().PeerGroup(peerGrpName1).AsPathOptions().AllowOwnAs().Config(), 5)
+	} else {
+		gnmi.Replace(t, args.dut, dutConfPath.Bgp().PeerGroup(peerGrpName1).AsPathOptions().AllowOwnAs().Config(), 4)
+	}
+
+	t.Run("Re-advertise the prefix from the ATE with 1 Occurrence: 65500, dutLocalAS1, 65499", func(t *testing.T) {
+		advBGPRouteFromOTG(t, args, []uint32{65500, dutLocalAS1, 65499})
+
+		t.Log("Validate session state and capabilities received on DUT using telemetry.")
+		cfgplugins.VerifyDUTBGPEstablished(t, args.dut)
+		cfgplugins.VerifyBGPCapabilities(t, args.dut, []*cfgplugins.BgpNeighbor{nbr1, nbr2})
+
+		t.Log("Verify that the DUT accepts the route.")
+		verifyPrefixesTelemetry(t, args.dut, nbr1.Neighborip, 1, 0)
+		verifyPrefixesTelemetry(t, args.dut, nbr2.Neighborip, 0, 1)
+
+		t.Log("Verify that the ATE Port2 receives the route.")
+		verifyOTGPrefixTelemetry(t, args.otg, true)
+	})
+
+	t.Run("Re-advertise the prefix from the ATE with 3 Occurrences: dutLocalAS1, dutLocalAS1, dutLocalAS1, 65499", func(t *testing.T) {
+		advBGPRouteFromOTG(t, args, []uint32{dutLocalAS1, dutLocalAS1, dutLocalAS1, 65499})
+
+		t.Log("Validate session state and capabilities received on DUT using telemetry.")
+		cfgplugins.VerifyDUTBGPEstablished(t, args.dut)
+		cfgplugins.VerifyBGPCapabilities(t, args.dut, []*cfgplugins.BgpNeighbor{nbr1, nbr2})
+
+		t.Log("Verify that the DUT accepts the route.")
+		verifyPrefixesTelemetry(t, args.dut, nbr1.Neighborip, 1, 0)
+		verifyPrefixesTelemetry(t, args.dut, nbr2.Neighborip, 0, 1)
+
+		t.Log("Verify that the ATE Port2 receives the route.")
+		verifyOTGPrefixTelemetry(t, args.otg, true)
+	})
+
+	t.Run("Re-advertise the prefix from the ATE with 4 Occurrences: dutLocalAS1, dutLocalAS1, dutLocalAS1, dutLocalAS1, 65499 (Should be accepted)", func(t *testing.T) {
+		advBGPRouteFromOTG(t, args, []uint32{dutLocalAS1, dutLocalAS1, dutLocalAS1, dutLocalAS1, 65499})
+
+		t.Log("Validate session state and capabilities received on DUT using telemetry.")
+		cfgplugins.VerifyDUTBGPEstablished(t, args.dut)
+		cfgplugins.VerifyBGPCapabilities(t, args.dut, []*cfgplugins.BgpNeighbor{nbr1, nbr2})
+
+		t.Log("Verify that the DUT accepts the route.")
+		verifyPrefixesTelemetry(t, args.dut, nbr1.Neighborip, 1, 0)
+		verifyPrefixesTelemetry(t, args.dut, nbr2.Neighborip, 0, 1)
+
+		t.Log("Verify that the ATE Port2 receives the route.")
+		verifyOTGPrefixTelemetry(t, args.otg, true)
+	})
+}
+
+type otgTestArgs struct {
+	dut           *ondatra.DUTDevice
+	ate           *ondatra.ATEDevice
+	otgBgpPeer    gosnappi.BgpV4Peer
+	otgIPv4Device gosnappi.DeviceIpv4
+	otgConfig     gosnappi.Config
+	otg           *otg.OTG
+}
+
+// TestBGPOverrideASPathSplitHorizon validates BGP Override AS-path split-horizon.
+func TestBGPOverrideASPathSplitHorizon(t *testing.T) {
+	t.Logf("Start DUT config load.")
+	dut := ondatra.DUT(t, "dut")
+	ate := ondatra.ATE(t, "ate")
+
+	t.Run("Configure DUT interfaces", func(t *testing.T) {
+		configureDUT(t, dut)
+	})
+
+	t.Run("Configure DEFAULT network instance", func(t *testing.T) {
+		dutConfNIPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut))
+		gnmi.Replace(t, dut, dutConfNIPath.Type().Config(), oc.NetworkInstanceTypes_NETWORK_INSTANCE_TYPE_DEFAULT_INSTANCE)
+	})
+
+	dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
+
+	t.Run("Configure BGP Neighbors", func(t *testing.T) {
+		configureRoutePolicy(t, dut, policyName, oc.RoutingPolicy_PolicyResultType_ACCEPT_ROUTE)
+		cfgplugins.BGPClearConfig(t, dut)
+		dutConf := bgpCreateNbr(t, dut)
+		gnmi.Replace(t, dut, dutConfPath.Config(), dutConf)
+		fptest.LogQuery(t, "DUT BGP Config", dutConfPath.Config(), gnmi.Get(t, dut, dutConfPath.Config()))
+	})
+
+	otg := ate.OTG()
+	var otgConfig gosnappi.Config
+	var otgBgpPeer gosnappi.BgpV4Peer
+	var otgIPv4Device gosnappi.DeviceIpv4
+	otgBgpPeer, otgIPv4Device, otgConfig = configureOTG(t, otg)
+
+	args := &otgTestArgs{
+		dut:           dut,
+		ate:           ate,
+		otgBgpPeer:    otgBgpPeer,
+		otgIPv4Device: otgIPv4Device,
+		otgConfig:     otgConfig,
+		otg:           otg,
+	}
+
+	t.Run("Verify port status on DUT", func(t *testing.T) {
+		cfgplugins.VerifyPortsUp(t, args.dut.Device)
+	})
+
+	t.Run("Verify BGP telemetry", func(t *testing.T) {
+		cfgplugins.VerifyDUTBGPEstablished(t, args.dut)
+		cfgplugins.VerifyBGPCapabilities(t, args.dut, []*cfgplugins.BgpNeighbor{nbr1, nbr2})
+	})
+
+	cases := []struct {
+		desc     string
+		funcName func()
+		skipMsg  string
+	}{{
+		desc:     " Baseline Test No allow-own-in",
+		funcName: func() { testSplitHorizonNoAllowOwnIn(t, args) },
+	}, {
+		desc:     " Test allow-own-as 1",
+		funcName: func() { testSplitHorizonAllowOwnAs1(t, args) },
+	}, {
+		desc:     " Test allow-own-as 3",
+		funcName: func() { testSplitHorizonAllowOwnAs3(t, args) },
+	}, {
+		desc:     " Test allow-own-as 4",
+		funcName: func() { testSplitHorizonAllowOwnAs4(t, args) },
+	}}
+	for _, tc := range cases {
+		t.Run(tc.desc, func(t *testing.T) {
+			tc.funcName()
+		})
+	}
+}
diff --git a/feature/bgp/otg_tests/bgp_override_as_path_split_horizon_test/metadata.textproto b/feature/bgp/otg_tests/bgp_override_as_path_split_horizon_test/metadata.textproto
new file mode 100644
index 00000000000..b4b418d51e2
--- /dev/null
+++ b/feature/bgp/otg_tests/bgp_override_as_path_split_horizon_test/metadata.textproto
@@ -0,0 +1,37 @@
+# proto-file: github.com/openconfig/featureprofiles/proto/metadata.proto
+# proto-message: Metadata
+
+uuid: "97f0e45a-2970-4227-9409-3003e7c7cdd7"
+plan_id: "RT-1.54"
+description: "BGP Override AS-path split-horizon"
+testbed: TESTBED_DUT_ATE_2LINKS
+platform_exceptions: {
+  platform: {
+    vendor: NOKIA
+  }
+  deviations: {
+    explicit_interface_in_default_vrf: true
+    interface_enabled: true
+  }
+}
+platform_exceptions: {
+  platform: {
+    vendor: ARISTA
+  }
+  deviations: {
+    route_policy_under_afi_unsupported: true
+    omit_l2_mtu: true
+    interface_enabled: true
+    default_network_instance: "default"
+    bgp_set_med_requires_equal_ospf_set_metric: true
+  }
+}
+platform_exceptions: {
+  platform: {
+    vendor: JUNIPER
+  }
+  deviations: {
+    bgp_allowownas_diff_default_value: true
+  }
+}
+tags: TAGS_AGGREGATION
diff --git a/internal/cfgplugins/bgp.go b/internal/cfgplugins/bgp.go
index b1b69e1b003..15b542655e5 100644
--- a/internal/cfgplugins/bgp.go
+++ b/internal/cfgplugins/bgp.go
@@ -354,6 +354,15 @@ type NeighborConfig struct {
 	AS           uint32
 }
 
+// BgpNeighbor holds BGP Peer information.
+type BgpNeighbor struct {
+	LocalAS    uint32
+	PeerAS     uint32
+	Neighborip string
+	IsV4       bool
+	PeerGrp    string
+}
+
 // buildNeigborConfig builds neighbor config based on given flags
 func (bs *BGPSession) buildNeigborConfig(isSamePG, isSameAS bool, bgpPorts []string) []*NeighborConfig {
 	nc1 := &NeighborConfig{
@@ -492,3 +501,56 @@ func containsValue[T comparable](slice []T, value T) bool {
 	}
 	return false
 }
+
+// BGPClearConfig removes all BGP configuration from the DUT.
+func BGPClearConfig(t *testing.T, dut *ondatra.DUTDevice) {
+	resetBatch := &gnmi.SetBatch{}
+	gnmi.BatchDelete(resetBatch, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Config())
+
+	if deviations.NetworkInstanceTableDeletionRequired(dut) {
+		tablePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).TableAny()
+		for _, table := range gnmi.LookupAll[*oc.NetworkInstance_Table](t, dut, tablePath.Config()) {
+			if val, ok := table.Val(); ok {
+				if val.GetProtocol() == oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP {
+					gnmi.BatchDelete(resetBatch, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Table(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, val.GetAddressFamily()).Config())
+				}
+			}
+		}
+	}
+	resetBatch.Set(t, dut)
+}
+
+// VerifyBGPCapabilities function is used to Verify BGP capabilities like route refresh as32 and mpbgp.
+func VerifyBGPCapabilities(t *testing.T, dut *ondatra.DUTDevice, nbrs []*BgpNeighbor) {
+	t.Log("Verifying BGP capabilities")
+	statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp()
+
+	for _, nbr := range nbrs {
+		nbrPath := statePath.Neighbor(nbr.Neighborip)
+
+		capabilities := map[oc.E_BgpTypes_BGP_CAPABILITY]bool{
+			oc.BgpTypes_BGP_CAPABILITY_ROUTE_REFRESH: false,
+			oc.BgpTypes_BGP_CAPABILITY_ASN32:         false,
+			oc.BgpTypes_BGP_CAPABILITY_MPBGP:         false,
+		}
+		for _, cap := range gnmi.Get(t, dut, nbrPath.SupportedCapabilities().State()) {
+			capabilities[cap] = true
+		}
+		for cap, present := range capabilities {
+			if !present {
+				t.Errorf("Capability not reported: %v", cap)
+			}
+		}
+	}
+}
+
+// VerifyPortsUp asserts that each port on the device is operating.
+func VerifyPortsUp(t *testing.T, dev *ondatra.Device) {
+	t.Helper()
+	for _, p := range dev.Ports() {
+		status := gnmi.Get(t, dev, gnmi.OC().Interface(p.Name()).OperStatus().State())
+		if want := oc.Interface_OperStatus_UP; status != want {
+			t.Errorf("%s Status: got %v, want %v", p, status, want)
+		}
+	}
+}
diff --git a/internal/deviations/deviations.go b/internal/deviations/deviations.go
index b63bf2c716f..72f44101917 100644
--- a/internal/deviations/deviations.go
+++ b/internal/deviations/deviations.go
@@ -1202,3 +1202,8 @@ func BgpSessionStateIdleInPassiveMode(dut *ondatra.DUTDevice) bool {
 func EnableMultipathUnderAfiSafi(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetEnableMultipathUnderAfiSafi()
 }
+
+// Device have different default value for allow own as.
+func BgpAllowownasDiffDefaultValue(dut *ondatra.DUTDevice) bool {
+	return lookupDUTDeviations(dut).GetBgpAllowownasDiffDefaultValue()
+}
diff --git a/proto/metadata.proto b/proto/metadata.proto
index 34bab43fa57..4ba20118e10 100644
--- a/proto/metadata.proto
+++ b/proto/metadata.proto
@@ -636,11 +636,14 @@ message Metadata {
     // BGP session state idle is supported in passive mode instead of active
     // Cisco: b/376021545
     bool bgp_session_state_idle_in_passive_mode = 229;
-
     // EnableMultipathUnderAfiSafi returns true for devices that do not support multipath under /global path and instead support under global/afi/safi path
     // CISCO: b/376241033
     // CISCO: b/340859662
     bool enable_multipath_under_afi_safi = 230;
+    // Device have different default value for allow own as.
+    // Juniper : b/373559004
+    bool bgp_allowownas_diff_default_value = 231;
+
     // Reserved field numbers and identifiers.
     reserved 84, 9, 28, 20, 90, 97, 55, 89, 19, 36, 35, 40, 173;
   }
diff --git a/proto/metadata_go_proto/metadata.pb.go b/proto/metadata_go_proto/metadata.pb.go
index 492051766c2..76a2baddbe4 100644
--- a/proto/metadata_go_proto/metadata.pb.go
+++ b/proto/metadata_go_proto/metadata.pb.go
@@ -14,8 +14,8 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
-// 	protoc        v3.21.12
+// 	protoc-gen-go v1.34.2
+// 	protoc        v3.6.1
 // source: metadata.proto
 
 package metadata_go_proto
@@ -922,6 +922,9 @@ type Metadata_Deviations struct {
 	// CISCO: b/376241033
 	// CISCO: b/340859662
 	EnableMultipathUnderAfiSafi bool `protobuf:"varint,230,opt,name=enable_multipath_under_afi_safi,json=enableMultipathUnderAfiSafi,proto3" json:"enable_multipath_under_afi_safi,omitempty"`
+	// Device have different default value for allow own as.
+	// Juniper : b/373559004
+	BgpAllowownasDiffDefaultValue bool `protobuf:"varint,231,opt,name=bgp_allowownas_diff_default_value,json=bgpAllowownasDiffDefaultValue,proto3" json:"bgp_allowownas_diff_default_value,omitempty"`
 }
 
 func (x *Metadata_Deviations) Reset() {
@@ -2419,6 +2422,13 @@ func (x *Metadata_Deviations) GetEnableMultipathUnderAfiSafi() bool {
 	return false
 }
 
+func (x *Metadata_Deviations) GetBgpAllowownasDiffDefaultValue() bool {
+	if x != nil {
+		return x.BgpAllowownasDiffDefaultValue
+	}
+	return false
+}
+
 type Metadata_PlatformExceptions struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2482,7 +2492,7 @@ var file_metadata_proto_rawDesc = []byte{
 	0x74, 0x69, 0x6e, 0x67, 0x1a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
 	0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x6f, 0x6e, 0x64, 0x61,
 	0x74, 0x72, 0x61, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x62, 0x65,
-	0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xef, 0x81, 0x01, 0x0a, 0x08, 0x4d, 0x65, 0x74,
+	0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xba, 0x82, 0x01, 0x0a, 0x08, 0x4d, 0x65, 0x74,
 	0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x70, 0x6c, 0x61,
 	0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x6c, 0x61, 0x6e,
@@ -2516,7 +2526,7 @@ var file_metadata_proto_rawDesc = []byte{
 	0x65, 0x67, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x73, 0x6f, 0x66, 0x74,
 	0x77, 0x61, 0x72, 0x65, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x67, 0x65, 0x78,
 	0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x0e, 0x68, 0x61, 0x72, 0x64, 0x77, 0x61, 0x72, 0x65,
-	0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x1a, 0xc2, 0x79, 0x0a, 0x0a, 0x44, 0x65, 0x76, 0x69, 0x61,
+	0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x1a, 0x8d, 0x7a, 0x0a, 0x0a, 0x44, 0x65, 0x76, 0x69, 0x61,
 	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x30, 0x0a, 0x14, 0x69, 0x70, 0x76, 0x34, 0x5f, 0x6d, 0x69,
 	0x73, 0x73, 0x69, 0x6e, 0x67, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x08, 0x52, 0x12, 0x69, 0x70, 0x76, 0x34, 0x4d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67,
@@ -3483,46 +3493,50 @@ var file_metadata_proto_rawDesc = []byte{
 	0x75, 0x6c, 0x74, 0x69, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x5f, 0x61,
 	0x66, 0x69, 0x5f, 0x73, 0x61, 0x66, 0x69, 0x18, 0xe6, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1b,
 	0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x61, 0x74, 0x68, 0x55,
-	0x6e, 0x64, 0x65, 0x72, 0x41, 0x66, 0x69, 0x53, 0x61, 0x66, 0x69, 0x4a, 0x04, 0x08, 0x54, 0x10,
-	0x55, 0x4a, 0x04, 0x08, 0x09, 0x10, 0x0a, 0x4a, 0x04, 0x08, 0x1c, 0x10, 0x1d, 0x4a, 0x04, 0x08,
-	0x14, 0x10, 0x15, 0x4a, 0x04, 0x08, 0x5a, 0x10, 0x5b, 0x4a, 0x04, 0x08, 0x61, 0x10, 0x62, 0x4a,
-	0x04, 0x08, 0x37, 0x10, 0x38, 0x4a, 0x04, 0x08, 0x59, 0x10, 0x5a, 0x4a, 0x04, 0x08, 0x13, 0x10,
-	0x14, 0x4a, 0x04, 0x08, 0x24, 0x10, 0x25, 0x4a, 0x04, 0x08, 0x23, 0x10, 0x24, 0x4a, 0x04, 0x08,
-	0x28, 0x10, 0x29, 0x4a, 0x06, 0x08, 0xad, 0x01, 0x10, 0xae, 0x01, 0x1a, 0xa0, 0x01, 0x0a, 0x12,
-	0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x12, 0x41, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x6e, 0x64, 0x65, 0x72, 0x41, 0x66, 0x69, 0x53, 0x61, 0x66, 0x69, 0x12, 0x49, 0x0a, 0x21, 0x62,
+	0x67, 0x70, 0x5f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x6f, 0x77, 0x6e, 0x61, 0x73, 0x5f, 0x64, 0x69,
+	0x66, 0x66, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0xe7, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1d, 0x62, 0x67, 0x70, 0x41, 0x6c, 0x6c, 0x6f,
+	0x77, 0x6f, 0x77, 0x6e, 0x61, 0x73, 0x44, 0x69, 0x66, 0x66, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c,
+	0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4a, 0x04, 0x08, 0x54, 0x10, 0x55, 0x4a, 0x04, 0x08, 0x09,
+	0x10, 0x0a, 0x4a, 0x04, 0x08, 0x1c, 0x10, 0x1d, 0x4a, 0x04, 0x08, 0x14, 0x10, 0x15, 0x4a, 0x04,
+	0x08, 0x5a, 0x10, 0x5b, 0x4a, 0x04, 0x08, 0x61, 0x10, 0x62, 0x4a, 0x04, 0x08, 0x37, 0x10, 0x38,
+	0x4a, 0x04, 0x08, 0x59, 0x10, 0x5a, 0x4a, 0x04, 0x08, 0x13, 0x10, 0x14, 0x4a, 0x04, 0x08, 0x24,
+	0x10, 0x25, 0x4a, 0x04, 0x08, 0x23, 0x10, 0x24, 0x4a, 0x04, 0x08, 0x28, 0x10, 0x29, 0x4a, 0x06,
+	0x08, 0xad, 0x01, 0x10, 0xae, 0x01, 0x1a, 0xa0, 0x01, 0x0a, 0x12, 0x50, 0x6c, 0x61, 0x74, 0x66,
+	0x6f, 0x72, 0x6d, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x41, 0x0a,
+	0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x25, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x65, 0x73,
+	0x74, 0x69, 0x6e, 0x67, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x50, 0x6c,
+	0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d,
+	0x12, 0x47, 0x0a, 0x0a, 0x64, 0x65, 0x76, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
 	0x67, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0x2e, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x52, 0x08, 0x70, 0x6c, 0x61,
-	0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x47, 0x0a, 0x0a, 0x64, 0x65, 0x76, 0x69, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6f, 0x70, 0x65, 0x6e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x4d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x52, 0x0a, 0x64, 0x65, 0x76, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xfa,
-	0x01, 0x0a, 0x07, 0x54, 0x65, 0x73, 0x74, 0x62, 0x65, 0x64, 0x12, 0x17, 0x0a, 0x13, 0x54, 0x45,
-	0x53, 0x54, 0x42, 0x45, 0x44, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45,
-	0x44, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x45, 0x53, 0x54, 0x42, 0x45, 0x44, 0x5f, 0x44,
-	0x55, 0x54, 0x10, 0x01, 0x12, 0x1a, 0x0a, 0x16, 0x54, 0x45, 0x53, 0x54, 0x42, 0x45, 0x44, 0x5f,
-	0x44, 0x55, 0x54, 0x5f, 0x44, 0x55, 0x54, 0x5f, 0x34, 0x4c, 0x49, 0x4e, 0x4b, 0x53, 0x10, 0x02,
-	0x12, 0x1a, 0x0a, 0x16, 0x54, 0x45, 0x53, 0x54, 0x42, 0x45, 0x44, 0x5f, 0x44, 0x55, 0x54, 0x5f,
-	0x41, 0x54, 0x45, 0x5f, 0x32, 0x4c, 0x49, 0x4e, 0x4b, 0x53, 0x10, 0x03, 0x12, 0x1a, 0x0a, 0x16,
-	0x54, 0x45, 0x53, 0x54, 0x42, 0x45, 0x44, 0x5f, 0x44, 0x55, 0x54, 0x5f, 0x41, 0x54, 0x45, 0x5f,
-	0x34, 0x4c, 0x49, 0x4e, 0x4b, 0x53, 0x10, 0x04, 0x12, 0x1e, 0x0a, 0x1a, 0x54, 0x45, 0x53, 0x54,
-	0x42, 0x45, 0x44, 0x5f, 0x44, 0x55, 0x54, 0x5f, 0x41, 0x54, 0x45, 0x5f, 0x39, 0x4c, 0x49, 0x4e,
-	0x4b, 0x53, 0x5f, 0x4c, 0x41, 0x47, 0x10, 0x05, 0x12, 0x1e, 0x0a, 0x1a, 0x54, 0x45, 0x53, 0x54,
-	0x42, 0x45, 0x44, 0x5f, 0x44, 0x55, 0x54, 0x5f, 0x44, 0x55, 0x54, 0x5f, 0x41, 0x54, 0x45, 0x5f,
-	0x32, 0x4c, 0x49, 0x4e, 0x4b, 0x53, 0x10, 0x06, 0x12, 0x1a, 0x0a, 0x16, 0x54, 0x45, 0x53, 0x54,
-	0x42, 0x45, 0x44, 0x5f, 0x44, 0x55, 0x54, 0x5f, 0x41, 0x54, 0x45, 0x5f, 0x38, 0x4c, 0x49, 0x4e,
-	0x4b, 0x53, 0x10, 0x07, 0x12, 0x15, 0x0a, 0x11, 0x54, 0x45, 0x53, 0x54, 0x42, 0x45, 0x44, 0x5f,
-	0x44, 0x55, 0x54, 0x5f, 0x34, 0x30, 0x30, 0x5a, 0x52, 0x10, 0x08, 0x22, 0x6d, 0x0a, 0x04, 0x54,
-	0x61, 0x67, 0x73, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x41, 0x47, 0x53, 0x5f, 0x55, 0x4e, 0x53, 0x50,
-	0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x41, 0x47,
-	0x53, 0x5f, 0x41, 0x47, 0x47, 0x52, 0x45, 0x47, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x01, 0x12,
-	0x18, 0x0a, 0x14, 0x54, 0x41, 0x47, 0x53, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x43, 0x45, 0x4e, 0x54,
-	0x45, 0x52, 0x5f, 0x45, 0x44, 0x47, 0x45, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x54, 0x41, 0x47,
-	0x53, 0x5f, 0x45, 0x44, 0x47, 0x45, 0x10, 0x03, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x41, 0x47, 0x53,
-	0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x49, 0x54, 0x10, 0x04, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x74, 0x61, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x0a, 0x64,
+	0x65, 0x76, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xfa, 0x01, 0x0a, 0x07, 0x54, 0x65,
+	0x73, 0x74, 0x62, 0x65, 0x64, 0x12, 0x17, 0x0a, 0x13, 0x54, 0x45, 0x53, 0x54, 0x42, 0x45, 0x44,
+	0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0f,
+	0x0a, 0x0b, 0x54, 0x45, 0x53, 0x54, 0x42, 0x45, 0x44, 0x5f, 0x44, 0x55, 0x54, 0x10, 0x01, 0x12,
+	0x1a, 0x0a, 0x16, 0x54, 0x45, 0x53, 0x54, 0x42, 0x45, 0x44, 0x5f, 0x44, 0x55, 0x54, 0x5f, 0x44,
+	0x55, 0x54, 0x5f, 0x34, 0x4c, 0x49, 0x4e, 0x4b, 0x53, 0x10, 0x02, 0x12, 0x1a, 0x0a, 0x16, 0x54,
+	0x45, 0x53, 0x54, 0x42, 0x45, 0x44, 0x5f, 0x44, 0x55, 0x54, 0x5f, 0x41, 0x54, 0x45, 0x5f, 0x32,
+	0x4c, 0x49, 0x4e, 0x4b, 0x53, 0x10, 0x03, 0x12, 0x1a, 0x0a, 0x16, 0x54, 0x45, 0x53, 0x54, 0x42,
+	0x45, 0x44, 0x5f, 0x44, 0x55, 0x54, 0x5f, 0x41, 0x54, 0x45, 0x5f, 0x34, 0x4c, 0x49, 0x4e, 0x4b,
+	0x53, 0x10, 0x04, 0x12, 0x1e, 0x0a, 0x1a, 0x54, 0x45, 0x53, 0x54, 0x42, 0x45, 0x44, 0x5f, 0x44,
+	0x55, 0x54, 0x5f, 0x41, 0x54, 0x45, 0x5f, 0x39, 0x4c, 0x49, 0x4e, 0x4b, 0x53, 0x5f, 0x4c, 0x41,
+	0x47, 0x10, 0x05, 0x12, 0x1e, 0x0a, 0x1a, 0x54, 0x45, 0x53, 0x54, 0x42, 0x45, 0x44, 0x5f, 0x44,
+	0x55, 0x54, 0x5f, 0x44, 0x55, 0x54, 0x5f, 0x41, 0x54, 0x45, 0x5f, 0x32, 0x4c, 0x49, 0x4e, 0x4b,
+	0x53, 0x10, 0x06, 0x12, 0x1a, 0x0a, 0x16, 0x54, 0x45, 0x53, 0x54, 0x42, 0x45, 0x44, 0x5f, 0x44,
+	0x55, 0x54, 0x5f, 0x41, 0x54, 0x45, 0x5f, 0x38, 0x4c, 0x49, 0x4e, 0x4b, 0x53, 0x10, 0x07, 0x12,
+	0x15, 0x0a, 0x11, 0x54, 0x45, 0x53, 0x54, 0x42, 0x45, 0x44, 0x5f, 0x44, 0x55, 0x54, 0x5f, 0x34,
+	0x30, 0x30, 0x5a, 0x52, 0x10, 0x08, 0x22, 0x6d, 0x0a, 0x04, 0x54, 0x61, 0x67, 0x73, 0x12, 0x14,
+	0x0a, 0x10, 0x54, 0x41, 0x47, 0x53, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49,
+	0x45, 0x44, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x41, 0x47, 0x53, 0x5f, 0x41, 0x47, 0x47,
+	0x52, 0x45, 0x47, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x54, 0x41,
+	0x47, 0x53, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x5f, 0x45, 0x44,
+	0x47, 0x45, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x54, 0x41, 0x47, 0x53, 0x5f, 0x45, 0x44, 0x47,
+	0x45, 0x10, 0x03, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x41, 0x47, 0x53, 0x5f, 0x54, 0x52, 0x41, 0x4e,
+	0x53, 0x49, 0x54, 0x10, 0x04, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -3539,7 +3553,7 @@ func file_metadata_proto_rawDescGZIP() []byte {
 
 var file_metadata_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
 var file_metadata_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-var file_metadata_proto_goTypes = []interface{}{
+var file_metadata_proto_goTypes = []any{
 	(Metadata_Testbed)(0),               // 0: openconfig.testing.Metadata.Testbed
 	(Metadata_Tags)(0),                  // 1: openconfig.testing.Metadata.Tags
 	(*Metadata)(nil),                    // 2: openconfig.testing.Metadata
@@ -3568,7 +3582,7 @@ func file_metadata_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_metadata_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_metadata_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*Metadata); i {
 			case 0:
 				return &v.state
@@ -3580,7 +3594,7 @@ func file_metadata_proto_init() {
 				return nil
 			}
 		}
-		file_metadata_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_metadata_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*Metadata_Platform); i {
 			case 0:
 				return &v.state
@@ -3592,7 +3606,7 @@ func file_metadata_proto_init() {
 				return nil
 			}
 		}
-		file_metadata_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_metadata_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*Metadata_Deviations); i {
 			case 0:
 				return &v.state
@@ -3604,7 +3618,7 @@ func file_metadata_proto_init() {
 				return nil
 			}
 		}
-		file_metadata_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_metadata_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*Metadata_PlatformExceptions); i {
 			case 0:
 				return &v.state

From eb4179008dbc93182ccdeffbe7be627dfe5b9891 Mon Sep 17 00:00:00 2001
From: Ram <rmachat@google.com>
Date: Tue, 12 Nov 2024 15:00:34 +0530
Subject: [PATCH 02/14] fixing interface level config and timer (#3577)

---
 .../isis_metric_style_wide_enabled_test.go                    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/feature/isis/otg_tests/isis_metric_style_wide_enabled_test/isis_metric_style_wide_enabled_test.go b/feature/isis/otg_tests/isis_metric_style_wide_enabled_test/isis_metric_style_wide_enabled_test.go
index 2ed2ac22d73..5a1f9f29362 100644
--- a/feature/isis/otg_tests/isis_metric_style_wide_enabled_test/isis_metric_style_wide_enabled_test.go
+++ b/feature/isis/otg_tests/isis_metric_style_wide_enabled_test/isis_metric_style_wide_enabled_test.go
@@ -105,6 +105,8 @@ func configureISIS(t *testing.T, ts *isissession.TestSession) {
 	// Interface level configs.
 	isisIntfLevel := intf.GetOrCreateLevel(2)
 	isisIntfLevel.LevelNumber = ygot.Uint8(2)
+	isisIntfLevel.SetEnabled(true)
+	isisIntfLevel.Enabled = ygot.Bool(true)
 	isisIntfLevel.GetOrCreateHelloAuthentication().Enabled = ygot.Bool(true)
 	isisIntfLevel.GetHelloAuthentication().AuthPassword = ygot.String(password)
 	isisIntfLevel.GetHelloAuthentication().AuthType = oc.KeychainTypes_AUTH_TYPE_SIMPLE_KEY
@@ -191,6 +193,7 @@ func TestISISWideMetricEnabled(t *testing.T) {
 	fptest.LogQuery(t, "Protocol ISIS", isissession.ProtocolPath(ts.DUT).Config(), pcl)
 
 	ts.PushAndStart(t)
+	time.Sleep(time.Minute * 2)
 
 	statePath := isissession.ISISPath(ts.DUT)
 	intfName := ts.DUTPort1.Name()
@@ -198,6 +201,7 @@ func TestISISWideMetricEnabled(t *testing.T) {
 		intfName += ".0"
 	}
 	t.Run("ISIS telemetry", func(t *testing.T) {
+		time.Sleep(time.Minute * 2)
 
 		// Checking adjacency
 		ateSysID, err := ts.AwaitAdjacency()

From f1ea9802e5620e8c13adbdf90ff2a57eb72b235e Mon Sep 17 00:00:00 2001
From: Darren Loher <dloher@google.com>
Date: Tue, 12 Nov 2024 12:06:48 -0800
Subject: [PATCH 03/14] Add canonical OC to test README template (#3336)

* Update test-requirements-template.md to require Canonical OC section, written in JSON format
---
 doc/test-requirements-template.md | 87 ++++++++++++++++++++++++-------
 1 file changed, 68 insertions(+), 19 deletions(-)

diff --git a/doc/test-requirements-template.md b/doc/test-requirements-template.md
index 4a4abfb4830..4b65d1d866e 100644
--- a/doc/test-requirements-template.md
+++ b/doc/test-requirements-template.md
@@ -8,41 +8,89 @@ assignees: ''
 
 # Instructions for this template
 
-Below is the required template for writing test requirements.  Good examples of test
-requirements include:
+Below is the required template for writing test requirements.  Good examples of
+test requirements include:
 
-* [TE-3.7: Base Hierarchical NHG Update](/feature/gribi/otg_tests/base_hierarchical_nhg_update/README.md)
-* [gNMI-1.13: Telemetry: Optics Power and Bias Current](https://github.com/openconfig/featureprofiles/blob/main/feature/platform/tests/optics_power_and_bias_current_test/README.md)
-* [RT-5.1: Singleton Interface](https://github.com/openconfig/featureprofiles/blob/main/feature/interface/singleton/otg_tests/singleton_test/README.md)
+* [TE-18.1 gRIBI MPLS in UDP Encapsulation and
+  Decapsulation](https://github.com/openconfig/featureprofiles/blob/main/feature/gribi/otg_tests/mpls_in_udp/README.md)
+* [TE-3.7: Base Hierarchical NHG
+  Update](/feature/gribi/otg_tests/base_hierarchical_nhg_update/README.md)
+* [gNMI-1.13: Telemetry: Optics Power and Bias
+  Current](https://github.com/openconfig/featureprofiles/blob/main/feature/platform/tests/optics_power_and_bias_current_test/README.md)
 
 # TestID-x.y: Short name of test here
 
 ## Summary
 
-Write a few sentences or paragraphs describing the purpose and scope of the test.
+Write a few sentences or paragraphs describing the purpose and scope of the
+test.
 
 ## Testbed type
 
-* Specify the .testbed topology file from the [topologies](https://github.com/openconfig/featureprofiles/tree/main/topologies) folder to be used with this test
+* Specify the .testbed topology file from the
+  [topologies](https://github.com/openconfig/featureprofiles/tree/main/topologies)
+  folder to be used with this test
 
 ## Procedure
 
-* Test environment setup
-  * Description of procedure to configure ATE and DUT with pre-requisites making it possible to cover the intended paths and RPC's.
+### Test environment setup
+
+* Description of procedure to configure ATE and DUT with pre-requisites making
+  it possible to cover the intended paths and RPCs.
+
+### TestID-x.y.1 - Name of subtest 1
+
+The following steps are typically present in each subtest.
+
+* Step 1 - Generate DUT configuration
+
+Replace this JSON formatted content with the "Canonical OC" that is expected to
+be generated by the subtest. This configuration should be in JSON format.
+
+```json
+{
+  "openconfig-qos": {
+    "interfaces": [
+      {
+        "config": {
+          "interface-id": "PortChannel1.100"
+        },
+        "input": {
+          "classifiers": [
+            {
+              "classifier": "dest_A",
+              "config": {
+                "name": "dest_A",
+                "type": "IPV4"
+              }
+            }
+          ],
+          "scheduler-policy": {
+            "config": {
+              "name": "limit_group_A_1Gb"
+            }
+          }
+        },
+        "interface": "PortChannel1.100"
+      },
+    ]
+  }
+}
+```
+
+* Step 2 - Push configuration to DUT using gnmi.Set with REPLACE option
+* Step 3 - Send Traffic
+* Step 4 - Validation with pass/fail criteria
 
-* TestID-x.y.z - Name of subtest
-  * Step 1
-  * Step 2
-  * Validation and pass/fail criteria
+### TestID-x.y.2 - Name of subtest 2
 
-* TestID-x.y.z - Name of subtest
-  * Step 1
-  * Step 2
-  * Validation and pass/fail criteria
+Repeat the format of the first subtest for each additional subtest defined.
 
 ## OpenConfig Path and RPC Coverage
 
-This example yaml defines the OC paths intended to be covered by this test.  OC paths used for test environment setup are not required to be listed here.
+This yaml stanza defines the OC paths intended to be covered by this test.  OC
+paths used for test environment setup are not required to be listed here. This
+content is parsed by automation to derive the test coverage
 
 ```yaml
 paths:
@@ -64,6 +112,7 @@ rpcs:
 ## Required DUT platform
 
 * Specify the minimum DUT-type:
-  * MFF - A modular form factor device containing LINECARDs, FABRIC and redundant CONTROLLER_CARD components
+  * MFF - A modular form factor device containing LINECARDs, FABRIC and
+    redundant CONTROLLER_CARD components
   * FFF - fixed form factor
   * vRX - virtual router device

From e965ab01f8cc542d2e870052664d082efcdc2f15 Mon Sep 17 00:00:00 2001
From: Chris Morrow <chris+github@as701.net>
Date: Wed, 13 Nov 2024 00:02:22 -0800
Subject: [PATCH 04/14] Rename Packages in features/security. (#3581)

The package name config for each golang test package
could have been more specified.
---
 .../tests/record_subscribe_full/record_subscribe_full_test.go   | 2 +-
 .../record_subscribe_non_grpc/record_subscribe_non_grpc_test.go | 2 +-
 .../record_subscribe_partial/record_subscribe_partial_test.go   | 2 +-
 .../tests/hiba_authentication/hiba_authentication_test.go       | 2 +-
 .../tests/host_certificates/host_certificates_test.go           | 2 +-
 .../tests/password_console_login/password_console_login_test.go | 2 +-
 .../ssh_password_login_disallowed_test.go                       | 2 +-
 .../ssh_public_key_authentication_test.go                       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/feature/security/gnsi/acctz/tests/record_subscribe_full/record_subscribe_full_test.go b/feature/security/gnsi/acctz/tests/record_subscribe_full/record_subscribe_full_test.go
index b7b6ef9ff79..b04bd0809d5 100644
--- a/feature/security/gnsi/acctz/tests/record_subscribe_full/record_subscribe_full_test.go
+++ b/feature/security/gnsi/acctz/tests/record_subscribe_full/record_subscribe_full_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package recordsubscribefull
+package recordsubscribefull_test
 
 import (
 	"context"
diff --git a/feature/security/gnsi/acctz/tests/record_subscribe_non_grpc/record_subscribe_non_grpc_test.go b/feature/security/gnsi/acctz/tests/record_subscribe_non_grpc/record_subscribe_non_grpc_test.go
index e41c73b2bcf..351f2792566 100644
--- a/feature/security/gnsi/acctz/tests/record_subscribe_non_grpc/record_subscribe_non_grpc_test.go
+++ b/feature/security/gnsi/acctz/tests/record_subscribe_non_grpc/record_subscribe_non_grpc_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package recordsubscribenongrpc
+package recordsubscribenongrpc_test
 
 import (
 	"context"
diff --git a/feature/security/gnsi/acctz/tests/record_subscribe_partial/record_subscribe_partial_test.go b/feature/security/gnsi/acctz/tests/record_subscribe_partial/record_subscribe_partial_test.go
index 51334465192..94a32cd457b 100644
--- a/feature/security/gnsi/acctz/tests/record_subscribe_partial/record_subscribe_partial_test.go
+++ b/feature/security/gnsi/acctz/tests/record_subscribe_partial/record_subscribe_partial_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package recordsubscribepartial
+package recordsubscribepartial_test
 
 import (
 	"context"
diff --git a/feature/security/gnsi/credentialz/tests/hiba_authentication/hiba_authentication_test.go b/feature/security/gnsi/credentialz/tests/hiba_authentication/hiba_authentication_test.go
index f8678483fdb..d63699abff9 100644
--- a/feature/security/gnsi/credentialz/tests/hiba_authentication/hiba_authentication_test.go
+++ b/feature/security/gnsi/credentialz/tests/hiba_authentication/hiba_authentication_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package hibaauthentication
+package hibaauthentication_test
 
 import (
 	"fmt"
diff --git a/feature/security/gnsi/credentialz/tests/host_certificates/host_certificates_test.go b/feature/security/gnsi/credentialz/tests/host_certificates/host_certificates_test.go
index bedcfbe31ef..f728ae0f531 100644
--- a/feature/security/gnsi/credentialz/tests/host_certificates/host_certificates_test.go
+++ b/feature/security/gnsi/credentialz/tests/host_certificates/host_certificates_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package hostcertificates
+package hostcertificates_test
 
 import (
 	"fmt"
diff --git a/feature/security/gnsi/credentialz/tests/password_console_login/password_console_login_test.go b/feature/security/gnsi/credentialz/tests/password_console_login/password_console_login_test.go
index 574578fcf12..97ac39b3c94 100644
--- a/feature/security/gnsi/credentialz/tests/password_console_login/password_console_login_test.go
+++ b/feature/security/gnsi/credentialz/tests/password_console_login/password_console_login_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package passwordconsolelogin
+package passwordconsolelogin_test
 
 import (
 	"testing"
diff --git a/feature/security/gnsi/credentialz/tests/ssh_password_login_disallowed/ssh_password_login_disallowed_test.go b/feature/security/gnsi/credentialz/tests/ssh_password_login_disallowed/ssh_password_login_disallowed_test.go
index 424d92a9e46..f2cd77e93e3 100644
--- a/feature/security/gnsi/credentialz/tests/ssh_password_login_disallowed/ssh_password_login_disallowed_test.go
+++ b/feature/security/gnsi/credentialz/tests/ssh_password_login_disallowed/ssh_password_login_disallowed_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package sshpasswordlogindisallowed
+package sshpasswordlogindisallowed_test
 
 import (
 	"context"
diff --git a/feature/security/gnsi/credentialz/tests/ssh_public_key_authentication/ssh_public_key_authentication_test.go b/feature/security/gnsi/credentialz/tests/ssh_public_key_authentication/ssh_public_key_authentication_test.go
index 781acf4e6fb..de5530d7b20 100644
--- a/feature/security/gnsi/credentialz/tests/ssh_public_key_authentication/ssh_public_key_authentication_test.go
+++ b/feature/security/gnsi/credentialz/tests/ssh_public_key_authentication/ssh_public_key_authentication_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package sshpublickeyauthentication
+package sshpublickeyauthentication_test
 
 import (
 	"os"

From f1acfb20a9c2f1cfe30ca9fb6b76362a108fbbac Mon Sep 17 00:00:00 2001
From: Chris Morrow <chris+github@as701.net>
Date: Wed, 13 Nov 2024 14:17:20 -0800
Subject: [PATCH 05/14] Fix some go-lint problems. (#3582)

* Rename Packages in features/security.

The package name config for each golang test package
could have been more specified.

* Address go-lint problems.
---
 .../tests/record_subscribe_full/record_subscribe_full_test.go   | 2 +-
 .../record_subscribe_non_grpc/record_subscribe_non_grpc_test.go | 2 +-
 .../record_subscribe_partial/record_subscribe_partial_test.go   | 2 +-
 internal/deviations/deviations.go                               | 2 +-
 internal/otg_helpers/otg_config_helpers/otgflowhelpers.go       | 1 -
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/feature/security/gnsi/acctz/tests/record_subscribe_full/record_subscribe_full_test.go b/feature/security/gnsi/acctz/tests/record_subscribe_full/record_subscribe_full_test.go
index b04bd0809d5..4c6e329f8d2 100644
--- a/feature/security/gnsi/acctz/tests/record_subscribe_full/record_subscribe_full_test.go
+++ b/feature/security/gnsi/acctz/tests/record_subscribe_full/record_subscribe_full_test.go
@@ -39,7 +39,7 @@ func TestMain(m *testing.M) {
 	fptest.RunTests(m)
 }
 
-func prettyPrint(i interface{}) string {
+func prettyPrint(i any) string {
 	s, _ := json.MarshalIndent(i, "", "\t")
 	return string(s)
 }
diff --git a/feature/security/gnsi/acctz/tests/record_subscribe_non_grpc/record_subscribe_non_grpc_test.go b/feature/security/gnsi/acctz/tests/record_subscribe_non_grpc/record_subscribe_non_grpc_test.go
index 351f2792566..97812587dc9 100644
--- a/feature/security/gnsi/acctz/tests/record_subscribe_non_grpc/record_subscribe_non_grpc_test.go
+++ b/feature/security/gnsi/acctz/tests/record_subscribe_non_grpc/record_subscribe_non_grpc_test.go
@@ -39,7 +39,7 @@ func TestMain(m *testing.M) {
 	fptest.RunTests(m)
 }
 
-func prettyPrint(i interface{}) string {
+func prettyPrint(i any) string {
 	s, _ := json.MarshalIndent(i, "", "\t")
 	return string(s)
 }
diff --git a/feature/security/gnsi/acctz/tests/record_subscribe_partial/record_subscribe_partial_test.go b/feature/security/gnsi/acctz/tests/record_subscribe_partial/record_subscribe_partial_test.go
index 94a32cd457b..136f2d3d7ad 100644
--- a/feature/security/gnsi/acctz/tests/record_subscribe_partial/record_subscribe_partial_test.go
+++ b/feature/security/gnsi/acctz/tests/record_subscribe_partial/record_subscribe_partial_test.go
@@ -40,7 +40,7 @@ func TestMain(m *testing.M) {
 	fptest.RunTests(m)
 }
 
-func prettyPrint(i interface{}) string {
+func prettyPrint(i any) string {
 	s, _ := json.MarshalIndent(i, "", "\t")
 	return string(s)
 }
diff --git a/internal/deviations/deviations.go b/internal/deviations/deviations.go
index 72f44101917..247437e3422 100644
--- a/internal/deviations/deviations.go
+++ b/internal/deviations/deviations.go
@@ -1203,7 +1203,7 @@ func EnableMultipathUnderAfiSafi(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetEnableMultipathUnderAfiSafi()
 }
 
-// Device have different default value for allow own as.
+// BgpAllowownasDiffDefaultValue permits a device to have a different default value for allow own as.
 func BgpAllowownasDiffDefaultValue(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetBgpAllowownasDiffDefaultValue()
 }
diff --git a/internal/otg_helpers/otg_config_helpers/otgflowhelpers.go b/internal/otg_helpers/otg_config_helpers/otgflowhelpers.go
index fe619f5f735..23ffc578c2d 100644
--- a/internal/otg_helpers/otg_config_helpers/otgflowhelpers.go
+++ b/internal/otg_helpers/otg_config_helpers/otgflowhelpers.go
@@ -1,4 +1,3 @@
-// Package otgconfighelpers provides helper functions to create different flows on traffic generator.
 package otgconfighelpers
 
 import (

From 466c52437f19bcb67c93deb79e1d154f2ce43830 Mon Sep 17 00:00:00 2001
From: Chris Morrow <chris+github@as701.net>
Date: Wed, 13 Nov 2024 15:34:01 -0800
Subject: [PATCH 06/14] Separate the imports named acctz, make the PB - acctzpb
 (#3586)

* Separate the imports named acctz, make the PB - acctzpb

Impossible to have 2 imports with the same name (acctz).
Follow the standard protobuf import naming standard.

* Fix typo.
---
 .../record_history_truncation_test.go                  |  4 ++--
 .../record_payload_truncation_test.go                  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/feature/security/gnsi/acctz/tests/record_history_truncation/record_history_truncation_test.go b/feature/security/gnsi/acctz/tests/record_history_truncation/record_history_truncation_test.go
index b034ac91b97..1c14c9ef1ab 100644
--- a/feature/security/gnsi/acctz/tests/record_history_truncation/record_history_truncation_test.go
+++ b/feature/security/gnsi/acctz/tests/record_history_truncation/record_history_truncation_test.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/openconfig/featureprofiles/internal/fptest"
-	"github.com/openconfig/gnsi/acctz"
+	acctzpb "github.com/openconfig/gnsi/acctz"
 	"github.com/openconfig/ondatra"
 	"github.com/openconfig/ondatra/gnmi"
 	"google.golang.org/protobuf/types/known/timestamppb"
@@ -47,7 +47,7 @@ func TestAccountzRecordHistoryTruncation(t *testing.T) {
 		t.Fatalf("Failed getting accountz record subscribe client, error: %s", err)
 	}
 
-	err = acctzSubClient.Send(&acctz.RecordRequest{
+	err = acctzSubClient.Send(&acctzpb.RecordRequest{
 		Timestamp: timestamppb.New(recordStartTime),
 	})
 	if err != nil {
diff --git a/feature/security/gnsi/acctz/tests/record_payload_truncation/record_payload_truncation_test.go b/feature/security/gnsi/acctz/tests/record_payload_truncation/record_payload_truncation_test.go
index ec481d3d840..ae532753f6b 100644
--- a/feature/security/gnsi/acctz/tests/record_payload_truncation/record_payload_truncation_test.go
+++ b/feature/security/gnsi/acctz/tests/record_payload_truncation/record_payload_truncation_test.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/openconfig/featureprofiles/internal/fptest"
-	"github.com/openconfig/gnsi/acctz"
+	acctzpb "github.com/openconfig/gnsi/acctz"
 	"github.com/openconfig/ondatra"
 	"github.com/openconfig/ondatra/gnmi"
 	"github.com/openconfig/ondatra/gnmi/oc"
@@ -33,7 +33,7 @@ func TestMain(m *testing.M) {
 }
 
 type recordRequestResult struct {
-	record *acctz.RecordResponse
+	record *acctzpb.RecordResponse
 	err    error
 }
 
@@ -66,7 +66,7 @@ func TestAccountzRecordPayloadTruncation(t *testing.T) {
 		t.Fatalf("Failed getting accountz record subscribe client, error: %s", err)
 	}
 
-	err = acctzSubClient.Send(&acctz.RecordRequest{
+	err = acctzSubClient.Send(&acctzpb.RecordRequest{
 		Timestamp: timestamppb.New(startTime),
 	})
 	if err != nil {
@@ -77,7 +77,7 @@ func TestAccountzRecordPayloadTruncation(t *testing.T) {
 		r := make(chan recordRequestResult)
 
 		go func(r chan recordRequestResult) {
-			var response *acctz.RecordResponse
+			var response *acctzpb.RecordResponse
 			response, err = acctzSubClient.Recv()
 			r <- recordRequestResult{
 				record: response,
@@ -105,7 +105,7 @@ func TestAccountzRecordPayloadTruncation(t *testing.T) {
 
 		grpcServiceRecord := resp.record.GetGrpcService()
 
-		if grpcServiceRecord.GetServiceType() != acctz.GrpcService_GRPC_SERVICE_TYPE_GNMI {
+		if grpcServiceRecord.GetServiceType() != acctzpb.GrpcService_GRPC_SERVICE_TYPE_GNMI {
 			// Not our gnmi set, nothing to see here.
 			continue
 		}

From 1a4307f7bde6998c57c54c14171d8d51d2abe4b1 Mon Sep 17 00:00:00 2001
From: Darren Loher <dloher@google.com>
Date: Wed, 13 Nov 2024 21:01:59 -0800
Subject: [PATCH 07/14] fix linkbw_any regex (#3589)

---
 .../otg_tests/link_bandwidth_test/link_bandwidth_test.go      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/feature/bgp/policybase/otg_tests/link_bandwidth_test/link_bandwidth_test.go b/feature/bgp/policybase/otg_tests/link_bandwidth_test/link_bandwidth_test.go
index e240cd817d6..c7031776efc 100644
--- a/feature/bgp/policybase/otg_tests/link_bandwidth_test/link_bandwidth_test.go
+++ b/feature/bgp/policybase/otg_tests/link_bandwidth_test/link_bandwidth_test.go
@@ -114,13 +114,13 @@ var (
 	extCommunitySet = map[string]string{
 		"linkbw_1M":  "link-bandwidth:23456:1M",
 		"linkbw_2G":  "link-bandwidth:23456:2G",
-		"linkbw_any": "^link-bandwidth:.*:.$",
+		"linkbw_any": "^link-bandwidth:.*:.*$",
 	}
 
 	extCommunitySetCisco = map[string]string{
 		"linkbw_1M":  "23456:1000000",
 		"linkbw_2G":  "23456:2000000000",
-		"linkbw_any": "^.*:.$",
+		"linkbw_any": "^.*:.*$",
 	}
 
 	CommunitySet = map[string]string{

From e83abd82d57adcb725505ed3e3004c44ca7ec865 Mon Sep 17 00:00:00 2001
From: Nisha Sadhasivam <nsadhasivam@google.com>
Date: Thu, 14 Nov 2024 19:11:10 +0530
Subject: [PATCH 08/14] updated imports for acctz (#3591)

* updated imports for acctz

* updated import

* updated imports

* updated import

* update import
---
 internal/security/acctz/acctz.go | 34 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/internal/security/acctz/acctz.go b/internal/security/acctz/acctz.go
index 6837c82f0bc..6f475e14e1e 100644
--- a/internal/security/acctz/acctz.go
+++ b/internal/security/acctz/acctz.go
@@ -27,8 +27,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/openconfig/gnmi/proto/gnmi"
-	"github.com/openconfig/gnoi/system"
+	gnmipb "github.com/openconfig/gnmi/proto/gnmi"
+	systempb "github.com/openconfig/gnoi/system"
 	acctzpb "github.com/openconfig/gnsi/acctz"
 	authzpb "github.com/openconfig/gnsi/authz"
 	cpb "github.com/openconfig/gnsi/credentialz"
@@ -113,7 +113,7 @@ func setupUserPassword(t *testing.T, dut *ondatra.DUTDevice, username, password
 	time.Sleep(time.Second)
 }
 
-func nokiaFailCliRole(t *testing.T) *gnmi.SetRequest {
+func nokiaFailCliRole(t *testing.T) *gnmipb.SetRequest {
 	failRoleData, err := json.Marshal([]any{
 		map[string]any{
 			"services": []string{"cli"},
@@ -126,22 +126,22 @@ func nokiaFailCliRole(t *testing.T) *gnmi.SetRequest {
 		t.Fatalf("Error with json marshal: %v", err)
 	}
 
-	return &gnmi.SetRequest{
-		Prefix: &gnmi.Path{
+	return &gnmipb.SetRequest{
+		Prefix: &gnmipb.Path{
 			Origin: "native",
 		},
-		Replace: []*gnmi.Update{
+		Replace: []*gnmipb.Update{
 			{
-				Path: &gnmi.Path{
-					Elem: []*gnmi.PathElem{
+				Path: &gnmipb.Path{
+					Elem: []*gnmipb.PathElem{
 						{Name: "system"},
 						{Name: "aaa"},
 						{Name: "authorization"},
 						{Name: "role", Key: map[string]string{"rolename": failRoleName}},
 					},
 				},
-				Val: &gnmi.TypedValue{
-					Value: &gnmi.TypedValue_JsonIetfVal{
+				Val: &gnmipb.TypedValue{
+					Value: &gnmipb.TypedValue_JsonIetfVal{
 						JsonIetfVal: failRoleData,
 					},
 				},
@@ -157,7 +157,7 @@ func SetupUsers(t *testing.T, dut *ondatra.DUTDevice, configureFailCliRole bool)
 	successUser.SetRole(oc.AaaTypes_SYSTEM_DEFINED_ROLES_SYSTEM_ROLE_ADMIN)
 	failUser := auth.GetOrCreateUser(failUsername)
 	if configureFailCliRole {
-		var SetRequest *gnmi.SetRequest
+		var SetRequest *gnmipb.SetRequest
 
 		// Create failure cli role in native.
 		switch dut.Vendor() {
@@ -325,13 +325,13 @@ func SendGnmiRPCs(t *testing.T, dut *ondatra.DUTDevice) []*acctzpb.RecordRespons
 
 	var records []*acctzpb.RecordResponse
 	grpcConn := dialGrpc(t, target)
-	gnmiClient := gnmi.NewGNMIClient(grpcConn)
+	gnmiClient := gnmipb.NewGNMIClient(grpcConn)
 	ctx := context.Background()
 	ctx = metadata.AppendToOutgoingContext(ctx, "username", failUsername)
 	ctx = metadata.AppendToOutgoingContext(ctx, "password", failPassword)
 
 	// Send an unsuccessful gNMI capabilities request (bad creds in context).
-	_, err := gnmiClient.Capabilities(ctx, &gnmi.CapabilityRequest{})
+	_, err := gnmiClient.Capabilities(ctx, &gnmipb.CapabilityRequest{})
 	if err != nil {
 		t.Logf("Got expected error fetching capabilities with bad creds, error: %s", err)
 	} else {
@@ -364,7 +364,7 @@ func SendGnmiRPCs(t *testing.T, dut *ondatra.DUTDevice) []*acctzpb.RecordRespons
 	ctx = context.Background()
 	ctx = metadata.AppendToOutgoingContext(ctx, "username", successUsername)
 	ctx = metadata.AppendToOutgoingContext(ctx, "password", successPassword)
-	req := &gnmi.CapabilityRequest{}
+	req := &gnmipb.CapabilityRequest{}
 	payload, err := anypb.New(req)
 	if err != nil {
 		t.Fatal("Failed creating anypb payload.")
@@ -422,14 +422,14 @@ func SendGnoiRPCs(t *testing.T, dut *ondatra.DUTDevice) []*acctzpb.RecordRespons
 
 	var records []*acctzpb.RecordResponse
 	grpcConn := dialGrpc(t, target)
-	gnoiSystemClient := system.NewSystemClient(grpcConn)
+	gnoiSystemClient := systempb.NewSystemClient(grpcConn)
 	ctx := context.Background()
 	ctx = metadata.AppendToOutgoingContext(ctx, "username", failUsername)
 	ctx = metadata.AppendToOutgoingContext(ctx, "password", failPassword)
 
 	// Send an unsuccessful gNOI system time request (bad creds in context), we don't
 	// care about receiving on it, just want to make the request.
-	gnoiSystemPingClient, err := gnoiSystemClient.Ping(ctx, &system.PingRequest{
+	gnoiSystemPingClient, err := gnoiSystemClient.Ping(ctx, &systempb.PingRequest{
 		Destination: "127.0.0.1",
 		Count:       1,
 	})
@@ -468,7 +468,7 @@ func SendGnoiRPCs(t *testing.T, dut *ondatra.DUTDevice) []*acctzpb.RecordRespons
 	ctx = context.Background()
 	ctx = metadata.AppendToOutgoingContext(ctx, "username", successUsername)
 	ctx = metadata.AppendToOutgoingContext(ctx, "password", successPassword)
-	req := &system.PingRequest{
+	req := &systempb.PingRequest{
 		Destination: "127.0.0.1",
 		Count:       1,
 	}

From b14f6881f8305934049b29f6bd67d533ebdacf87 Mon Sep 17 00:00:00 2001
From: Darren Loher <dloher@google.com>
Date: Thu, 14 Nov 2024 20:30:37 -0800
Subject: [PATCH 09/14] fix TE-9.1 id (#3594)

---
 testregistry.textproto | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testregistry.textproto b/testregistry.textproto
index f3da91c3cfe..c51caaafb84 100644
--- a/testregistry.textproto
+++ b/testregistry.textproto
@@ -1224,7 +1224,8 @@ test: {
   exec: " "
 }
 test: {
-  id: "TE-9.1: Push MPLS Labels to MPLS payload"
+  id: "TE-9.1"
+  description: "Push MPLS Labels to MPLS payload"
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/gribi/otg_tests/mpls_compliance/README.md"
 }
 test: {

From 699a2b772dec1d34688a9fe56acf95c8c00366cb Mon Sep 17 00:00:00 2001
From: Darren Loher <dloher@google.com>
Date: Thu, 14 Nov 2024 20:33:59 -0800
Subject: [PATCH 10/14] Fix RT-2.13 subtest numbering and OC Path formats
 (#3323)

* Fix RT-2.13 subtest numbering and OC Paths

* add heading for ocpath yaml
---
 .../otg_tests/weighted_ecmp_test/README.md    | 49 ++++++++-----------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/feature/isis/otg_tests/weighted_ecmp_test/README.md b/feature/isis/otg_tests/weighted_ecmp_test/README.md
index dee5ca53f52..8a5bdf8448a 100644
--- a/feature/isis/otg_tests/weighted_ecmp_test/README.md
+++ b/feature/isis/otg_tests/weighted_ecmp_test/README.md
@@ -29,23 +29,25 @@ G[DUT:LAG4] <-- IBGP+IS-IS --> H[LAG3:ATE2];
 
 ## Procedure
 
-In the topology above,
-
-*   Configure 1xLAG interface between ATE1<->DUT and 3xLAG interfaces between
-    DUT and ATE2. Each LAG interface is expected to be of 2x100Gbps
-
-*   Configure IPv4 and IPv6 L2 adjacencies between DUT and ATE LAG bundles.
-    Therefore, DUT will have 1xIS-IS adjacency with ATE1 i.e.
-    DUT:LAG1<->ATE1:LAG1, and 3xIS-IS adjacencies with ATE2 i.e.
-    DUT:LAG2<->ATE2:LAG1, DUT:LAG3<->ATE2:LAG2 and DUT:LAG4<->ATE2:LAG3
-
-    *   /network-instances/network-instance/protocols/protocol/isis/global/afi-safi
-
-    *   /network-instances/network-instance/protocols/protocol/isis/global/config/level-capability,
-        set to LEVEL_2
-
-    *   /network-instances/network-instance/protocols/protocol/isis/levels/level/config/metric-style
-        set to WIDE_METRIC
+### Test environment setup
+
+*   Configure 1 aggregate interface with 2 100GE ports between DUT and ATE1
+*   Configure 3 aggregate interfaces, each with 2 100GE ports between DUT and ATE2.
+*   Configure IPv4 and IPv6 L2 adjacencies between DUT and ATE aggregate interfaces.
+    Therefore, DUT will have
+    * 1xIS-IS adjacency with ATE1 DUT:LAG1<->ATE1:LAG1, 
+    * 3xIS-IS adjacencies between DUT and ATE2
+        * DUT:LAG2<->ATE2:LAG1
+        * DUT:LAG3<->ATE2:LAG2
+        * DUT:LAG4<->ATE2:LAG3
+
+    * Set ISIS parameters as
+        * /network-instances/network-instance/protocols/protocol/isis/global/
+            * afi-safi/af/config/afi-name: IPV4, IPV6
+            * afi-safi/af/config/safi-name: UNICAST
+            * afi-safi/af/config/enabled: true
+            * config/level-capability = LEVEL_2
+        * /network-instances/network-instance/protocols/protocol/isis/levels/level/config/metric-style = WIDE_METRIC
 
 *   Configure IPv4 and IPv6 IBGP peering between both ATEs and the DUT using
     their loopback addresses for both IPv4 and IPv6 address families.
@@ -74,7 +76,7 @@ In the topology above,
     *   /network-instances/network-instance/protocols/protocol/isis/interfaces/interface/weighted-ecmp/config/load-balancing-weight
         set to Auto
 
-## RT-9.1: Equal distribution of traffic
+## RT-2.13.1: Equal distribution of traffic
 
 *   Start 1024 flows from IPv4 addresses in 100.0.2.0/24 to 100.0.1.0/24
 
@@ -114,7 +116,7 @@ In the topology above,
 
         *   /interfaces/interface/state/counters/in-pkts
 
-## RT-9.2: Unequal distribution of traffic
+## RT-2.13.2: Unequal distribution of traffic
 
 *   Stop traffic from RT-9.1 and introduce a failure by disabling one of the
     member interfaces in ATE2:LAG1.
@@ -142,17 +144,8 @@ In the topology above,
 
         *   /interfaces/interface/state/counters/in-pkts
 
-### Config paths
-
-### Telemetry Parameter Coverage
-
 ## OpenConfig Path and RPC Coverage
 
-The below yaml defines the OC paths intended to be covered by this test.  OC paths used for test setup are not listed here.
-
-TODO(OCPATH): Container path originally part of spec that needs to be separated
-into leaves: /routing-policy/defined-sets/prefix-sets/prefix-set:
-
 ```yaml
 paths:
   ## Config Paths ##

From 5bdab86c4c74b141e34094dcdc51b29fccd05923 Mon Sep 17 00:00:00 2001
From: Karim Jahed <kjahed@users.noreply.github.com>
Date: Fri, 15 Nov 2024 07:30:44 -0500
Subject: [PATCH 11/14] [gNMI-1.14] prune device config before push (#3573)

* prune baseconfig

* removed unused

* fix readme

* fix readme

* fix readme

---------

Co-authored-by: Ram <rmachat@google.com>
---
 .../large_set_consistency_test/README.md      |  10 +
 .../large_set_consistency_test.go             |  58 +----
 .../metadata.textproto                        |   8 +
 .../set/tests/gnmi_set_test/gnmi_set_test.go  | 192 +---------------
 internal/fptest/config.go                     | 205 ++++++++++++++++++
 5 files changed, 230 insertions(+), 243 deletions(-)
 create mode 100644 internal/fptest/config.go

diff --git a/feature/system/gnmi/metadata/tests/large_set_consistency_test/README.md b/feature/system/gnmi/metadata/tests/large_set_consistency_test/README.md
index 51ac7dab893..e0b5b2ba32b 100644
--- a/feature/system/gnmi/metadata/tests/large_set_consistency_test/README.md
+++ b/feature/system/gnmi/metadata/tests/large_set_consistency_test/README.md
@@ -40,3 +40,13 @@ dut.testbed
 
 ## Minimum DUT platform
 FFF
+
+## OpenConfig Path and RPC Coverage
+
+```yaml
+rpcs:
+  gnmi:
+    gNMI.Get:
+    gNMI.Subscribe:
+
+```
\ No newline at end of file
diff --git a/feature/system/gnmi/metadata/tests/large_set_consistency_test/large_set_consistency_test.go b/feature/system/gnmi/metadata/tests/large_set_consistency_test/large_set_consistency_test.go
index 84b7e7af943..5dbc85b2572 100644
--- a/feature/system/gnmi/metadata/tests/large_set_consistency_test/large_set_consistency_test.go
+++ b/feature/system/gnmi/metadata/tests/large_set_consistency_test/large_set_consistency_test.go
@@ -49,57 +49,6 @@ func TestMain(m *testing.M) {
 	fptest.RunTests(m)
 }
 
-// getDeviceConfig gets a full config from a device but refurbishes it enough so it can be
-// pushed out again
-func getDeviceConfig(t testing.TB, dev gnmi.DeviceOrOpts) *oc.Root {
-	config := gnmi.Get[*oc.Root](t, dev, gnmi.OC().Config())
-	fptest.WriteQuery(t, "Untouched", gnmi.OC().Config(), config)
-
-	for cname, component := range config.Component {
-		// Keep the port components in order to preserve the breakout-mode config.
-		if component.GetPort() == nil {
-			delete(config.Component, cname)
-			continue
-		}
-		// Need to prune subcomponents that may have a leafref to a component that was
-		// pruned.
-		component.Subcomponent = nil
-	}
-
-	for iname, iface := range config.Interface {
-		if iface.GetEthernet() == nil {
-			continue
-		}
-		// Ethernet config may not contain meaningful values if it wasn't explicitly
-		// configured, so use its current state for the config, but prune non-config leaves.
-		intf := gnmi.Get(t, dev, gnmi.OC().Interface(iname).State())
-		breakout := config.GetComponent(intf.GetHardwarePort()).GetPort().GetBreakoutMode()
-		e := intf.GetEthernet()
-		// Set port speed to unknown for non breakout interfaces
-		if breakout.GetGroup(1) == nil && e != nil {
-			e.SetPortSpeed(oc.IfEthernet_ETHERNET_SPEED_SPEED_UNKNOWN)
-		}
-		ygot.PruneConfigFalse(oc.SchemaTree["Interface_Ethernet"], e)
-		if e.PortSpeed != 0 && e.PortSpeed != oc.IfEthernet_ETHERNET_SPEED_SPEED_UNKNOWN {
-			iface.Ethernet = e
-		}
-	}
-
-	if config.Lldp != nil {
-		config.Lldp.ChassisId = nil
-		config.Lldp.ChassisIdType = oc.Lldp_ChassisIdType_UNSET
-	}
-
-	config.Qos = nil
-
-	for _, ni := range config.NetworkInstance {
-		ni.Fdb = nil
-	}
-
-	fptest.WriteQuery(t, "Touched", gnmi.OC().Config(), config)
-	return config
-}
-
 // setEthernetFromBase merges the ethernet config from the interfaces in base config into
 // the destination config.
 func setEthernetFromBase(t testing.TB, config *oc.Root) {
@@ -244,8 +193,7 @@ func checkMetadata1(t *testing.T, gnmiClient gpb.GNMIClient, dut *ondatra.DUTDev
 	t.Helper()
 	got, getRespTimeStamp := extractMetadataAnnotation(t, gnmiClient, dut)
 	want := metadata1
-	t.Logf("getResp: %v ", getRespTimeStamp)
-	if got != want && done.Load() == 0 {
+	if got != want && getRespTimeStamp < done.Load() {
 		t.Errorf("extractMetadataAnnotation: got %v, want %v", got, want)
 	}
 }
@@ -268,13 +216,15 @@ func TestLargeSetConsistency(t *testing.T) {
 	p1 := dut.Port(t, "port1")
 	p2 := dut.Port(t, "port2")
 
+	fptest.ConfigureDefaultNetworkInstance(t, dut)
+
 	// Configuring basic interface and network instance as some devices only populate OC after configuration.
 	gnmi.Replace(t, dut, gnmi.OC().Interface(p1.Name()).Config(), dutPort1.NewOCInterface(p1.Name(), dut))
 	gnmi.Replace(t, dut, gnmi.OC().Interface(p2.Name()).Config(), dutPort2.NewOCInterface(p2.Name(), dut))
 	gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Type().Config(),
 		oc.NetworkInstanceTypes_NETWORK_INSTANCE_TYPE_DEFAULT_INSTANCE)
 
-	baselineConfig := getDeviceConfig(t, dut)
+	baselineConfig := fptest.GetDeviceConfig(t, dut)
 	setEthernetFromBase(t, baselineConfig)
 	gnmiClient := dut.RawAPIs().GNMI(t)
 
diff --git a/feature/system/gnmi/metadata/tests/large_set_consistency_test/metadata.textproto b/feature/system/gnmi/metadata/tests/large_set_consistency_test/metadata.textproto
index cae8c3c1a46..c346a8d5da2 100644
--- a/feature/system/gnmi/metadata/tests/large_set_consistency_test/metadata.textproto
+++ b/feature/system/gnmi/metadata/tests/large_set_consistency_test/metadata.textproto
@@ -13,4 +13,12 @@ platform_exceptions: {
     default_network_instance: "default"
   }
 }
+platform_exceptions: {
+  platform: {
+    vendor: CISCO
+  }
+  deviations: {
+    skip_macaddress_check: true
+  }
+}
 
diff --git a/feature/system/gnmi/set/tests/gnmi_set_test/gnmi_set_test.go b/feature/system/gnmi/set/tests/gnmi_set_test/gnmi_set_test.go
index 8152a803887..d169ecec2f9 100644
--- a/feature/system/gnmi/set/tests/gnmi_set_test/gnmi_set_test.go
+++ b/feature/system/gnmi/set/tests/gnmi_set_test/gnmi_set_test.go
@@ -45,22 +45,8 @@ var (
 	skipContainerOp = flag.Bool("skip_container_op", false, "Skip ContainerOp test cases.")
 	skipItemOp      = flag.Bool("skip_item_op", false, "Skip ItemOp test cases.")
 
-	// The following experimental flags fine-tune the RootOp and ContainerOp behavior.  Some
-	// devices require the config to be pruned for these to work.  We are still undecided
-	// whether they should be deviations; pending OpenConfig clarifications.
-	pruneComponents      = flag.Bool("prune_components", true, "Prune components that are not ports.  Use this to preserve the breakout-mode settings.")
-	pruneLLDP            = flag.Bool("prune_lldp", true, "Prune LLDP config.")
-	setEthernetFromState = flag.Bool("set_ethernet_from_state", true, "Set interface/ethernet config from state, mostly to get the port-speed settings correct.")
-
-	// This has no known effect except to reduce logspam while debugging.
-	pruneQoS = flag.Bool("prune_qos", true, "Prune QoS config.")
-
 	// Experimental flags that will likely become a deviation.
-	cannotDeleteVRF          = flag.Bool("cannot_delete_vrf", true, "Device cannot delete VRF.") // See "Note about cannotDeleteVRF" below.
-	cannotConfigurePortSpeed = flag.Bool("cannot_config_port_speed", false, "Some devices depending on the type of line card may not allow changing port speed, while still supporting the port speed leaf.")
-
-	// Flags to ensure test passes without any dependency to the device config
-	baseOCConfigIsPresent = flag.Bool("base_oc_config_is_present", false, "No OC config is loaded on router, so Get config on the root returns no data.")
+	cannotDeleteVRF = flag.Bool("cannot_delete_vrf", true, "Device cannot delete VRF.") // See "Note about cannotDeleteVRF" below.
 )
 
 var (
@@ -236,10 +222,6 @@ func TestReuseIP(t *testing.T) {
 	forEachPushOp(t, dut, func(t *testing.T, op pushOp, config *oc.Root) {
 		t.Log("Initialize")
 
-		if deviations.SkipMacaddressCheck(dut) {
-			*setEthernetFromState = false
-		}
-
 		config.DeleteInterface(p1.Name())
 		config.DeleteInterface(agg1)
 		configMember(config.GetOrCreateInterface(p1.Name()), agg1, dut)
@@ -840,7 +822,7 @@ func forEachPushOp(
 	f func(t *testing.T, op pushOp, config *oc.Root),
 ) {
 	baselineConfigOnce.Do(func() {
-		baselineConfig = getDeviceConfig(t, dut)
+		baselineConfig = fptest.GetDeviceConfig(t, dut)
 	})
 
 	for _, op := range []pushOp{
@@ -850,154 +832,12 @@ func forEachPushOp(
 			if op.shouldSkip() {
 				t.Skip()
 			}
-			o, err := ygot.DeepCopy(baselineConfig)
-			if err != nil {
-				t.Fatalf("Cannot copy baseConfig: %v", err)
-			}
-			config := o.(*oc.Root)
+			config := fptest.CopyDeviceConfig(t, dut, baselineConfig)
 			f(t, op, config)
 		})
 	}
 }
 
-// getDeviceConfig gets a full config from a device but refurbishes it enough so it can be
-// pushed out again.  Ideally, we should be able to push the config we get from the same
-// device without modification, but this is not explicitly defined in OpenConfig.
-func getDeviceConfig(t testing.TB, dev gnmi.DeviceOrOpts) *oc.Root {
-	t.Helper()
-
-	// Gets all the config (read-write) paths from root, not the state (read-only) paths.
-	config := gnmi.Get[*oc.Root](t, dev, gnmi.OC().Config())
-	fptest.WriteQuery(t, "Untouched", gnmi.OC().Config(), config)
-
-	// load the base oc config from the device state when no oc config is loaded
-	if !*baseOCConfigIsPresent {
-		if ondatra.DUT(t, "dut").Vendor() == ondatra.CISCO {
-			intfsState := gnmi.GetAll(t, dev, gnmi.OC().InterfaceAny().State())
-			for _, intf := range intfsState {
-				ygot.PruneConfigFalse(oc.SchemaTree["Interface"], intf)
-				config.DeleteInterface(intf.GetName())
-				if intf.GetName() == "Loopback0" || intf.GetName() == "PTP0/RP1/CPU0/0" || intf.GetName() == "Null0" || intf.GetName() == "PTP0/RP0/CPU0/0" {
-					continue
-				}
-				intf.ForwardingViable = nil
-				intf.Mtu = nil
-				intf.HoldTime = nil
-				if intf.Subinterface != nil {
-					if intf.Subinterface[0].Ipv6 != nil {
-						intf.Subinterface[0].Ipv6.Autoconf = nil
-					}
-				}
-				config.AppendInterface(intf)
-			}
-			vrfsStates := gnmi.GetAll(t, dev, gnmi.OC().NetworkInstanceAny().State())
-			for _, vrf := range vrfsStates {
-				// only needed for containerOp
-				if vrf.GetName() == "**iid" {
-					continue
-				}
-				if vrf.GetName() == "DEFAULT" {
-					config.NetworkInstance = nil
-					vrf.Interface = nil
-					for _, ni := range config.NetworkInstance {
-						ni.Mpls = nil
-					}
-				}
-				ygot.PruneConfigFalse(oc.SchemaTree["NetworkInstance"], vrf)
-				vrf.Table = nil
-				vrf.RouteLimit = nil
-				vrf.Mpls = nil
-				for _, intf := range vrf.Interface {
-					intf.AssociatedAddressFamilies = nil
-				}
-				for _, protocol := range vrf.Protocol {
-					for _, routes := range protocol.Static {
-						routes.Description = nil
-					}
-				}
-				config.AppendNetworkInstance(vrf)
-			}
-		}
-	}
-
-	if *pruneComponents {
-		for cname, component := range config.Component {
-			// Keep the port components in order to preserve the breakout-mode config.
-			if component.GetPort() == nil {
-				delete(config.Component, cname)
-				continue
-			}
-			// Need to prune subcomponents that may have a leafref to a component that was
-			// pruned.
-			component.Subcomponent = nil
-		}
-	}
-
-	if *setEthernetFromState {
-		for iname, iface := range config.Interface {
-			if iface.GetEthernet() == nil {
-				continue
-			}
-			// Ethernet config may not contain meaningful values if it wasn't explicitly
-			// configured, so use its current state for the config, but prune non-config leaves.
-			intf := gnmi.Get(t, dev, gnmi.OC().Interface(iname).State())
-			e := intf.GetEthernet()
-			if len(intf.GetHardwarePort()) != 0 {
-				breakout := config.GetComponent(intf.GetHardwarePort()).GetPort().GetBreakoutMode()
-				e := intf.GetEthernet()
-				// Set port speed to unknown for non breakout interfaces
-				if breakout.GetGroup(1) == nil && e != nil {
-					e.SetPortSpeed(oc.IfEthernet_ETHERNET_SPEED_SPEED_UNKNOWN)
-				}
-			}
-			ygot.PruneConfigFalse(oc.SchemaTree["Interface_Ethernet"], e)
-			if e.PortSpeed != 0 && e.PortSpeed != oc.IfEthernet_ETHERNET_SPEED_SPEED_UNKNOWN {
-				iface.Ethernet = e
-			}
-			// need to set mac address for mgmt interface to nil
-			if intf.GetName() == "MgmtEth0/RP0/CPU0/0" || intf.GetName() == "MgmtEth0/RP1/CPU0/0" && deviations.SkipMacaddressCheck(ondatra.DUT(t, "dut")) {
-				e.MacAddress = nil
-			}
-			// need to set mac address for bundle interface to nil
-			if iface.Ethernet.AggregateId != nil && deviations.SkipMacaddressCheck(ondatra.DUT(t, "dut")) {
-				iface.Ethernet.MacAddress = nil
-				continue
-			}
-		}
-	}
-
-	if !*cannotConfigurePortSpeed {
-		for _, iface := range config.Interface {
-			if iface.GetEthernet() == nil {
-				continue
-			}
-			iface.GetEthernet().PortSpeed = oc.IfEthernet_ETHERNET_SPEED_UNSET
-			iface.GetEthernet().DuplexMode = oc.Ethernet_DuplexMode_UNSET
-			iface.GetEthernet().EnableFlowControl = nil
-		}
-	}
-
-	if *pruneLLDP && config.Lldp != nil {
-		config.Lldp.ChassisId = nil
-		config.Lldp.ChassisIdType = oc.Lldp_ChassisIdType_UNSET
-	}
-
-	if *pruneQoS {
-		config.Qos = nil
-	}
-
-	pruneUnsupportedPaths(config)
-
-	fptest.WriteQuery(t, "Touched", gnmi.OC().Config(), config)
-	return config
-}
-
-func pruneUnsupportedPaths(config *oc.Root) {
-	for _, ni := range config.NetworkInstance {
-		ni.Fdb = nil
-	}
-}
-
 // pushScope describe the config scope that the test case wants to modify.  This is for
 // itemOp only; rootOp and containerOp ignore this.
 type pushScope struct {
@@ -1012,23 +852,6 @@ type pushOp interface {
 	push(t testing.TB, dev gnmi.DeviceOrOpts, config *oc.Root, scope *pushScope)
 }
 
-// setEthernetFromBase merges the ethernet config from the interfaces in base config into
-// the destination config.
-func setEthernetFromBase(t testing.TB, base *oc.Root, config *oc.Root) {
-	t.Helper()
-
-	for iname, iface := range config.Interface {
-		eb := base.GetInterface(iname).GetEthernet()
-		ec := iface.GetOrCreateEthernet()
-		if eb == nil || ec == nil {
-			continue
-		}
-		if err := ygot.MergeStructInto(ec, eb); err != nil {
-			t.Errorf("Cannot merge %s ethernet: %v", iname, err)
-		}
-	}
-}
-
 // rootOp pushes config using replace at root.
 type rootOp struct{ base *oc.Root }
 
@@ -1037,9 +860,6 @@ func (rootOp) shouldSkip() bool { return *skipRootOp }
 
 func (op rootOp) push(t testing.TB, dev gnmi.DeviceOrOpts, config *oc.Root, _ *pushScope) {
 	t.Helper()
-	if *setEthernetFromState {
-		setEthernetFromBase(t, op.base, config)
-	}
 	fptest.WriteQuery(t, "RootOp", gnmi.OC().Config(), config)
 	dut := ondatra.DUT(t, "dut")
 	if deviations.AddMissingBaseConfigViaCli(dut) {
@@ -1060,9 +880,6 @@ func (containerOp) shouldSkip() bool { return *skipContainerOp }
 
 func (op containerOp) push(t testing.TB, dev gnmi.DeviceOrOpts, config *oc.Root, _ *pushScope) {
 	t.Helper()
-	if *setEthernetFromState {
-		setEthernetFromBase(t, op.base, config)
-	}
 	fptest.WriteQuery(t, "ContainerOp", gnmi.OC().Config(), config)
 
 	batch := &gnmi.SetBatch{}
@@ -1095,9 +912,6 @@ func (itemOp) shouldSkip() bool { return *skipItemOp }
 
 func (op itemOp) push(t testing.TB, dev gnmi.DeviceOrOpts, config *oc.Root, scope *pushScope) {
 	t.Helper()
-	if *setEthernetFromState {
-		setEthernetFromBase(t, op.base, config)
-	}
 	fptest.WriteQuery(t, "ItemOp", gnmi.OC().Config(), config)
 
 	batch := &gnmi.SetBatch{}
diff --git a/internal/fptest/config.go b/internal/fptest/config.go
new file mode 100644
index 00000000000..bb976eea456
--- /dev/null
+++ b/internal/fptest/config.go
@@ -0,0 +1,205 @@
+package fptest
+
+import (
+	"flag"
+	"testing"
+
+	"github.com/openconfig/featureprofiles/internal/deviations"
+	"github.com/openconfig/ondatra"
+	"github.com/openconfig/ondatra/gnmi"
+	"github.com/openconfig/ondatra/gnmi/oc"
+	"github.com/openconfig/ygot/ygot"
+)
+
+var (
+	// Some devices require the config to be pruned for these to work.  We are still undecided
+	// whether they should be deviations; pending OpenConfig clarifications.
+	pruneComponents      = flag.Bool("prune_components", true, "Prune components that are not ports.  Use this to preserve the breakout-mode settings.")
+	pruneLLDP            = flag.Bool("prune_lldp", true, "Prune LLDP config.")
+	setEthernetFromState = flag.Bool("set_ethernet_from_state", true, "Set interface/ethernet config from state, mostly to get the port-speed settings correct.")
+
+	// This has no known effect except to reduce logspam while debugging.
+	pruneQoS = flag.Bool("prune_qos", true, "Prune QoS config.")
+
+	// Experimental flags that will likely become a deviation.
+	cannotConfigurePortSpeed = flag.Bool("cannot_config_port_speed", false, "Some devices depending on the type of line card may not allow changing port speed, while still supporting the port speed leaf.")
+
+	// Flags to ensure test passes without any dependency to the device config
+	baseOCConfigIsPresent = flag.Bool("base_oc_config_is_present", false, "No OC config is loaded on router, so Get config on the root returns no data.")
+)
+
+// GetDeviceConfig gets a full config from a device but refurbishes it enough so it can be
+// pushed out again.  Ideally, we should be able to push the config we get from the same
+// device without modification, but this is not explicitly defined in OpenConfig.
+func GetDeviceConfig(t testing.TB, dev gnmi.DeviceOrOpts) *oc.Root {
+	t.Helper()
+
+	// Gets all the config (read-write) paths from root, not the state (read-only) paths.
+	config := gnmi.Get[*oc.Root](t, dev, gnmi.OC().Config())
+	WriteQuery(t, "Untouched", gnmi.OC().Config(), config)
+
+	// load the base oc config from the device state when no oc config is loaded
+	if !*baseOCConfigIsPresent {
+		if ondatra.DUT(t, "dut").Vendor() == ondatra.CISCO {
+			intfsState := gnmi.GetAll(t, dev, gnmi.OC().InterfaceAny().State())
+			for _, intf := range intfsState {
+				ygot.PruneConfigFalse(oc.SchemaTree["Interface"], intf)
+				config.DeleteInterface(intf.GetName())
+				if intf.GetName() == "Loopback0" || intf.GetName() == "PTP0/RP1/CPU0/0" || intf.GetName() == "Null0" || intf.GetName() == "PTP0/RP0/CPU0/0" {
+					continue
+				}
+				intf.ForwardingViable = nil
+				intf.Mtu = nil
+				intf.HoldTime = nil
+				if intf.Subinterface != nil {
+					if intf.Subinterface[0].Ipv6 != nil {
+						intf.Subinterface[0].Ipv6.Autoconf = nil
+					}
+				}
+				config.AppendInterface(intf)
+			}
+			vrfsStates := gnmi.GetAll(t, dev, gnmi.OC().NetworkInstanceAny().State())
+			for _, vrf := range vrfsStates {
+				// only needed for containerOp
+				if vrf.GetName() == "**iid" {
+					continue
+				}
+				if vrf.GetName() == "DEFAULT" {
+					config.NetworkInstance = nil
+					vrf.Interface = nil
+					for _, ni := range config.NetworkInstance {
+						ni.Mpls = nil
+					}
+				}
+				ygot.PruneConfigFalse(oc.SchemaTree["NetworkInstance"], vrf)
+				vrf.Table = nil
+				vrf.RouteLimit = nil
+				vrf.Mpls = nil
+				for _, intf := range vrf.Interface {
+					intf.AssociatedAddressFamilies = nil
+				}
+				for _, protocol := range vrf.Protocol {
+					for _, routes := range protocol.Static {
+						routes.Description = nil
+					}
+				}
+				config.AppendNetworkInstance(vrf)
+			}
+		}
+	}
+
+	if *pruneComponents {
+		for cname, component := range config.Component {
+			// Keep the port components in order to preserve the breakout-mode config.
+			if component.GetPort() == nil {
+				delete(config.Component, cname)
+				continue
+			}
+			// Need to prune subcomponents that may have a leafref to a component that was
+			// pruned.
+			component.Subcomponent = nil
+		}
+	}
+
+	if *setEthernetFromState {
+		for iname, iface := range config.Interface {
+			if iface.GetEthernet() == nil {
+				continue
+			}
+			// Ethernet config may not contain meaningful values if it wasn't explicitly
+			// configured, so use its current state for the config, but prune non-config leaves.
+			intf := gnmi.Get(t, dev, gnmi.OC().Interface(iname).State())
+			e := intf.GetEthernet()
+			if len(intf.GetHardwarePort()) != 0 {
+				breakout := config.GetComponent(intf.GetHardwarePort()).GetPort().GetBreakoutMode()
+				e := intf.GetEthernet()
+				// Set port speed to unknown for non breakout interfaces
+				if breakout.GetGroup(1) == nil && e != nil {
+					e.SetPortSpeed(oc.IfEthernet_ETHERNET_SPEED_SPEED_UNKNOWN)
+				}
+			}
+			ygot.PruneConfigFalse(oc.SchemaTree["Interface_Ethernet"], e)
+			if e.PortSpeed != 0 && e.PortSpeed != oc.IfEthernet_ETHERNET_SPEED_SPEED_UNKNOWN {
+				iface.Ethernet = e
+			}
+			// need to set mac address for mgmt interface to nil
+			if intf.GetName() == "MgmtEth0/RP0/CPU0/0" || intf.GetName() == "MgmtEth0/RP1/CPU0/0" && deviations.SkipMacaddressCheck(ondatra.DUT(t, "dut")) {
+				e.MacAddress = nil
+			}
+			// need to set mac address for bundle interface to nil
+			if iface.Ethernet.AggregateId != nil && deviations.SkipMacaddressCheck(ondatra.DUT(t, "dut")) {
+				iface.Ethernet.MacAddress = nil
+				continue
+			}
+		}
+	}
+
+	if !*cannotConfigurePortSpeed {
+		for _, iface := range config.Interface {
+			if iface.GetEthernet() == nil {
+				continue
+			}
+			iface.GetEthernet().PortSpeed = oc.IfEthernet_ETHERNET_SPEED_UNSET
+			iface.GetEthernet().DuplexMode = oc.Ethernet_DuplexMode_UNSET
+			iface.GetEthernet().EnableFlowControl = nil
+		}
+	}
+
+	if *pruneLLDP && config.Lldp != nil {
+		config.Lldp.ChassisId = nil
+		config.Lldp.ChassisIdType = oc.Lldp_ChassisIdType_UNSET
+	}
+
+	if *pruneQoS {
+		config.Qos = nil
+	}
+
+	pruneUnsupportedPaths(config)
+
+	WriteQuery(t, "Touched", gnmi.OC().Config(), config)
+	return config
+}
+
+// CopyDeviceConfig returns a deep copy of a device config but refurbishes it enough so it can be
+// pushed out again
+func CopyDeviceConfig(t testing.TB, dut *ondatra.DUTDevice, config *oc.Root) *oc.Root {
+	if deviations.SkipMacaddressCheck(dut) {
+		*setEthernetFromState = false
+	}
+
+	o, err := ygot.DeepCopy(config)
+	if err != nil {
+		t.Fatalf("Cannot copy baseConfig: %v", err)
+	}
+
+	copy := o.(*oc.Root)
+
+	if *setEthernetFromState {
+		setEthernetFromBase(t, config, copy)
+	}
+
+	return copy
+}
+
+func pruneUnsupportedPaths(config *oc.Root) {
+	for _, ni := range config.NetworkInstance {
+		ni.Fdb = nil
+	}
+}
+
+// setEthernetFromBase merges the ethernet config from the interfaces in base config into
+// the destination config.
+func setEthernetFromBase(t testing.TB, base *oc.Root, config *oc.Root) {
+	t.Helper()
+
+	for iname, iface := range config.Interface {
+		eb := base.GetInterface(iname).GetEthernet()
+		ec := iface.GetOrCreateEthernet()
+		if eb == nil || ec == nil {
+			continue
+		}
+		if err := ygot.MergeStructInto(ec, eb); err != nil {
+			t.Errorf("Cannot merge %s ethernet: %v", iname, err)
+		}
+	}
+}

From 5e2b2f23cd22a36e675093c4380ca2de5a66660a Mon Sep 17 00:00:00 2001
From: sudhinj <sudhinj@google.com>
Date: Sat, 16 Nov 2024 01:56:50 +0530
Subject: [PATCH 12/14] Adding AFT  Base cases (#3506)

Add AFT-1.1
Add AFT-2.1
Update RT-4.11
---
 .../aft_base/otg_tests/afts_base/README.md    | 177 ++++++
 .../otg_tests/afts_prefix_counters/README.md  | 178 ++++++
 .../route_summary_counters_test/README.md     |   0
 .../metadata.textproto                        |   0
 .../route_summary_counters_test.go            |   0
 .../otg_tests/scale_aft_summary/README.md     |  39 ++
 .../scale_aft_summary/metadata.textproto      |  54 ++
 .../otg_tests/scale_aft_summary/route_test.go | 566 ++++++++++++++++++
 testregistry.textproto                        |  19 +
 9 files changed, 1033 insertions(+)
 create mode 100644 feature/aft/aft_base/otg_tests/afts_base/README.md
 create mode 100644 feature/aft/aft_base/otg_tests/afts_prefix_counters/README.md
 rename feature/aft/{aft_summary => afts_summary}/otg_tests/route_summary_counters_test/README.md (100%)
 rename feature/aft/{aft_summary => afts_summary}/otg_tests/route_summary_counters_test/metadata.textproto (100%)
 rename feature/aft/{aft_summary => afts_summary}/otg_tests/route_summary_counters_test/route_summary_counters_test.go (100%)
 create mode 100644 feature/aft/afts_summary/otg_tests/scale_aft_summary/README.md
 create mode 100644 feature/aft/afts_summary/otg_tests/scale_aft_summary/metadata.textproto
 create mode 100644 feature/aft/afts_summary/otg_tests/scale_aft_summary/route_test.go

diff --git a/feature/aft/aft_base/otg_tests/afts_base/README.md b/feature/aft/aft_base/otg_tests/afts_base/README.md
new file mode 100644
index 00000000000..b2e0d5a2792
--- /dev/null
+++ b/feature/aft/aft_base/otg_tests/afts_base/README.md
@@ -0,0 +1,177 @@
+# AFT-1.1: AFTs Base
+
+## Summary
+
+IPv4/IPv6 unicast routes next hop group and next hop.
+
+## Testbed
+
+* atedut_4.testbed
+
+## Test Setup
+
+### Generate DUT and ATE Configuration
+
+Configure DUT:port1,port2,port3 for IS-IS session with ATE:port1,port2,port3
+*   IS-IS must be level 2 only with wide metric.
+*   IS-IS must be point to point.
+*   Send 1000 ipv4 and 1000 ipv6 IS-IS prefixes from ATE:port3 to DUT:port3.
+
+
+Establish eBGP sessions between ATE:port1,port2 and DUT:port1,port2 and another between ATE:port3 and DUT:port3.
+*   Configure eBGP over the interface ip.
+*   eBGP must be multipath.
+*   Advertise 1000 ipv4,ipv6 prefixes from ATE port1,port2 observe received prefixes at DUT.
+*   Validate total number of entries of AFT for IPv4 and IPv6.
+*   Each prefix must have 2 next hops pointing to ATE port1,port2.
+*   Advertise 100 ipv4,ipv6 from ATE port3 observe received prefixes at DUT.
+
+Establish RSVP Sessions between ATE:port3 and SUT:port3.
+*   Configure mpls and rsvp sessions.
+*   Configure 2 ingress TE tunnels from DUT:port3 to ATE:port3.
+*   Tunnel destination is interface ip of ATE:port3.
+*   Configure explicit null and ipv6 tunneling.
+*   BGP advertised routes from ATE:port3 must be pointing to the 2 tunnels in the DUT.
+
+### Procedure
+
+*   Use gNMI.Set with REPLACE option to push the Test Setup configuration to the DUT.
+*   ATE configuration must be pushed.
+
+### Verifications
+
+*   BGP route advertised from ATE:port1,port2 must have 2 nexthops.
+*   IS-IS route advertised from ATE:port3 must have one next hop.
+*   BGP route advertised from ATE:port3 must have 2 next hops pointing to tunnels.
+*   Use gnmi Subscribe with ON_CHANGE option to /network-instances/network-instance/afts.
+*   For verifying prefix, nexthop groups, next hop use the leaves mentioed in the path section.
+*   Verify afts prefix advertised by BGP,ISIS.
+*   Verify its next hop group, number of next hop and its interfaces.
+*   Verify the number of next hop is same as expected.
+*   Verify all other leaves mentioned in the path section.
+
+
+## AFT-1.1.1: AFT Base Link Down scenario 1
+
+### Procedure
+
+Bring down the link between ATE:port2 and DUT:port2 using OTG api.
+
+### Verifications
+
+*   BGP routes advertised from ATE:port1,port2 must have 1 nexthop.
+*   IS-IS routes advertised from ATE:port3 must have one next hop.
+*   BGP routes advertised from ATE:port3 must have 2 next hops pointing to tunnels.
+*   For verifying prefix, nexthop groups, next hop use the leaves mentioed in the path section.
+*   Verify afts prefix advertised by BGP,ISIS.
+*   Verify its next hop group, number of next hop and its interfaces.
+*   Verify the number of next hop is same as expected.
+
+## AFT-1.1.2: AFT Base Link Down scenario 2
+
+### Procedure
+
+Bring down both links between ATE:port1,port2 and DUT:port1,port2 using OTG api.
+
+### Verifications
+
+*   BGP routes advertised from ATE:port1,port2 must be removed from RIB,FIB of the DUT, query results nil.
+*   IS-IS routes advertised from ATE:port3 must have one next hop.
+*   BGP routes advertised from ATE:port3 must have 2 next hops pointing to tunnels.
+*   For verifying prefix, nexthop groups, next hop use the leaves mentioed in the path section.
+*   Verify afts prefix advertised by BGP,ISIS.
+*   Verify its next hop group, number of next hop and its interfaces.
+*   Verify the number of next hop is same as expected.
+
+## AFT-1.1.3: AFT Base Link Up scenario 1
+
+### Procedure
+
+Bring up link between ATE:port1 and DUT:port1 using OTG api.
+
+### Verifications
+
+*   BGP routes advertised from ATE:port1,port2 must have one next hop.
+*   IS-IS routes advertised from ATE:port3 must have one next hop.
+*   BGP routes advertised from ATE:port3 must have 2 next hops pointing to tunnels.
+*   Verify afts prefix advertised by BGP,ISIS.
+*   For verifying prefix, nexthop groups, next hop use the leaves mentioed in the path section.
+*   Verify its next hop group, number of next hop and its interfaces.
+*   Verify the number of next hop is same as expected.
+
+## AFT-1.1.4: AFT Base Link Up scenario 2
+
+### Procedure
+
+Bring up both link between ATE:port1,port2 and DUT:port1,port2 using OTG api.
+
+### Verifications
+
+*   BGP routes advertised from ATE:port1,port2 must have 2 next hops.
+*   IS-IS routes advertised from ATE:port3 must have one next hop.
+*   BGP routes advertised from ATE:port3 must have 2 next hops pointing to tunnels.
+*   For verifying prefix, nexthop groups, next hop use the leaves mentioed in the path section.
+*   Verify afts prefix advertised by BGP,ISIS.
+*   Verify its next hop group, number of next hop and its interfaces.
+*   Verify the number of next hop is same as expected.
+
+## OpenConfig Path and RPC Coverage
+
+The below yaml defines the OC paths intended to be covered by this test.  OC paths used for test setup are not listed here.
+
+```yaml
+paths:
+  ## Config Paths ##
+
+ 
+  ## State Paths ##
+ 
+  /network-instances/network-instance/afts/ethernet/mac-entry/state/next-hop-group:
+  /network-instances/network-instance/afts/ipv4-unicast/ipv4-entry/state/next-hop-group:
+  /network-instances/network-instance/afts/ipv4-unicast/ipv4-entry/state/origin-protocol:
+  /network-instances/network-instance/afts/ipv4-unicast/ipv4-entry/state/prefix:
+  /network-instances/network-instance/afts/ipv6-unicast/ipv6-entry/state/next-hop-group:
+  /network-instances/network-instance/afts/ipv6-unicast/ipv6-entry/state/origin-protocol:
+  /network-instances/network-instance/afts/ipv6-unicast/ipv6-entry/state/prefix:
+  /network-instances/network-instance/afts/aft-summaries/ipv4-unicast/protocols/protocol/state/origin-protocol:
+  /network-instances/network-instance/afts/aft-summaries/ipv6-unicast/protocols/protocol/state/origin-protocol:
+  /network-instances/network-instance/afts/next-hop-groups/next-hop-group/id:
+  /network-instances/network-instance/afts/next-hop-groups/next-hop-group/next-hops/next-hop/index:
+  /network-instances/network-instance/afts/next-hop-groups/next-hop-group/next-hops/next-hop/state/index:
+  /network-instances/network-instance/afts/next-hop-groups/next-hop-group/next-hops/next-hop/state/weight:
+  /network-instances/network-instance/afts/next-hop-groups/next-hop-group/state/backup-next-hop-group:
+  /network-instances/network-instance/afts/next-hop-groups/next-hop-group/state/id:
+  /network-instances/network-instance/afts/next-hops/next-hop/index:
+  /network-instances/network-instance/afts/next-hops/next-hop/interface-ref/state/interface:
+  /network-instances/network-instance/afts/next-hops/next-hop/interface-ref/state/subinterface:
+  /network-instances/network-instance/afts/next-hops/next-hop/state/encapsulate-header:
+  /network-instances/network-instance/afts/next-hops/next-hop/state/index:
+  /network-instances/network-instance/afts/next-hops/next-hop/state/ip-address:
+  /network-instances/network-instance/afts/next-hops/next-hop/state/mac-address:
+  /network-instances/network-instance/afts/next-hops/next-hop/state/origin-protocol:
+  /network-instances/network-instance/afts/state-synced/state/ipv4-unicast:
+  /network-instances/network-instance/afts/state-synced/state/ipv6-unicast:
+  /network-instances/network-instance/afts/ipv4-unicast/ipv4-entry/state/entry-metadata:
+  /network-instances/network-instance/afts/ipv4-unicast/ipv4-entry/state/next-hop-group-network-instance:
+  /network-instances/network-instance/afts/ipv4-unicast/ipv4-entry/state/origin-network-instance:
+  /network-instances/network-instance/afts/ipv6-unicast/ipv6-entry/state/entry-metadata:
+  /network-instances/network-instance/afts/ipv6-unicast/ipv6-entry/state/next-hop-group-network-instance:
+  /network-instances/network-instance/afts/ipv6-unicast/ipv6-entry/state/origin-network-instance:
+  /network-instances/network-instance/afts/ipv4-unicast/ipv4-entry/prefix:
+  /network-instances/network-instance/afts/ipv6-unicast/ipv6-entry/prefix:
+
+rpcs:
+  gnmi:
+    gNMI.Subscribe:
+```
+
+## Control Protocol Coverage
+
+BGP
+IS-IS
+RSVP
+MPLS
+
+## Minimum DUT Platform Requirement
+
+vRX
diff --git a/feature/aft/aft_base/otg_tests/afts_prefix_counters/README.md b/feature/aft/aft_base/otg_tests/afts_prefix_counters/README.md
new file mode 100644
index 00000000000..9fce154e4a1
--- /dev/null
+++ b/feature/aft/aft_base/otg_tests/afts_prefix_counters/README.md
@@ -0,0 +1,178 @@
+# AFT-2.1: AFTs Prefix Counters
+
+## Summary
+
+IPv4/IPv6 prefix counters
+
+## Testbed
+
+* atedut_2.testbed
+
+## Test Setup
+
+### Generate DUT and ATE Configuration
+
+Configure DUT:port1 for IS-IS session with ATE:port1
+*   IS-IS must be level 2 only with wide metric.
+*   IS-IS must be point to point.
+*   Send 1000 ipv4 and 1000 ipv6 IS-IS prefixes from ATE:port1 to DUT:port1.
+
+Establish eBGP sessions between ATE:port1 and DUT:port1.
+*   Configure eBGP over the interface ip.
+*   Advertise 1000 ipv4,ipv6 prefixes from ATE port1 observe received prefixes at DUT.
+
+### Procedure
+
+*   Gnmi set with REPLACE option to push the configuration DUT.
+*   ATE configuration must be pushed.
+
+### verifications
+
+*   BGP routes advertised from ATE:port1 must have 1 nexthop.
+*   IS-IS routes advertised from ATE:port1 must have one next hop.
+*   Use gnmi Subscribe with ON_CHANGE option to /network-instances/network-instance/afts.
+*   Verify afts prefix entries using the following paths with in a timeout of 30s.
+
+/network-instances/network-instance/afts/ipv4-unicast/ipv4-entry/state/prefix,
+/network-instances/network-instance/afts/ipv6-unicast/ipv6-entry/state/prefix
+
+
+
+## AFT-2.1.1: AFT Prefix Counters ipv4 packets forwarded, ipv4 octets forwarded IS-IS route.
+
+### Procedure
+
+From ATE:port2 send 10000 packets to one of the ipv4 prefix advertise by IS-IS.
+
+### Verifications
+
+*  Before the traffic measure the initial counter value.
+*  After the traffic measure the final counter value.
+*  The difference between final and initial value must match with the counter value in ATE then the test is marked as passed.
+*  Verify afts ipv4 forwarded packets and ipv4 forwarded octets counter entries using the path mentioned in the paths section of this test plan.
+
+## AFT-2.1.2: AFT Prefix Counters ipv4 packets forwarded, ipv4 octets forwarded BGP route.
+
+### Procedure
+
+From ATE:port2 send 10000 packets to one of the ipv4 prefix advertise by BGP.
+
+### Verifications
+
+*  Before the traffic measure the initial counter value.
+*  After the traffic measure the final counter value.
+*  The difference between final and initial value must match with the counter value in ATE, then the test is marked as passed.
+*  Verify afts ipv4 forwarded packets and ipv4 forwarded octets counter entries using the path mentioned in the paths section of this test plan.
+
+
+## AFT-2.1.3: AFT Prefix Counters ipv6 packets forwarded, ipv6 octets forwarded IS-IS route.
+
+### Procedure
+
+From ATE:port2 send 10000 packets to one of the ipv6 prefix advertise by IS-IS.
+
+### Verifications
+
+*  Before the traffic measure the initial counter value.
+*  After the traffic measure the final counter value.
+*  The difference between final and initial value must match with the counter value in ATE, then the test is marked as passed.
+*  Verify afts ipv6 forwarded packets and ipv6 forwarded octets counter entries using the path mentioned in the paths section of this test plan.
+
+## AFT-2.1.4: AFT Prefix Counters ipv6 packets forwarded, ipv6 octets forwarded BGP route.
+
+### Procedure
+
+From ATE:port2 send 10000 packets to one of the ipv6 prefix advertise by BGP.
+
+### Verifications
+
+*  Before the traffic measure the initial counter value.
+*  After the traffic measure the final counter value.
+*  The difference between final and initial value must match with the counter value in ATE, then the test is marked as passed.
+*  Verify afts ipv6 forwarded packets and ipv6 forwarded octets counter entries using the path mentioned in the paths section of this test plan.
+
+## AFT-2.1.5: AFT Prefix Counters withdraw the ipv4 prefix.
+
+### Procedure
+
+*  From ATE:port1 withdraw some prefixes of BGP and IS-IS.
+*  Send 10000 packets from ATE:port2 to DUT:port2 for one of the withdrawn ipv4 prefix.
+*  The traffic must blackhole.
+
+### Verifications
+
+* The counters must not send incremental value as the prefix is not present in RIB/FIB. The test fails if the counter shows incremental values.
+* Verify afts ipv4 forwarded packet counter entries using the path mentioned in the paths section of this test plan.
+
+## AFT-2.1.6: AFT Prefix Counters add the ipv4 prefix back.
+
+### Procedure
+
+*  From ATE:port1 add the prefixes of BGP and IS-IS back.
+*  Send 10000 packets from ATE:port2 to DUT:port2 for one of the added ipv4 prefix.
+*  The traffic must flow end to end.
+
+### Verifications
+
+*  Before the traffic measure the initial counter value.
+*  After the traffic measure the final counter value.
+*  The difference between final and initial value must match with the counter value in ATE, then the test is marked as passed.
+*  Verify afts counter entries using the path mentioned in the paths section of this test plan.
+
+## AFT-2.1.7: AFT Prefix Counters withdraw the ipv6 prefix.
+
+### Procedure
+
+*  From ATE:port1 withdraw some prefixes of BGP and IS-IS.
+*  Send 10000 packets from ATE:port2 to DUT:port2 for one of the withdrawn ipv6 prefix.
+*  The traffic must blackhole.
+
+### Verifications
+
+* The counters must not send incremental value as the prefix is not present in RIB/FIB. The test fails if the counter shows incremental values.
+*  Verify afts counter entries using the path mentioned in the paths section of this test plan.
+
+## AFT-2.1.8: AFT Prefix Counters add the ipv6 prefix back.
+
+### Procedure
+
+*  From ATE:port1 add the prefixes of BGP and IS-IS back.
+*  Send 10000 packets from ATE:port2 to DUT:port2 for one of the added ipv6 prefix.
+*  The traffic must flow end to end.
+
+### Verifications
+
+*  Before the traffic measure the initial counter value.
+*  After the traffic measure the final counter value.
+*  The difference between final and initial value must match with the counter value in ATE, then the test is marked as passed.
+*  Verify afts counter entries using the path mentioned in the paths section of this test plan.
+
+## OpenConfig Path and RPC Coverage
+
+The below yaml defines the OC paths intended to be covered by this test.  OC paths used for test setup are not listed here.
+
+```yaml
+paths:
+  ## Config Paths ##
+
+  ## State Paths ##
+ 
+  /network-instances/network-instance/afts/ipv4-unicast/ipv4-entry/state/counters/octets-forwarded:
+  /network-instances/network-instance/afts/ipv4-unicast/ipv4-entry/state/counters/packets-forwarded:
+  /network-instances/network-instance/afts/ipv6-unicast/ipv6-entry/state/counters/octets-forwarded:
+  /network-instances/network-instance/afts/ipv6-unicast/ipv6-entry/state/counters/packets-forwarded:
+  
+
+rpcs:
+  gnmi:
+    gNMI.Subscribe:
+```
+
+## Control Protocol Coverage
+
+BGP
+IS-IS
+
+## Minimum DUT Platform Requirement
+
+vRX
\ No newline at end of file
diff --git a/feature/aft/aft_summary/otg_tests/route_summary_counters_test/README.md b/feature/aft/afts_summary/otg_tests/route_summary_counters_test/README.md
similarity index 100%
rename from feature/aft/aft_summary/otg_tests/route_summary_counters_test/README.md
rename to feature/aft/afts_summary/otg_tests/route_summary_counters_test/README.md
diff --git a/feature/aft/aft_summary/otg_tests/route_summary_counters_test/metadata.textproto b/feature/aft/afts_summary/otg_tests/route_summary_counters_test/metadata.textproto
similarity index 100%
rename from feature/aft/aft_summary/otg_tests/route_summary_counters_test/metadata.textproto
rename to feature/aft/afts_summary/otg_tests/route_summary_counters_test/metadata.textproto
diff --git a/feature/aft/aft_summary/otg_tests/route_summary_counters_test/route_summary_counters_test.go b/feature/aft/afts_summary/otg_tests/route_summary_counters_test/route_summary_counters_test.go
similarity index 100%
rename from feature/aft/aft_summary/otg_tests/route_summary_counters_test/route_summary_counters_test.go
rename to feature/aft/afts_summary/otg_tests/route_summary_counters_test/route_summary_counters_test.go
diff --git a/feature/aft/afts_summary/otg_tests/scale_aft_summary/README.md b/feature/aft/afts_summary/otg_tests/scale_aft_summary/README.md
new file mode 100644
index 00000000000..e7e416b40e7
--- /dev/null
+++ b/feature/aft/afts_summary/otg_tests/scale_aft_summary/README.md
@@ -0,0 +1,39 @@
+# RT-4.11: AFTs Route Summary
+
+## Summary
+
+IPv4/IPv6 scale unicast AFTs route summary for ISIS and BGP protocol
+
+## Procedure
+
+*   Configure DUT:port1 for an IS-IS session with ATE:port1
+*   Establish eBGP sessions between ATE:port1 and DUT:port1 and another between ATE:port2 and DUT:port2
+*   Configure Route-policy under BGP peer-group address-family
+*   Advertise scale prefixes from ATE port-1, port-2 observe received prefixes at DUT for IPv4 and IPv6
+*   Validate total number of entries of AFT for IPv4 and IPv6
+
+## OpenConfig Path and RPC Coverage
+
+The below yaml defines the OC paths intended to be covered by this test.  OC paths used for test setup are not listed here.
+
+```yaml
+paths:
+  ## Config Paths ##
+
+  ## State Paths ##
+  /network-instances/network-instance/afts/aft-summaries/ipv4-unicast/protocols/protocol/state/counters/aft-entries:
+  /network-instances/network-instance/afts/aft-summaries/ipv6-unicast/protocols/protocol/state/counters/aft-entries:
+
+rpcs:
+  gnmi:
+    gNMI.Subscribe:
+```
+
+## Control Protocol Coverage
+
+BGP
+IS-IS
+
+## Minimum DUT Platform Requirement
+
+vRX
diff --git a/feature/aft/afts_summary/otg_tests/scale_aft_summary/metadata.textproto b/feature/aft/afts_summary/otg_tests/scale_aft_summary/metadata.textproto
new file mode 100644
index 00000000000..d61d4590b2b
--- /dev/null
+++ b/feature/aft/afts_summary/otg_tests/scale_aft_summary/metadata.textproto
@@ -0,0 +1,54 @@
+# proto-file: github.com/openconfig/featureprofiles/proto/metadata.proto
+# proto-message: Metadata
+
+uuid: "89da0b4c-9a16-44f8-9757-d98ccdd6aaf4"
+plan_id: "RT-4.11"
+description: "AFTs Route Summary"
+testbed: TESTBED_DUT_ATE_2LINKS
+platform_exceptions: {
+  platform: {
+    vendor: NOKIA
+  }
+  deviations: {
+    isis_multi_topology_unsupported: true
+    isis_interface_level1_disable_required: true
+    missing_isis_interface_afi_safi_enable: true
+    isis_restart_suppress_unsupported: true
+    explicit_port_speed: true
+    explicit_interface_in_default_vrf: true
+    missing_value_for_defaults: true
+    interface_enabled: true
+  }
+}
+platform_exceptions: {
+  platform: {
+    vendor: CISCO
+  }
+  deviations: {
+    ipv4_missing_enabled: true
+    isis_interface_level1_disable_required: true
+    isis_single_topology_required: true
+  }
+}
+platform_exceptions: {
+  platform: {
+    vendor: JUNIPER
+  }
+  deviations: {
+    isis_level_enabled: true
+  }
+}
+platform_exceptions: {
+  platform: {
+    vendor: ARISTA
+  }
+  deviations: {
+    omit_l2_mtu: true
+    missing_value_for_defaults: true
+    interface_enabled: true
+		default_network_instance: "default"
+    isis_instance_enabled_required: true
+    isis_interface_afi_unsupported: true
+    route_policy_under_afi_unsupported: true
+  }
+}
diff --git a/feature/aft/afts_summary/otg_tests/scale_aft_summary/route_test.go b/feature/aft/afts_summary/otg_tests/scale_aft_summary/route_test.go
new file mode 100644
index 00000000000..e283663711e
--- /dev/null
+++ b/feature/aft/afts_summary/otg_tests/scale_aft_summary/route_test.go
@@ -0,0 +1,566 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package route_test
+
+import (
+	"testing"
+	"time"
+
+	"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/isissession"
+	"github.com/openconfig/ondatra"
+	"github.com/openconfig/ondatra/gnmi"
+	"github.com/openconfig/ondatra/gnmi/oc"
+	"github.com/openconfig/ygnmi/ygnmi"
+	"github.com/openconfig/ygot/ygot"
+)
+
+func TestMain(m *testing.M) {
+	fptest.RunTests(m)
+}
+
+// The testbed consists of ate:port1 -> dut:port1 and
+// dut:port2 -> ate:port2.  The first pair is called the "source"
+// pair, and the second the "destination" pair.
+//
+// * Source: ate:port1 -> dut:port1 subnet 192.0.2.0/30 2001:db8::192:0:2:0/126
+// * Destination: dut:port2 -> ate:port2 subnet 192.0.2.4/30 2001:db8::192:0:2:4/126
+//
+// Note that the first (.0, .3) and last (.4, .7) IPv4 addresses are
+// reserved from the subnet for broadcast, so a /30 leaves exactly 2
+// usable addresses. This does not apply to IPv6 which allows /127
+// for point to point links, but we use /126 so the numbering is
+// consistent with IPv4.
+
+const (
+	advertisedRoutesv4Prefix = 32
+	advertisedRoutesv6Prefix = 128
+	dutAS                    = 65501
+	ate1AS                   = 64501
+	ate2AS                   = 200
+	plenIPv4                 = 30
+	plenIPv6                 = 126
+	rplType                  = oc.RoutingPolicy_PolicyResultType_ACCEPT_ROUTE
+	rplName                  = "ALLOW"
+	peerGrpNamev4            = "BGP-PEER-GROUP-V4"
+	peerGrpNamev6            = "BGP-PEER-GROUP-V6"
+	peerGrpNamev4P1          = "BGP-PEER-GROUP-V4-P1"
+	peerGrpNamev6P1          = "BGP-PEER-GROUP-V6-P1"
+	peerGrpNamev4P2          = "BGP-PEER-GROUP-V4-P2"
+	peerGrpNamev6P2          = "BGP-PEER-GROUP-V6-P2"
+	isisRoute                = "199.0.0.1"
+	bgpRoute                 = "203.0.113.0"
+	isisRoutev6              = "2001:db8::203:0:113:1"
+	bgpRoutev6               = "2001:DB8:2::1"
+	RouteCount               = uint32(1000)
+)
+
+var (
+	dutP1 = attrs.Attributes{
+		Desc:    "DUT to ATE source",
+		IPv4:    "192.0.2.1",
+		IPv6:    "2001:db8::1",
+		IPv4Len: plenIPv4,
+		IPv6Len: plenIPv6,
+	}
+	ateP1 = attrs.Attributes{
+		Name:    "ateP1",
+		MAC:     "02:00:01:01:01:01",
+		IPv4:    "192.0.2.2",
+		IPv6:    "2001:db8::2",
+		IPv4Len: plenIPv4,
+		IPv6Len: plenIPv6,
+	}
+
+	dutP2 = attrs.Attributes{
+		Desc:    "DUT to ATE destination",
+		IPv4:    "192.0.2.5",
+		IPv6:    "2001:db8::5",
+		IPv4Len: plenIPv4,
+		IPv6Len: plenIPv6,
+	}
+
+	ateP2 = attrs.Attributes{
+		Name:    "ateP2",
+		MAC:     "02:00:02:01:01:01",
+		IPv4:    "192.0.2.6",
+		IPv6:    "2001:db8::6",
+		IPv4Len: plenIPv4,
+		IPv6Len: plenIPv6,
+	}
+)
+
+// configureDUT configures all the interfaces and BGP on the DUT.
+func configureDUT(t *testing.T, dut *ondatra.DUTDevice) {
+	dc := gnmi.OC()
+	p1 := dut.Port(t, "port1").Name()
+	i1 := dutP1.NewOCInterface(p1, dut)
+	gnmi.Replace(t, dut, dc.Interface(p1).Config(), i1)
+
+	p2 := dut.Port(t, "port2").Name()
+	i2 := dutP2.NewOCInterface(p2, dut)
+	gnmi.Replace(t, dut, dc.Interface(p2).Config(), i2)
+
+	// Configure Network instance type on DUT
+	t.Log("Configure/update Network Instance")
+	fptest.ConfigureDefaultNetworkInstance(t, dut)
+
+	if deviations.ExplicitPortSpeed(dut) {
+		fptest.SetPortSpeed(t, dut.Port(t, "port1"))
+		fptest.SetPortSpeed(t, dut.Port(t, "port2"))
+	}
+	if deviations.ExplicitInterfaceInDefaultVRF(dut) {
+		fptest.AssignToNetworkInstance(t, dut, p1, deviations.DefaultNetworkInstance(dut), 0)
+		fptest.AssignToNetworkInstance(t, dut, p2, deviations.DefaultNetworkInstance(dut), 0)
+	}
+	configureRoutePolicy(t, dut, rplName, rplType)
+
+	dutConfPath := dc.NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
+	dutConf := createBGPNeighborP1(dutAS, ate1AS, dut)
+	gnmi.Replace(t, dut, dutConfPath.Config(), dutConf)
+	dutConf = createBGPNeighborP2(dutAS, ate2AS, dut)
+	gnmi.Update(t, dut, dutConfPath.Config(), dutConf)
+	ts := isissession.MustNew(t).WithISIS()
+	ts.ConfigISIS(func(isis *oc.NetworkInstance_Protocol_Isis) {
+		global := isis.GetOrCreateGlobal()
+		global.HelloPadding = oc.Isis_HelloPaddingType_DISABLE
+
+		if deviations.ISISSingleTopologyRequired(ts.DUT) {
+			afv6 := global.GetOrCreateAf(oc.IsisTypes_AFI_TYPE_IPV6, oc.IsisTypes_SAFI_TYPE_UNICAST)
+			afv6.GetOrCreateMultiTopology().SetAfiName(oc.IsisTypes_AFI_TYPE_IPV4)
+			afv6.GetOrCreateMultiTopology().SetSafiName(oc.IsisTypes_SAFI_TYPE_UNICAST)
+		}
+	})
+	ts.ATEIntf1.Isis().Advanced().SetEnableHelloPadding(false)
+	ts.PushAndStart(t)
+}
+
+type BGPNeighbor struct {
+	as         uint32
+	neighborip string
+	isV4       bool
+}
+
+func createBGPNeighborP1(localAs, peerAs uint32, dut *ondatra.DUTDevice) *oc.NetworkInstance_Protocol {
+	nbrs := []*BGPNeighbor{
+		{as: peerAs, neighborip: ateP1.IPv4, isV4: true},
+		{as: peerAs, neighborip: ateP1.IPv6, isV4: false},
+	}
+
+	d := &oc.Root{}
+	ni1 := d.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut))
+	niProto := ni1.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
+	bgp := niProto.GetOrCreateBgp()
+
+	global := bgp.GetOrCreateGlobal()
+	global.As = ygot.Uint32(localAs)
+	global.RouterId = ygot.String(dutP1.IPv4)
+
+	global.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Enabled = ygot.Bool(true)
+	global.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Enabled = ygot.Bool(true)
+
+	// Note: we have to define the peer group even if we aren't setting any policy because it's
+	// invalid OC for the neighbor to be part of a peer group that doesn't exist.
+	pgv4 := bgp.GetOrCreatePeerGroup(peerGrpNamev4P1)
+	pgv4.PeerAs = ygot.Uint32(peerAs)
+	pgv4.PeerGroupName = ygot.String(peerGrpNamev4P1)
+	pgv6 := bgp.GetOrCreatePeerGroup(peerGrpNamev6P1)
+	pgv6.PeerAs = ygot.Uint32(peerAs)
+	pgv6.PeerGroupName = ygot.String(peerGrpNamev6P1)
+
+	for _, nbr := range nbrs {
+		if nbr.isV4 {
+			nv4 := bgp.GetOrCreateNeighbor(nbr.neighborip)
+			nv4.PeerAs = ygot.Uint32(nbr.as)
+			nv4.Enabled = ygot.Bool(true)
+			nv4.PeerGroup = ygot.String(peerGrpNamev4P1)
+			afisafi := nv4.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST)
+			afisafi.Enabled = ygot.Bool(true)
+			nv4.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Enabled = ygot.Bool(false)
+			if deviations.RoutePolicyUnderAFIUnsupported(dut) {
+				rpl := pgv4.GetOrCreateApplyPolicy()
+				rpl.ImportPolicy = []string{rplName}
+				rpl.ExportPolicy = []string{rplName}
+			} else {
+				pgafv4 := pgv4.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST)
+				pgafv4.Enabled = ygot.Bool(true)
+				rpl := pgafv4.GetOrCreateApplyPolicy()
+				rpl.ImportPolicy = []string{rplName}
+				rpl.ExportPolicy = []string{rplName}
+			}
+		} else {
+			nv6 := bgp.GetOrCreateNeighbor(nbr.neighborip)
+			nv6.PeerAs = ygot.Uint32(nbr.as)
+			nv6.Enabled = ygot.Bool(true)
+			nv6.PeerGroup = ygot.String(peerGrpNamev6P1)
+			afisafi6 := nv6.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST)
+			afisafi6.Enabled = ygot.Bool(true)
+			nv6.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Enabled = ygot.Bool(false)
+			if deviations.RoutePolicyUnderAFIUnsupported(dut) {
+				rpl := pgv6.GetOrCreateApplyPolicy()
+				rpl.ImportPolicy = []string{rplName}
+				rpl.ExportPolicy = []string{rplName}
+			} else {
+				pgafv6 := pgv6.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST)
+				pgafv6.Enabled = ygot.Bool(true)
+				rpl := pgafv6.GetOrCreateApplyPolicy()
+				rpl.ImportPolicy = []string{rplName}
+				rpl.ExportPolicy = []string{rplName}
+
+			}
+		}
+	}
+	return niProto
+}
+
+func createBGPNeighborP2(localAs, peerAs uint32, dut *ondatra.DUTDevice) *oc.NetworkInstance_Protocol {
+	nbrs := []*BGPNeighbor{
+		{as: peerAs, neighborip: ateP2.IPv4, isV4: true},
+		{as: peerAs, neighborip: ateP2.IPv6, isV4: false},
+	}
+
+	d := &oc.Root{}
+	ni1 := d.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut))
+	niProto := ni1.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
+	bgp := niProto.GetOrCreateBgp()
+
+	global := bgp.GetOrCreateGlobal()
+	global.As = ygot.Uint32(localAs)
+	global.RouterId = ygot.String(dutP1.IPv4)
+
+	global.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Enabled = ygot.Bool(true)
+	global.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Enabled = ygot.Bool(true)
+
+	// Note: we have to define the peer group even if we aren't setting any policy because it's
+	// invalid OC for the neighbor to be part of a peer group that doesn't exist.
+	pgv4 := bgp.GetOrCreatePeerGroup(peerGrpNamev4P2)
+	pgv4.PeerAs = ygot.Uint32(peerAs)
+	pgv4.PeerGroupName = ygot.String(peerGrpNamev4P2)
+	pgv6 := bgp.GetOrCreatePeerGroup(peerGrpNamev6P2)
+	pgv6.PeerAs = ygot.Uint32(peerAs)
+	pgv6.PeerGroupName = ygot.String(peerGrpNamev6P2)
+
+	for _, nbr := range nbrs {
+		if nbr.isV4 {
+			nv4 := bgp.GetOrCreateNeighbor(nbr.neighborip)
+			nv4.PeerAs = ygot.Uint32(nbr.as)
+			nv4.Enabled = ygot.Bool(true)
+			nv4.PeerGroup = ygot.String(peerGrpNamev4P2)
+			afisafi := nv4.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST)
+			afisafi.Enabled = ygot.Bool(true)
+			nv4.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Enabled = ygot.Bool(false)
+			if deviations.RoutePolicyUnderAFIUnsupported(dut) {
+				rpl := pgv4.GetOrCreateApplyPolicy()
+				rpl.ImportPolicy = []string{rplName}
+				rpl.ExportPolicy = []string{rplName}
+			} else {
+				pgafv4 := pgv4.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST)
+				pgafv4.Enabled = ygot.Bool(true)
+				rpl := pgafv4.GetOrCreateApplyPolicy()
+				rpl.ImportPolicy = []string{rplName}
+				rpl.ExportPolicy = []string{rplName}
+			}
+		} else {
+			nv6 := bgp.GetOrCreateNeighbor(nbr.neighborip)
+			nv6.PeerAs = ygot.Uint32(nbr.as)
+			nv6.Enabled = ygot.Bool(true)
+			nv6.PeerGroup = ygot.String(peerGrpNamev6P2)
+			afisafi6 := nv6.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST)
+			afisafi6.Enabled = ygot.Bool(true)
+			nv6.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Enabled = ygot.Bool(false)
+			if deviations.RoutePolicyUnderAFIUnsupported(dut) {
+				rpl := pgv6.GetOrCreateApplyPolicy()
+				rpl.ImportPolicy = []string{rplName}
+				rpl.ExportPolicy = []string{rplName}
+			} else {
+				pgafv6 := pgv6.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST)
+				pgafv6.Enabled = ygot.Bool(true)
+				rpl := pgafv6.GetOrCreateApplyPolicy()
+				rpl.ImportPolicy = []string{rplName}
+				rpl.ExportPolicy = []string{rplName}
+
+			}
+		}
+	}
+	return niProto
+}
+
+func configureRoutePolicy(t *testing.T, dut *ondatra.DUTDevice, name string, pr oc.E_RoutingPolicy_PolicyResultType) {
+	d := &oc.Root{}
+	rp := d.GetOrCreateRoutingPolicy()
+	pd := rp.GetOrCreatePolicyDefinition(name)
+	st, err := pd.AppendNewStatement("id-1")
+	if err != nil {
+		t.Fatal(err)
+	}
+	st.GetOrCreateActions().PolicyResult = pr
+	gnmi.Replace(t, dut, gnmi.OC().RoutingPolicy().Config(), rp)
+}
+
+func waitForBGPSession(t *testing.T, dut *ondatra.DUTDevice, wantEstablished bool) {
+	statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp()
+	nbrPath := statePath.Neighbor(ateP2.IPv4)
+	nbrPathv6 := statePath.Neighbor(ateP2.IPv6)
+	compare := func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool {
+		state, ok := val.Val()
+		if ok {
+			if wantEstablished {
+				t.Logf("BGP session state: %s", state.String())
+				return state == oc.Bgp_Neighbor_SessionState_ESTABLISHED
+			}
+			return state == oc.Bgp_Neighbor_SessionState_IDLE
+		}
+		return false
+	}
+
+	_, ok := gnmi.Watch(t, dut, nbrPath.SessionState().State(), 2*time.Minute, compare).Await(t)
+	if !ok {
+		fptest.LogQuery(t, "BGP reported state", nbrPath.State(), gnmi.Get(t, dut, nbrPath.State()))
+		if wantEstablished {
+			t.Fatal("No BGP neighbor formed...")
+		} else {
+			t.Fatal("BGPv4 session didn't teardown.")
+		}
+	}
+	_, ok = gnmi.Watch(t, dut, nbrPathv6.SessionState().State(), 2*time.Minute, compare).Await(t)
+	if !ok {
+		fptest.LogQuery(t, "BGPv6 reported state", nbrPathv6.State(), gnmi.Get(t, dut, nbrPathv6.State()))
+		if wantEstablished {
+			t.Fatal("No BGPv6 neighbor formed...")
+		} else {
+			t.Fatal("BGPv6 session didn't teardown.")
+		}
+	}
+}
+
+func verifyBGPTelemetry(t *testing.T, dut *ondatra.DUTDevice) {
+	t.Log("Waiting for BGPv4 neighbor to establish...")
+	waitForBGPSession(t, dut, true)
+
+}
+
+func configureATE(t *testing.T) gosnappi.Config {
+	ate := ondatra.ATE(t, "ate")
+	ap1 := ate.Port(t, "port1")
+	ap2 := ate.Port(t, "port2")
+	config := gosnappi.NewConfig()
+	// add ports
+	p1 := config.Ports().Add().SetName(ap1.ID())
+	p2 := config.Ports().Add().SetName(ap2.ID())
+	// add devices
+	d1 := config.Devices().Add().SetName("p1.d1")
+	d2 := config.Devices().Add().SetName("p2.d1")
+	// Configuration on port1.
+	d1Eth1 := d1.Ethernets().
+		Add().
+		SetName("p1.d1.eth1").
+		SetMac("00:00:02:02:02:02").
+		SetMtu(1500)
+	d1Eth1.
+		Connection().
+		SetPortName(p1.Name())
+
+	d1ipv41 := d1Eth1.
+		Ipv4Addresses().
+		Add().
+		SetName("p1.d1.eth1.ipv4").
+		SetAddress("192.0.2.2").
+		SetGateway("192.0.2.1").
+		SetPrefix(30)
+
+	d1ipv61 := d1Eth1.
+		Ipv6Addresses().
+		Add().
+		SetName("p1.d1.eth1.ipv6").
+		SetAddress("2001:db8::2").
+		SetGateway("2001:db8::1").
+		SetPrefix(126)
+
+	// isis router
+	d1isis := d1.Isis().
+		SetName("p1.d1.isis").
+		SetSystemId("650000000001")
+	d1isis.Basic().
+		SetIpv4TeRouterId(d1ipv41.Address()).
+		SetHostname("ixia-c-port1")
+	d1isis.Advanced().SetAreaAddresses([]string{"49"})
+	d1isisint := d1isis.Interfaces().
+		Add().
+		SetName("p1.d1.isis.intf").
+		SetEthName(d1Eth1.Name()).
+		SetNetworkType(gosnappi.IsisInterfaceNetworkType.POINT_TO_POINT).
+		SetLevelType(gosnappi.IsisInterfaceLevelType.LEVEL_2).
+		SetMetric(10)
+	d1isisint.TrafficEngineering().Add().PriorityBandwidths()
+	d1isisint.Advanced().SetAutoAdjustMtu(true).SetAutoAdjustArea(true).SetAutoAdjustSupportedProtocols(true)
+
+	d1IsisRoute1 := d1isis.V4Routes().Add().SetName("p1.d1.isis.rr1")
+	d1IsisRoute1.Addresses().
+		Add().
+		SetAddress(isisRoute).
+		SetPrefix(32).SetCount(RouteCount)
+
+	d1IsisRoute1v6 := d1isis.V6Routes().Add().SetName("p1.d1.isis.rr1.v6")
+	d1IsisRoute1v6.Addresses().
+		Add().
+		SetAddress(isisRoutev6).
+		SetPrefix(126).SetCount(RouteCount)
+
+	configureBGPDev(d1, d1ipv41, d1ipv61, ate1AS)
+
+	// configuration on port2
+	d2Eth1 := d2.Ethernets().
+		Add().
+		SetName("p2.d1.eth1").
+		SetMac("00:00:03:03:03:03").
+		SetMtu(1500)
+	d2Eth1.
+		Connection().
+		SetPortName(p2.Name())
+	d2ipv41 := d2Eth1.Ipv4Addresses().
+		Add().
+		SetName("p2.d1.eth1.ipv4").
+		SetAddress("192.0.2.6").
+		SetGateway("192.0.2.5").
+		SetPrefix(30)
+
+	d2ipv61 := d2Eth1.
+		Ipv6Addresses().
+		Add().
+		SetName("p2.d1.eth1.ipv6").
+		SetAddress("2001:db8::6").
+		SetGateway("2001:db8::5").
+		SetPrefix(126)
+
+	// isis router
+	d2isis := d2.Isis().
+		SetName("p2.d1.isis").
+		SetSystemId("650000000001")
+	d2isis.Basic().
+		SetIpv4TeRouterId(d2ipv41.Address()).
+		SetHostname("ixia-c-port2")
+	d2isis.Advanced().SetAreaAddresses([]string{"49"})
+	d2isisint := d2isis.Interfaces().
+		Add().
+		SetName("p2.d1.isis.intf").
+		SetEthName(d2Eth1.Name()).
+		SetNetworkType(gosnappi.IsisInterfaceNetworkType.POINT_TO_POINT).
+		SetLevelType(gosnappi.IsisInterfaceLevelType.LEVEL_2).
+		SetMetric(10)
+	d2isisint.TrafficEngineering().Add().PriorityBandwidths()
+	d2isisint.Advanced().SetAutoAdjustMtu(true).SetAutoAdjustArea(true).SetAutoAdjustSupportedProtocols(true)
+
+	d2IsisRoute1 := d2isis.V4Routes().Add().SetName("p2.d1.isis.rr1")
+	d2IsisRoute1.Addresses().
+		Add().
+		SetAddress(isisRoute).
+		SetPrefix(32).
+		SetCount(RouteCount)
+
+	d2IsisRoute1V6 := d2isis.V6Routes().Add().SetName("p2.d1.isis.rr1.v6")
+	d2IsisRoute1V6.Addresses().
+		Add().
+		SetAddress(isisRoutev6).
+		SetPrefix(126).
+		SetCount(RouteCount)
+
+	configureBGPDev(d2, d2ipv41, d2ipv61, ate2AS)
+
+	return config
+}
+
+// configureBGPDev configures the BGP on the OTG dev
+func configureBGPDev(dev gosnappi.Device, Ipv4 gosnappi.DeviceIpv4, Ipv6 gosnappi.DeviceIpv6, as int) {
+
+	Bgp := dev.Bgp().SetRouterId(Ipv4.Address())
+	Bgp4Peer := Bgp.Ipv4Interfaces().Add().SetIpv4Name(Ipv4.Name()).Peers().Add().SetName(dev.Name() + ".BGP4.peer")
+	Bgp4Peer.SetPeerAddress(Ipv4.Gateway()).SetAsNumber(uint32(as)).SetAsType(gosnappi.BgpV4PeerAsType.EBGP)
+	Bgp6Peer := Bgp.Ipv6Interfaces().Add().SetIpv6Name(Ipv6.Name()).Peers().Add().SetName(dev.Name() + ".BGP6.peer")
+	Bgp6Peer.SetPeerAddress(Ipv6.Gateway()).SetAsNumber(uint32(as)).SetAsType(gosnappi.BgpV6PeerAsType.EBGP)
+
+	configureBGPv4Routes(Bgp4Peer, Ipv4.Address(), Bgp4Peer.Name()+"v4route", bgpRoute, RouteCount)
+	configureBGPv6Routes(Bgp6Peer, Ipv6.Address(), Bgp6Peer.Name()+"v6route", bgpRoutev6, RouteCount)
+
+}
+
+func configureBGPv4Routes(peer gosnappi.BgpV4Peer, ipv4 string, name string, prefix string, count uint32) {
+	routes := peer.V4Routes().Add().SetName(name)
+	routes.SetNextHopIpv4Address(ipv4).
+		SetNextHopAddressType(gosnappi.BgpV4RouteRangeNextHopAddressType.IPV4).
+		SetNextHopMode(gosnappi.BgpV4RouteRangeNextHopMode.MANUAL)
+	routes.Addresses().Add().
+		SetAddress(prefix).
+		SetPrefix(advertisedRoutesv4Prefix).
+		SetCount(count)
+}
+
+func configureBGPv6Routes(peer gosnappi.BgpV6Peer, ipv6 string, name string, prefix string, count uint32) {
+	routes := peer.V6Routes().Add().SetName(name)
+	routes.SetNextHopIpv6Address(ipv6).
+		SetNextHopAddressType(gosnappi.BgpV6RouteRangeNextHopAddressType.IPV6).
+		SetNextHopMode(gosnappi.BgpV6RouteRangeNextHopMode.MANUAL)
+	routes.Addresses().Add().
+		SetAddress(prefix).
+		SetPrefix(advertisedRoutesv6Prefix).
+		SetCount(count)
+}
+func VerifyDUT(t *testing.T, dut *ondatra.DUTDevice) {
+
+	dni := deviations.DefaultNetworkInstance(dut)
+	if got, ok := gnmi.Await(t, dut, gnmi.OC().NetworkInstance(dni).Afts().AftSummaries().Ipv4Unicast().Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP).Counters().AftEntries().State(), 1*time.Minute, uint64(RouteCount)).Val(); !ok {
+		t.Errorf("ipv4 BGP entries, got: %d, want: %d", got, RouteCount)
+	} else {
+		t.Logf("Test case Passed: ipv4 BGP entries, got: %d, want: %d", got, RouteCount)
+	}
+	if got, ok := gnmi.Await(t, dut, gnmi.OC().NetworkInstance(dni).Afts().AftSummaries().Ipv6Unicast().Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP).Counters().AftEntries().State(), 1*time.Minute, uint64(RouteCount)).Val(); !ok {
+		t.Errorf("ipv6 BGP entries, got: %d, want: %d", got, RouteCount)
+	} else {
+		t.Logf("Test case Passed:ipv6 BGP entries, got: %d, want: %d", got, RouteCount)
+	}
+
+	if got, ok := gnmi.Await(t, dut, gnmi.OC().NetworkInstance(dni).Afts().AftSummaries().Ipv4Unicast().Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_ISIS).Counters().AftEntries().State(), 1*time.Minute, uint64(RouteCount)).Val(); !ok {
+		t.Errorf("ipv4 isis entries, got: %d, want: %d", got, RouteCount)
+	} else {
+		t.Logf("Test case Passed: ipv4 isis entries, got: %d, want: %d", got, RouteCount)
+
+	}
+
+	if got, ok := gnmi.Await(t, dut, gnmi.OC().NetworkInstance(dni).Afts().AftSummaries().Ipv6Unicast().Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_ISIS).Counters().AftEntries().State(), 1*time.Minute, uint64(RouteCount)).Val(); !ok {
+		t.Errorf("ipv6 isis entries, got: %d, want: %d", got, RouteCount)
+	} else {
+		t.Logf("Test case Passed: ipv6 isis entries, got: %d, want: %d", got, RouteCount)
+	}
+}
+
+func TestBGP(t *testing.T) {
+
+	dut := ondatra.DUT(t, "dut")
+	ate := ondatra.ATE(t, "ate")
+	// DUT Configuration
+	t.Log("Start DUT interface Config")
+	configureDUT(t, dut)
+	// ATE Configuration.
+	t.Log("Start ATE Config")
+	config := configureATE(t)
+	ate.OTG().PushConfig(t, config)
+	time.Sleep(time.Second * 20)
+	ate.OTG().StartProtocols(t)
+	time.Sleep(time.Second * 20)
+	verifyBGPTelemetry(t, dut)
+	VerifyDUT(t, dut)
+}
diff --git a/testregistry.textproto b/testregistry.textproto
index c51caaafb84..412f0a93b7d 100644
--- a/testregistry.textproto
+++ b/testregistry.textproto
@@ -809,6 +809,13 @@ test: {
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/aft/aft_summary/otg_tests/route_summary_counters_test/README.md"
   exec: " "
 }
+test: {
+  id: "RT-4.11"
+  description: " Scale AFTs Route Summary"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/aft/aft_summary/otg_tests/scale_aft_summary/README.md"
+  exec: " "
+}
+
 test: {
   id: "RT-5.1"
   description: "Singleton Interface"
@@ -1799,3 +1806,15 @@ test: {
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/container/networking/tests/container_connectivity/README.md"
   exec: " "
 }
+test: {
+  id: "AFT-1.1"
+  description: "AFT Streaming"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/aft/aft_base/otg_tests/aft_base/README.md"
+  exec: " "
+}
+test: {
+  id: "AFT-2.1"
+  description: "AFT Streaming"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/aft/aft_base/otg_tests/aft_prefixcounters/README.md"
+  exec: " "
+}
\ No newline at end of file

From 9826e0e7c3c01a168f8f4e8f3f6bfd04db12fd89 Mon Sep 17 00:00:00 2001
From: Pramod Maurya <pramodmaurya@google.com>
Date: Sat, 16 Nov 2024 04:24:36 +0530
Subject: [PATCH 13/14] Add export policy test cases to link bandwidth test
 (#3522)

* Add export policy test cases to link bandwidth test

* update not_match_100_set_linkbw_1M policy to add statement to remove any LBw before adding the new LBw

* added both kbps and KBps comparison

* removed old import and export policies

---------

Co-authored-by: rszarecki <46606165+rszarecki@users.noreply.github.com>
---
 .../link_bandwidth_test.go                    | 332 ++++++++++++------
 1 file changed, 227 insertions(+), 105 deletions(-)

diff --git a/feature/bgp/policybase/otg_tests/link_bandwidth_test/link_bandwidth_test.go b/feature/bgp/policybase/otg_tests/link_bandwidth_test/link_bandwidth_test.go
index c7031776efc..a1205cfa0c0 100644
--- a/feature/bgp/policybase/otg_tests/link_bandwidth_test/link_bandwidth_test.go
+++ b/feature/bgp/policybase/otg_tests/link_bandwidth_test/link_bandwidth_test.go
@@ -123,7 +123,7 @@ var (
 		"linkbw_any": "^.*:.*$",
 	}
 
-	CommunitySet = map[string]string{
+	communitySet = map[string]string{
 		"regex_match_comm100": "^100:.*$",
 	}
 )
@@ -182,35 +182,65 @@ func TestBGPLinkBandwidth(t *testing.T) {
 	}
 	baseSetupConfigAndVerification(t, td)
 	configureExtCommunityRoutingPolicy(t, dut)
-	if deviations.BgpExplicitExtendedCommunityEnable(dut) {
-		enableExtCommunityCLIConfig(t, dut)
-	}
+	enableExtCommunityCLIConfig(t, dut)
+
 	testCases := []testCase{
 		{
-			name:                     "Policy set not_match_100_set_linkbw_1M",
+			name:                     "ImportPolicy set not_match_100_set_linkbw_1M",
 			policyName:               "not_match_100_set_linkbw_1M",
-			applyPolicy:              applyPolicyDut,
-			validate:                 validatPolicyDut,
-			routeCommunity:           extCommunity{prefixSet1Comm: "none", prefixSet2Comm: "100:100", prefixSet3Comm: "link-bandwidth:23456:0"},
+			applyPolicy:              applyImportPolicyDut,
+			validate:                 validateImportPolicyDut,
+			routeCommunity:           extCommunity{prefixSet1Comm: "link-bandwidth:23456:1000000", prefixSet2Comm: "100:100", prefixSet3Comm: "link-bandwidth:23456:1000000"},
 			localPerf:                false,
 			validateRouteCommunityV4: validateRouteCommunityV4,
 			validateRouteCommunityV6: validateRouteCommunityV6,
 		},
 		{
-			name:                     "Policy set match_100_set_linkbw_2G",
+			name:                     "ExportPolicy set not_match_100_set_linkbw_1M",
+			policyName:               "not_match_100_set_linkbw_1M",
+			applyPolicy:              applyExportPolicyDut,
+			validate:                 validateExportPolicyDut,
+			routeCommunity:           extCommunity{prefixSet1Comm: "link-bandwidth:23456:1000000", prefixSet2Comm: "100:100", prefixSet3Comm: "link-bandwidth:23456:1000000"},
+			localPerf:                false,
+			validateRouteCommunityV4: validateRouteCommunityV4,
+			validateRouteCommunityV6: validateRouteCommunityV6,
+		},
+		{
+			name:                     "ImportPolicy set match_100_set_linkbw_2G",
 			policyName:               "match_100_set_linkbw_2G",
-			applyPolicy:              applyPolicyDut,
-			validate:                 validatPolicyDut,
-			routeCommunity:           extCommunity{prefixSet1Comm: "none", prefixSet2Comm: "link-bandwidth:23456:2000000000", prefixSet3Comm: "link-bandwidth:23456:0"},
+			applyPolicy:              applyImportPolicyDut,
+			validate:                 validateImportPolicyDut,
+			routeCommunity:           extCommunity{prefixSet1Comm: "none", prefixSet2Comm: "link-bandwidth:23456:2000000000", prefixSet3Comm: "link-bandwidth:23456:1000"},
 			localPerf:                false,
 			validateRouteCommunityV4: validateRouteCommunityV4,
 			validateRouteCommunityV6: validateRouteCommunityV6,
 		},
+
 		{
-			name:                     "Policy set del_linkbw",
+			name:                     "ExportPolicy set match_100_set_linkbw_2G",
+			policyName:               "match_100_set_linkbw_2G",
+			applyPolicy:              applyExportPolicyDut,
+			validate:                 validateExportPolicyDut,
+			routeCommunity:           extCommunity{prefixSet1Comm: "none", prefixSet2Comm: "link-bandwidth:23456:2000000000", prefixSet3Comm: "link-bandwidth:23456:1000"},
+			localPerf:                false,
+			validateRouteCommunityV4: validateRouteCommunityV4,
+			validateRouteCommunityV6: validateRouteCommunityV6,
+		},
+		{
+			name:                     "ImportPolicy set del_linkbw",
 			policyName:               "del_linkbw",
-			applyPolicy:              applyPolicyDut,
-			validate:                 validatPolicyDut,
+			applyPolicy:              applyImportPolicyDut,
+			validate:                 validateImportPolicyDut,
+			routeCommunity:           extCommunity{prefixSet1Comm: "none", prefixSet2Comm: "100:100", prefixSet3Comm: "none"},
+			localPerf:                false,
+			validateRouteCommunityV4: validateRouteCommunityV4,
+			validateRouteCommunityV6: validateRouteCommunityV6,
+		},
+		{
+			name:                     "ExportPolicy set del_linkbw",
+			policyName:               "del_linkbw",
+			applyPolicy:              applyExportPolicyDut,
+			validate:                 validateExportPolicyDut,
 			routeCommunity:           extCommunity{prefixSet1Comm: "none", prefixSet2Comm: "100:100", prefixSet3Comm: "none"},
 			localPerf:                false,
 			validateRouteCommunityV4: validateRouteCommunityV4,
@@ -229,25 +259,41 @@ func TestBGPLinkBandwidth(t *testing.T) {
 }
 
 func enableExtCommunityCLIConfig(t *testing.T, dut *ondatra.DUTDevice) {
-	var extCommunityEnableCLIConfig string
-	switch dut.Vendor() {
-	case ondatra.CISCO:
-		extCommunityEnableCLIConfig = fmt.Sprintf("router bgp %v instance BGP neighbor-group %v \n ebgp-recv-extcommunity-dmz \n ebgp-send-extcommunity-dmz\n", dutAS, cfgplugins.BGPPeerGroup1)
-	default:
-		t.Fatalf("Unsupported vendor %s for deviation 'BgpExplicitExtendedCommunityEnable'", dut.Vendor())
-	}
-	helpers.GnmiCLIConfig(t, dut, extCommunityEnableCLIConfig)
+	if deviations.BgpExplicitExtendedCommunityEnable(dut) {
+		var extCommunityEnableCLIConfig string
+		switch dut.Vendor() {
+		case ondatra.CISCO:
+			extCommunityEnableCLIConfig = fmt.Sprintf("router bgp %v instance BGP neighbor-group %v \n ebgp-recv-extcommunity-dmz \n ebgp-send-extcommunity-dmz\n", dutAS, cfgplugins.BGPPeerGroup1)
+		default:
+			t.Fatalf("Unsupported vendor %s for deviation 'BgpExplicitExtendedCommunityEnable'", dut.Vendor())
+		}
+		helpers.GnmiCLIConfig(t, dut, extCommunityEnableCLIConfig)
+	}
 }
 
-func applyPolicyDut(t *testing.T, dut *ondatra.DUTDevice, policyName string) {
-	// Apply ipv4 policy to bgp neighbour.
+func removeImportAndExportPolicy(t *testing.T, dut *ondatra.DUTDevice) {
+	dni := deviations.DefaultNetworkInstance(dut)
+
+	bd := &gnmi.SetBatch{}
+	path1 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(atePort1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy()
+	path2 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(atePort2.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy()
+	path3 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(atePort1.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy()
+	path4 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(atePort2.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy()
+	gnmi.BatchDelete(bd, path1.Config())
+	gnmi.BatchDelete(bd, path2.Config())
+	gnmi.BatchDelete(bd, path3.Config())
+	gnmi.BatchDelete(bd, path4.Config())
+	bd.Set(t, dut)
+}
+
+func applyImportPolicyDut(t *testing.T, dut *ondatra.DUTDevice, policyName string) {
 	root := &oc.Root{}
 	dni := deviations.DefaultNetworkInstance(dut)
-	path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).
-		Bgp().Neighbor(atePort1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy()
+	removeImportAndExportPolicy(t, dut)
 
-	policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).
-		GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy()
+	// Apply ipv4 policy to bgp neighbour.
+	path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(atePort1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy()
+	policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy()
 	policy.SetImportPolicy([]string{policyName})
 	gnmi.Replace(t, dut, path.Config(), policy)
 
@@ -269,13 +315,70 @@ func applyPolicyDut(t *testing.T, dut *ondatra.DUTDevice, policyName string) {
 	gnmi.Update(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Config(), niProto)
 }
 
-func validatPolicyDut(t *testing.T, dut *ondatra.DUTDevice, policyName string) {
+func applyExportPolicyDut(t *testing.T, dut *ondatra.DUTDevice, policyName string) {
+	root := &oc.Root{}
+	dni := deviations.DefaultNetworkInstance(dut)
+	removeImportAndExportPolicy(t, dut)
+
+	// Apply ipv4 policy to bgp neighbour.
+	path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(atePort2.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy()
+	policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(atePort2.IPv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy()
+	policy.SetExportPolicy([]string{policyName})
+	gnmi.Replace(t, dut, path.Config(), policy)
+
+	// Apply ipv6 policy to bgp neighbour.
+	path = gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(atePort2.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy()
+	policy = root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(atePort2.IPv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy()
+	policy.SetExportPolicy([]string{policyName})
+	gnmi.Replace(t, dut, path.Config(), policy)
+
+	ni := root.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut))
+	niProto := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
+	bgp := niProto.GetOrCreateBgp()
+	bgp.GetOrCreatePeerGroup(cfgplugins.BGPPeerGroup1).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Enabled = ygot.Bool(true)
+	bgp.GetOrCreatePeerGroup(cfgplugins.BGPPeerGroup1).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Enabled = ygot.Bool(true)
+	bgpNbrV4 := bgp.GetOrCreateNeighbor(atePort1.IPv4)
+	bgpNbrV4.PeerGroup = ygot.String(cfgplugins.BGPPeerGroup1)
+	bgpNbrV6 := bgp.GetOrCreateNeighbor(atePort1.IPv6)
+	bgpNbrV6.PeerGroup = ygot.String(cfgplugins.BGPPeerGroup1)
+	gnmi.Update(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Config(), niProto)
+}
+
+func validateImportPolicyDut(t *testing.T, dut *ondatra.DUTDevice, policyName string) {
 	dni := deviations.DefaultNetworkInstance(dut)
 	path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(atePort1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy()
-	policy := gnmi.Get[*oc.NetworkInstance_Protocol_Bgp_Neighbor_AfiSafi_ApplyPolicy](t, dut, path.State())
-	importPolicies := policy.GetImportPolicy()
-	if len(importPolicies) != 1 {
-		t.Fatalf("ImportPolicy Ipv4 got= %v, want %v", importPolicies, []string{policyName})
+	_, ok := gnmi.Watch(t, dut, path.State(), 30*time.Second, func(v *ygnmi.Value[*oc.NetworkInstance_Protocol_Bgp_Neighbor_AfiSafi_ApplyPolicy]) bool {
+		value, ok := v.Val()
+		if !ok {
+			return false
+		}
+		importPolicies := value.GetImportPolicy()
+		if len(importPolicies) != 1 || importPolicies[0] != policyName {
+			return false
+		}
+		return true
+	}).Await(t)
+	if !ok {
+		t.Fatalf("invalid import policy")
+	}
+}
+
+func validateExportPolicyDut(t *testing.T, dut *ondatra.DUTDevice, policyName string) {
+	dni := deviations.DefaultNetworkInstance(dut)
+	path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(atePort2.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy()
+	_, ok := gnmi.Watch(t, dut, path.State(), 30*time.Second, func(v *ygnmi.Value[*oc.NetworkInstance_Protocol_Bgp_Neighbor_AfiSafi_ApplyPolicy]) bool {
+		value, ok := v.Val()
+		if !ok {
+			return false
+		}
+		exportPolicies := value.GetExportPolicy()
+		if len(exportPolicies) != 1 || exportPolicies[0] != policyName {
+			return false
+		}
+		return true
+	}).Await(t)
+	if !ok {
+		t.Fatalf("invalid export policy")
 	}
 }
 
@@ -325,20 +428,19 @@ func validateRouteCommunityV4Prefix(t *testing.T, td testData, community, v4Pref
 					for _, ec := range bgpPrefix.ExtendedCommunity {
 						lbSubType := ec.Structured.NonTransitive_2OctetAsType.LinkBandwidthSubtype
 						listCommunity := strings.Split(community, ":")
-						Bandwidth := listCommunity[2]
+						bandwidth := listCommunity[2]
 						if lbSubType.GetGlobal_2ByteAs() != 23456 && lbSubType.GetGlobal_2ByteAs() != 32002 && lbSubType.GetGlobal_2ByteAs() != 32001 {
 							t.Errorf("ERROR AS number should be 23456 or %d got %d", ateAS, lbSubType.GetGlobal_2ByteAs())
 							return
 						}
-						if Bandwidth == "0" {
-							if ygot.BinaryToFloat32(lbSubType.GetBandwidth()) != 0 {
-								t.Errorf("ERROR lb  Bandwidth want 0, got:=%v", ygot.BinaryToFloat32(lbSubType.GetBandwidth()))
-							}
-						} else {
-							if ygot.BinaryToFloat32(lbSubType.GetBandwidth()) != 2.5e+08 && ygot.BinaryToFloat32(lbSubType.GetBandwidth()) != 2000000000 {
-								t.Errorf("ERROR lb Bandwidth want :2G, got=%v", ygot.BinaryToFloat32(lbSubType.GetBandwidth()))
-							}
+						if bandwidth == "1000" && ygot.BinaryToFloat32(lbSubType.GetBandwidth()) == 0 {
+							t.Errorf("ERROR lb  Bandwidth want 1000, got:=%v", ygot.BinaryToFloat32(lbSubType.GetBandwidth()))
+						} else if bandwidth == "1000000" && ygot.BinaryToFloat32(lbSubType.GetBandwidth()) != 125000 && ygot.BinaryToFloat32(lbSubType.GetBandwidth()) != 1000000 {
+							t.Errorf("ERROR lb Bandwidth want :1M, got=%v", ygot.BinaryToFloat32(lbSubType.GetBandwidth()))
+						} else if bandwidth == "2000000000" && ygot.BinaryToFloat32(lbSubType.GetBandwidth()) != 2.5e+08 && ygot.BinaryToFloat32(lbSubType.GetBandwidth()) != 2000000000 {
+							t.Errorf("ERROR lb Bandwidth want :2G, got=%v", ygot.BinaryToFloat32(lbSubType.GetBandwidth()))
 						}
+
 						if !deviations.BgpExtendedCommunityIndexUnsupported(td.dut) {
 							verifyExtCommunityIndexV4(t, td, v4Prefix)
 						}
@@ -361,7 +463,6 @@ func validateRouteCommunityV6(t *testing.T, td testData, ec extCommunity) {
 }
 
 func validateRouteCommunityV6Prefix(t *testing.T, td testData, community, v6Prefix string) {
-
 	// This function to verify received route communities on ATE ports.
 	_, ok := gnmi.WatchAll(t,
 		td.ate.OTG(),
@@ -396,19 +497,17 @@ func validateRouteCommunityV6Prefix(t *testing.T, td testData, community, v6Pref
 					for _, ec := range bgpPrefix.ExtendedCommunity {
 						lbSubType := ec.Structured.NonTransitive_2OctetAsType.LinkBandwidthSubtype
 						listCommunity := strings.Split(community, ":")
-						Bandwidth := listCommunity[2]
+						bandwidth := listCommunity[2]
 						if lbSubType.GetGlobal_2ByteAs() != 23456 && lbSubType.GetGlobal_2ByteAs() != 32002 && lbSubType.GetGlobal_2ByteAs() != 32001 {
 							t.Errorf("ERROR AS number should be 23456 or %d got %d", ateAS, lbSubType.GetGlobal_2ByteAs())
 							return
 						}
-						if Bandwidth == "0" {
-							if ygot.BinaryToFloat32(lbSubType.GetBandwidth()) != 0 {
-								t.Errorf("ERROR lb  Bandwidth want 0, got:=%v", ygot.BinaryToFloat32(lbSubType.GetBandwidth()))
-							}
-						} else {
-							if ygot.BinaryToFloat32(lbSubType.GetBandwidth()) != 2.5e+08 && ygot.BinaryToFloat32(lbSubType.GetBandwidth()) != 2000000000 {
-								t.Errorf("ERROR lb Bandwidth want :2G, got=%v", ygot.BinaryToFloat32(lbSubType.GetBandwidth()))
-							}
+						if bandwidth == "1000" && ygot.BinaryToFloat32(lbSubType.GetBandwidth()) == 0 {
+							t.Errorf("ERROR lb  Bandwidth want 1000, got:=%v", ygot.BinaryToFloat32(lbSubType.GetBandwidth()))
+						} else if bandwidth == "1000000" && ygot.BinaryToFloat32(lbSubType.GetBandwidth()) != 125000 && ygot.BinaryToFloat32(lbSubType.GetBandwidth()) != 1000000 {
+							t.Errorf("ERROR lb Bandwidth want :1M, got=%v", ygot.BinaryToFloat32(lbSubType.GetBandwidth()))
+						} else if bandwidth == "2000000000" && ygot.BinaryToFloat32(lbSubType.GetBandwidth()) != 2.5e+08 && ygot.BinaryToFloat32(lbSubType.GetBandwidth()) != 2000000000 {
+							t.Errorf("ERROR lb Bandwidth want :2G, got=%v", ygot.BinaryToFloat32(lbSubType.GetBandwidth()))
 						}
 						if !deviations.BgpExtendedCommunityIndexUnsupported(td.dut) {
 							verifyExtCommunityIndexV6(t, td, v6Prefix)
@@ -419,6 +518,7 @@ func validateRouteCommunityV6Prefix(t *testing.T, td testData, community, v6Pref
 		}
 	}
 }
+
 func configureImportRoutingPolicyAllowAll(t *testing.T, dut *ondatra.DUTDevice) {
 	root := &oc.Root{}
 	rp := root.GetOrCreateRoutingPolicy()
@@ -509,26 +609,10 @@ func configureExtCommunityRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice) {
 	root := &oc.Root{}
 	var communitySetCLIConfig string
 	var extCommunitySetCLIConfig string
-	switch dut.Vendor() {
-	case ondatra.CISCO:
-		extCommunitySet = extCommunitySetCisco
-	default:
-		t.Logf("extCommunitySet = %v", extCommunitySet)
-	}
-	if !deviations.BgpExtendedCommunitySetUnsupported(dut) {
-		for name, community := range extCommunitySet {
-			rp := root.GetOrCreateRoutingPolicy()
-			pdef := rp.GetOrCreateDefinedSets().GetOrCreateBgpDefinedSets()
-			stmt, err := pdef.NewExtCommunitySet(name)
-			if err != nil {
-				t.Fatalf("NewExtCommunitySet failed: %v", err)
-			}
-			stmt.SetExtCommunityMember([]string{community})
-			gnmi.Update(t, dut, gnmi.OC().RoutingPolicy().Config(), rp)
-		}
-	} else {
+	if deviations.BgpExtendedCommunitySetUnsupported(dut) {
 		switch dut.Vendor() {
 		case ondatra.CISCO:
+			extCommunitySet = extCommunitySetCisco
 			for name, community := range extCommunitySet {
 				if name == "linkbw_any" && deviations.CommunityMemberRegexUnsupported(dut) {
 					communitySetCLIConfig = fmt.Sprintf("community-set %v \n dfa-regex '%v' \n end-set", name, community)
@@ -541,45 +625,55 @@ func configureExtCommunityRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice) {
 		default:
 			t.Fatalf("Unsupported vendor %s for native command support for deviation 'BgpExtendedCommunitySetUnsupported'", dut.Vendor())
 		}
-	}
-
-	if !(deviations.CommunityMemberRegexUnsupported(dut)) {
-		for name, community := range CommunitySet {
+	} else {
+		for name, community := range extCommunitySet {
 			rp := root.GetOrCreateRoutingPolicy()
 			pdef := rp.GetOrCreateDefinedSets().GetOrCreateBgpDefinedSets()
-			stmt, err := pdef.NewCommunitySet(name)
+			stmt, err := pdef.NewExtCommunitySet(name)
 			if err != nil {
-				t.Fatalf("NewCommunitySet failed: %v", err)
+				t.Fatalf("NewExtCommunitySet failed: %v", err)
 			}
-			cs := []oc.RoutingPolicy_DefinedSets_BgpDefinedSets_CommunitySet_CommunityMember_Union{}
-			cs = append(cs, oc.UnionString(community))
-			stmt.SetCommunityMember(cs)
+			stmt.SetExtCommunityMember([]string{community})
 			gnmi.Update(t, dut, gnmi.OC().RoutingPolicy().Config(), rp)
 		}
-	} else {
+	}
+
+	if deviations.CommunityMemberRegexUnsupported(dut) {
 		switch dut.Vendor() {
 		case ondatra.CISCO:
-			for name, community := range CommunitySet {
+			for name, community := range communitySet {
 				communitySetCLIConfig = fmt.Sprintf("community-set %v\n dfa-regex '%v' \n end-set", name, community)
 				helpers.GnmiCLIConfig(t, dut, communitySetCLIConfig)
 			}
 		default:
 			t.Fatalf("Unsupported vendor %s for native cmd support for deviation 'CommunityMemberRegexUnsupported'", dut.Vendor())
 		}
+	} else {
+		for name, community := range communitySet {
+			rp := root.GetOrCreateRoutingPolicy()
+			pdef := rp.GetOrCreateDefinedSets().GetOrCreateBgpDefinedSets()
+			stmt, err := pdef.NewCommunitySet(name)
+			if err != nil {
+				t.Fatalf("NewCommunitySet failed: %v", err)
+			}
+			cs := []oc.RoutingPolicy_DefinedSets_BgpDefinedSets_CommunitySet_CommunityMember_Union{}
+			cs = append(cs, oc.UnionString(community))
+			stmt.SetCommunityMember(cs)
+			gnmi.Update(t, dut, gnmi.OC().RoutingPolicy().Config(), rp)
+		}
 	}
 
 	// Configure routing Policy not_match_100_set_linkbw_1M.
 	rpNotMatch := root.GetOrCreateRoutingPolicy()
 	pdef2 := rpNotMatch.GetOrCreatePolicyDefinition("not_match_100_set_linkbw_1M")
-	pdef2Stmt1, err := pdef2.AppendNewStatement("1-megabit-match")
+	pdef2Stmt1, err := pdef2.AppendNewStatement("regex_match_comm100_rm_lbw")
 	if err != nil {
-		t.Fatalf("AppendNewStatement 1-megabit-match failed: %v", err)
+		t.Fatalf("AppendNewStatement regex_match_comm100_rm_lbw failed: %v", err)
 	}
-
 	if !deviations.BgpSetExtCommunitySetRefsUnsupported(dut) {
 		ref := pdef2Stmt1.GetOrCreateActions().GetOrCreateBgpActions().GetOrCreateSetExtCommunity()
-		ref.GetOrCreateReference().SetExtCommunitySetRefs([]string{"linkbw_1M"})
-		ref.SetOptions(oc.BgpPolicy_BgpSetCommunityOptionType_ADD)
+		ref.GetOrCreateReference().SetExtCommunitySetRefs([]string{"linkbw_any"})
+		ref.SetOptions(oc.BgpPolicy_BgpSetCommunityOptionType_REMOVE)
 		ref.SetMethod(oc.SetCommunity_Method_REFERENCE)
 	}
 	if deviations.BGPConditionsMatchCommunitySetUnsupported(dut) {
@@ -608,25 +702,51 @@ func configureExtCommunityRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice) {
 	if !deviations.SkipSettingStatementForPolicy(dut) {
 		pdef2Stmt1.GetOrCreateActions().SetPolicyResult(oc.RoutingPolicy_PolicyResultType_NEXT_STATEMENT)
 	}
-	pdef2Stmt2, err := pdef2.AppendNewStatement("accept_all_routes")
+
+	pdef2Stmt2, err := pdef2.AppendNewStatement("regex_match_comm100_add_lbw")
 	if err != nil {
-		t.Fatalf("AppendNewStatement accept_all_routes failed: %v", err)
+		t.Fatalf("AppendNewStatement regex_match_comm100_add_lbw failed: %v", err)
 	}
-	pdef2Stmt2.GetOrCreateActions().SetPolicyResult(oc.RoutingPolicy_PolicyResultType_ACCEPT_ROUTE)
-
 	if !deviations.BgpSetExtCommunitySetRefsUnsupported(dut) {
-		gnmi.Update(t, dut, gnmi.OC().RoutingPolicy().Config(), rpNotMatch)
+		ref := pdef2Stmt2.GetOrCreateActions().GetOrCreateBgpActions().GetOrCreateSetExtCommunity()
+		ref.GetOrCreateReference().SetExtCommunitySetRefs([]string{"linkbw_1M"})
+		ref.SetOptions(oc.BgpPolicy_BgpSetCommunityOptionType_ADD)
+		ref.SetMethod(oc.SetCommunity_Method_REFERENCE)
+	}
+	if deviations.BGPConditionsMatchCommunitySetUnsupported(dut) {
+		switch dut.Vendor() {
+		case ondatra.ARISTA:
+			ref1 := pdef2Stmt2.GetOrCreateConditions().GetOrCreateBgpConditions()
+			ref1.SetCommunitySet("regex_match_comm100_deviation1")
+		}
 	} else {
+		ref1 := pdef2Stmt2.GetOrCreateConditions().GetOrCreateBgpConditions().GetOrCreateMatchCommunitySet()
+		ref1.SetCommunitySet("regex_match_comm100")
+		ref1.SetMatchSetOptions(oc.RoutingPolicy_MatchSetOptionsType_INVERT)
+	}
+	if !deviations.SkipSettingStatementForPolicy(dut) {
+		pdef2Stmt2.GetOrCreateActions().SetPolicyResult(oc.RoutingPolicy_PolicyResultType_NEXT_STATEMENT)
+	}
+
+	pdef2Stmt3, err := pdef2.AppendNewStatement("accept_all_routes")
+	if err != nil {
+		t.Fatalf("AppendNewStatement accept_all_routes failed: %v", err)
+	}
+	pdef2Stmt3.GetOrCreateActions().SetPolicyResult(oc.RoutingPolicy_PolicyResultType_ACCEPT_ROUTE)
+
+	if deviations.BgpSetExtCommunitySetRefsUnsupported(dut) {
 		switch dut.Vendor() {
 		case ondatra.CISCO:
 			var communityCLIConfig string
-			communityCLIConfig = fmt.Sprintf("community-set %v\n dfa-regex '%v', \n match invert \n end-set", "regex_match_comm100", CommunitySet["regex_match_comm100"])
+			communityCLIConfig = fmt.Sprintf("community-set %v\n dfa-regex '%v', \n match invert \n end-set", "regex_match_comm100", communitySet["regex_match_comm100"])
 			policySetCLIConfig := fmt.Sprintf("route-policy %v \n #statement-1 1-megabit-match \n if community is-empty then \n pass \n elseif community in %v then \n set extcommunity bandwidth %v \n endif \n pass \n #statement-2 accept_all_routes \n done \n  end-policy", "not_match_100_set_linkbw_1M", "regex_match_comm100", "linkbw_1M")
 			helpers.GnmiCLIConfig(t, dut, communityCLIConfig)
 			helpers.GnmiCLIConfig(t, dut, policySetCLIConfig)
 		default:
 			t.Fatalf("Unsupported vendor %s for native cmd support for deviation 'BgpSetExtCommunitySetRefsUnsupported'", dut.Vendor())
 		}
+	} else {
+		gnmi.Update(t, dut, gnmi.OC().RoutingPolicy().Config(), rpNotMatch)
 	}
 
 	// Configure routing policy match_100_set_linkbw_2G.
@@ -661,7 +781,7 @@ func configureExtCommunityRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice) {
 			ref1.SetCommunitySet("regex_match_comm100_deviation2")
 		}
 	} else {
-		ref1 := pdef3Stmt1.GetOrCreateConditions().GetOrCreateBgpConditions().GetMatchCommunitySet()
+		ref1 := pdef3Stmt1.GetOrCreateConditions().GetOrCreateBgpConditions().GetOrCreateMatchCommunitySet()
 		ref1.SetCommunitySet("regex_match_comm100")
 		ref1.SetMatchSetOptions(oc.RoutingPolicy_MatchSetOptionsType_ANY)
 	}
@@ -673,18 +793,18 @@ func configureExtCommunityRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice) {
 		t.Fatalf("AppendNewStatement accept_all_routes failed: %v", err)
 	}
 	pdef3Stmt2.GetOrCreateActions().SetPolicyResult(oc.RoutingPolicy_PolicyResultType_ACCEPT_ROUTE)
-	if !deviations.BgpSetExtCommunitySetRefsUnsupported(dut) {
-		gnmi.Update(t, dut, gnmi.OC().RoutingPolicy().Config(), rpMatch)
-	} else {
+	if deviations.BgpSetExtCommunitySetRefsUnsupported(dut) {
 		switch dut.Vendor() {
 		case ondatra.CISCO:
-			communitySetCLIConfig = fmt.Sprintf("community-set %v\n dfa-regex '%v', \n match any \n end-set", "regex_match_any_comm100", CommunitySet["regex_match_comm100"])
+			communitySetCLIConfig = fmt.Sprintf("community-set %v\n dfa-regex '%v', \n match any \n end-set", "regex_match_any_comm100", communitySet["regex_match_comm100"])
 			helpers.GnmiCLIConfig(t, dut, communitySetCLIConfig)
 			communitySetCLIConfig = fmt.Sprintf("route-policy %v \n #statement-1 2-gigabit-match \n if community in %v then \n set extcommunity bandwidth %v \n endif \n pass \n #statement-2 accept_all_routes \n done \n end-policy", "match_100_set_linkbw_2G", "regex_match_any_comm100", "linkbw_2G")
 			helpers.GnmiCLIConfig(t, dut, communitySetCLIConfig)
 		default:
 			t.Fatalf("Unsupported vendor %s for native cmd support for deviation 'BgpSetExtCommunitySetRefsUnsupported' and 'BGPConditionsMatchCommunitySetUnsupported' and 'SkipSettingStatementForPolicy'", dut.Vendor())
 		}
+	} else {
+		gnmi.Update(t, dut, gnmi.OC().RoutingPolicy().Config(), rpMatch)
 	}
 
 	// Configure routing policy del_linkbw.
@@ -708,9 +828,7 @@ func configureExtCommunityRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice) {
 		t.Fatalf("AppendNewStatement accept_all_routes failed: %v", err)
 	}
 	pdef4Stmt2.GetOrCreateActions().SetPolicyResult(oc.RoutingPolicy_PolicyResultType_ACCEPT_ROUTE)
-	if !deviations.BgpDeleteLinkBandwidthUnsupported(dut) {
-		gnmi.Update(t, dut, gnmi.OC().RoutingPolicy().Config(), rpDelLinkbw)
-	} else {
+	if deviations.BgpDeleteLinkBandwidthUnsupported(dut) {
 		var delLinkbwCLIConfig string
 		switch dut.Vendor() {
 		case ondatra.CISCO:
@@ -719,7 +837,11 @@ func configureExtCommunityRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice) {
 			t.Fatalf("Unsupported vendor %s for native cmd support for deviation 'BgpDeleteLinkBandwidthUnsupported'", dut.Vendor())
 		}
 		helpers.GnmiCLIConfig(t, dut, delLinkbwCLIConfig)
+	} else {
+		gnmi.Update(t, dut, gnmi.OC().RoutingPolicy().Config(), rpDelLinkbw)
 	}
+
+	fptest.LogQuery(t, "", gnmi.OC().RoutingPolicy().Config(), root)
 }
 
 func createFlow(t *testing.T, td testData, fc flowConfig) {
@@ -801,7 +923,7 @@ func (td *testData) advertiseRoutesWithEBGP(t *testing.T) {
 	nV42 := bgp.GetOrCreateNeighbor(atePort2.IPv4)
 	nV42.SetPeerAs(dutAS)
 	if !deviations.SkipBgpSendCommunityType(td.dut) {
-		nV42.SetSendCommunityType([]oc.E_Bgp_CommunityType{oc.Bgp_CommunityType_BOTH})
+		nV42.SetSendCommunityType([]oc.E_Bgp_CommunityType{oc.Bgp_CommunityType_STANDARD, oc.Bgp_CommunityType_EXTENDED})
 	}
 	nV42.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Enabled = ygot.Bool(true)
 	nV61 := bgp.GetOrCreateNeighbor(atePort1.IPv6)
@@ -810,7 +932,7 @@ func (td *testData) advertiseRoutesWithEBGP(t *testing.T) {
 	nV62 := bgp.GetOrCreateNeighbor(atePort2.IPv6)
 	nV62.SetPeerAs(dutAS)
 	if !deviations.SkipBgpSendCommunityType(td.dut) {
-		nV62.SetSendCommunityType([]oc.E_Bgp_CommunityType{oc.Bgp_CommunityType_BOTH})
+		nV62.SetSendCommunityType([]oc.E_Bgp_CommunityType{oc.Bgp_CommunityType_STANDARD, oc.Bgp_CommunityType_EXTENDED})
 	}
 	nV62.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Enabled = ygot.Bool(true)
 	gnmi.Update(t, td.dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(td.dut)).Config(), ni)
@@ -849,12 +971,12 @@ func (td *testData) advertiseRoutesWithEBGP(t *testing.T) {
 	netv43.Addresses().Add().SetAddress(advertisedIPv43.address).SetPrefix(advertisedIPv43.prefix)
 	extcommv4 := netv43.ExtendedCommunities().Add().NonTransitive2OctetAsType().LinkBandwidthSubtype()
 	extcommv4.SetGlobal2ByteAs(23456)
-	extcommv4.SetBandwidth(0)
+	extcommv4.SetBandwidth(1000)
 	netv63 := bgp6Peer1.V6Routes().Add().SetName("v6-bgpNet-dev3")
 	netv63.Addresses().Add().SetAddress(advertisedIPv63.address).SetPrefix(advertisedIPv63.prefix)
 	extcommv6 := netv63.ExtendedCommunities().Add().NonTransitive2OctetAsType().LinkBandwidthSubtype()
 	extcommv6.SetGlobal2ByteAs(23456)
-	extcommv6.SetBandwidth(0)
+	extcommv6.SetBandwidth(1000)
 
 	// Configure iBGP on OTG port2.
 	ipv42 := td.otgP2.Ethernets().Items()[0].Ipv4Addresses().Items()[0]

From 61ba135a8c53fd29ca67acad72daa57102ea7d5c Mon Sep 17 00:00:00 2001
From: Ram <rmachat@google.com>
Date: Mon, 18 Nov 2024 10:45:25 +0530
Subject: [PATCH 14/14] =?UTF-8?q?fix=20bgp=5Foverride=5Fas=5Fpath=5Fsplit?=
 =?UTF-8?q?=5Fhorizon=5Ftest=20for=20routing-instance=20and=20=E2=80=A6=20?=
 =?UTF-8?q?(#3595)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix bgp_override_as_path_split_horizon_test for routing-instance and policy error

* addressed comments from self-maurya

* fixed some of the space issues for readability

* fixed formating
---
 ...bgp_override_as_path_split_horizon_test.go | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/feature/bgp/otg_tests/bgp_override_as_path_split_horizon_test/bgp_override_as_path_split_horizon_test.go b/feature/bgp/otg_tests/bgp_override_as_path_split_horizon_test/bgp_override_as_path_split_horizon_test.go
index d40b62036ec..bdecdb40c3b 100644
--- a/feature/bgp/otg_tests/bgp_override_as_path_split_horizon_test/bgp_override_as_path_split_horizon_test.go
+++ b/feature/bgp/otg_tests/bgp_override_as_path_split_horizon_test/bgp_override_as_path_split_horizon_test.go
@@ -112,6 +112,8 @@ func bgpCreateNbr(t *testing.T, dut *ondatra.DUTDevice) *oc.NetworkInstance_Prot
 	global := bgp.GetOrCreateGlobal()
 	global.RouterId = ygot.String(dutPort2.IPv4)
 	global.As = ygot.Uint32(dutGlobalAS)
+	global.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Enabled = ygot.Bool(true)
+	global.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Enabled = ygot.Bool(true)
 
 	// Note: we have to define the peer group even if we aren't setting any policy because it's
 	// invalid OC for the neighbor to be part of a peer group that doesn't exist.
@@ -122,6 +124,7 @@ func bgpCreateNbr(t *testing.T, dut *ondatra.DUTDevice) *oc.NetworkInstance_Prot
 		pg.PeerAs = ygot.Uint32(nbr.PeerAS)
 		pg.LocalAs = ygot.Uint32(nbr.LocalAS)
 		pg.PeerGroupName = ygot.String(nbr.PeerGrp)
+		pg.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Enabled = ygot.Bool(true)
 
 		nv4 := bgp.GetOrCreateNeighbor(nbr.Neighborip)
 		nv4.PeerGroup = ygot.String(nbr.PeerGrp)
@@ -218,6 +221,7 @@ func advBGPRouteFromOTG(t *testing.T, args *otgTestArgs, asSeg []uint32) {
 // sent and received IPv4 prefixes.
 func verifyPrefixesTelemetry(t *testing.T, dut *ondatra.DUTDevice, nbr string, wantInstalled, wantSent uint32) {
 	t.Helper()
+	time.Sleep(15 * time.Second)
 	statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp()
 	prefixesv4 := statePath.Neighbor(nbr).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Prefixes()
 	if gotInstalled := gnmi.Get(t, dut, prefixesv4.Installed().State()); gotInstalled != wantInstalled {
@@ -232,15 +236,15 @@ func verifyPrefixesTelemetry(t *testing.T, dut *ondatra.DUTDevice, nbr string, w
 func configureRoutePolicy(t *testing.T, dut *ondatra.DUTDevice, name string, pr oc.E_RoutingPolicy_PolicyResultType) {
 	d := &oc.Root{}
 	rp := d.GetOrCreateRoutingPolicy()
-	pd := rp.GetOrCreatePolicyDefinition(name)
-	st, err := pd.AppendNewStatement("id-1")
+	pdef := rp.GetOrCreatePolicyDefinition(name)
+	stmt, err := pdef.AppendNewStatement(name)
 	if err != nil {
-		t.Fatal(err)
+		t.Fatalf("AppendNewStatement(%s) failed: %v", name, err)
 	}
-	stc := st.GetOrCreateConditions()
-	stc.InstallProtocolEq = oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP
-	st.GetOrCreateActions().PolicyResult = pr
-	gnmi.Replace(t, dut, gnmi.OC().RoutingPolicy().Config(), rp)
+	stmt.GetOrCreateActions().PolicyResult = pr
+	// stmt.GetOrCreateConditions().InstallProtocolEq = oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP
+	gnmi.Update(t, dut, gnmi.OC().RoutingPolicy().Config(), rp)
+
 }
 
 // verifyOTGPrefixTelemetry is to Validate prefix received on OTG por2.
@@ -325,7 +329,6 @@ func testSplitHorizonAllowOwnAs3(t *testing.T, args *otgTestArgs) {
 		t.Log("Validate session state and capabilities received on DUT using telemetry.")
 		cfgplugins.VerifyDUTBGPEstablished(t, args.dut)
 		cfgplugins.VerifyBGPCapabilities(t, args.dut, []*cfgplugins.BgpNeighbor{nbr1, nbr2})
-
 		t.Log("Verify that the DUT accepts the route.")
 		verifyPrefixesTelemetry(t, args.dut, nbr1.Neighborip, 1, 0)
 		verifyPrefixesTelemetry(t, args.dut, nbr2.Neighborip, 0, 1)
@@ -440,8 +443,7 @@ func TestBGPOverrideASPathSplitHorizon(t *testing.T) {
 	})
 
 	t.Run("Configure DEFAULT network instance", func(t *testing.T) {
-		dutConfNIPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut))
-		gnmi.Replace(t, dut, dutConfNIPath.Type().Config(), oc.NetworkInstanceTypes_NETWORK_INSTANCE_TYPE_DEFAULT_INSTANCE)
+		fptest.ConfigureDefaultNetworkInstance(t, dut)
 	})
 
 	dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")