Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice, configBgp bool) {
}

if configBgp {
dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut))
bgpNbrs := []*bgpNeighbor{
{as: atePort1AS, neighborip: atePort1.IPv4, isV4: true},
{as: atePort1AS, neighborip: atePort1.IPv6, isV4: false},
Expand Down Expand Up @@ -562,7 +562,7 @@ func createBGPNeighbor(localAs uint32, bgpNbrs []*bgpNeighbor, dut *ondatra.DUTD

d := &oc.Root{}
ni1 := d.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut))
niProto := ni1.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
niProto := ni1.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut))
bgp := niProto.GetOrCreateBgp()

global := bgp.GetOrCreateGlobal()
Expand Down
2 changes: 1 addition & 1 deletion feature/afts/otg_tests/afts_atomic/afts_atomic_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ func (tc *testCase) configureATE(t *testing.T) {
}

func (tc *testCase) waitForBGPSession(t *testing.T) error {
bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(tc.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp()
bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(tc.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(tc.dut)).Bgp()
verifySessionState := func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool {
state, ok := val.Val()
if !ok {
Expand Down
8 changes: 4 additions & 4 deletions feature/afts/otg_tests/afts_base/afts_base_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ func (tc *testCase) configureDUT(t *testing.T) error {
statement.GetOrCreateActions().PolicyResult = applyPolicyType
gnmi.Update(t, dut, gnmi.OC().RoutingPolicy().Config(), routePolicy)

dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut))
nbrs := []*BGPNeighbor{
{as: ateAS, neighborip: ateP1.IPv4, version: IPv4},
{as: ateAS, neighborip: ateP1.IPv6, version: IPv6},
Expand Down Expand Up @@ -256,7 +256,7 @@ const (
func createBGPNeighbor(peerGrpNameV4, peerGrpNameV6 string, nbrs []*BGPNeighbor, dut *ondatra.DUTDevice) *oc.NetworkInstance_Protocol {
d := &oc.Root{}
ni := d.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut))
niProtocol := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
niProtocol := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut))
bgp := niProtocol.GetOrCreateBgp()

global := bgp.GetOrCreateGlobal()
Expand Down Expand Up @@ -322,7 +322,7 @@ func updateNeighborMaxPrefix(t *testing.T, dut *ondatra.DUTDevice, neighbors []*
}
func (tc *testCase) waitForBGPSessions(t *testing.T, ipv4nbrs []string, ipv6nbrs []string) error {
t.Helper()
statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(tc.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp()
statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(tc.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(tc.dut)).Bgp()
verifySessionState := func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool {
state, ok := val.Val()
if !ok {
Expand Down Expand Up @@ -354,7 +354,7 @@ func (tc *testCase) waitForBGPSessions(t *testing.T, ipv4nbrs []string, ipv6nbrs

func (tc *testCase) waitForBGPSessionsDown(t *testing.T, ipv4nbrs []string, ipv6nbrs []string) error {
t.Helper()
statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(tc.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp()
statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(tc.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(tc.dut)).Bgp()
verifySessionDown := func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool {
state, ok := val.Val()
if !ok {
Expand Down
2 changes: 1 addition & 1 deletion feature/afts/otg_tests/afts_reboot/afts_reboot_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ func (tc *testCase) configureATE(t *testing.T) {
}

func (tc *testCase) waitForBGPSession(t *testing.T) error {
bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(tc.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp()
bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(tc.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(tc.dut)).Bgp()
verifySessionState := func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool {
state, ok := val.Val()
if !ok {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ func (tc *testCase) configureRoutingPolicy(t *testing.T) error {
// configureBGP configures BGP neighbors on the DUT.
func (tc *testCase) configureBGP(t *testing.T) {
dut := tc.dut
dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut))
nbrs := []*BGPNeighbor{
{as: ateAS, neighborip: ateP1.IPv4, version: IPv4},
{as: ateAS, neighborip: ateP1.IPv6, version: IPv6},
Expand Down Expand Up @@ -259,7 +259,7 @@ const (
func createBGPNeighbor(peerGrpNameV4, peerGrpNameV6 string, nbrs []*BGPNeighbor, dut *ondatra.DUTDevice) *oc.NetworkInstance_Protocol {
d := &oc.Root{}
ni := d.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut))
niProtocol := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
niProtocol := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut))
bgp := niProtocol.GetOrCreateBgp()

global := bgp.GetOrCreateGlobal()
Expand Down Expand Up @@ -323,7 +323,7 @@ func updateNeighborMaxPrefix(t *testing.T, dut *ondatra.DUTDevice, neighbors []*
}

func (tc *testCase) waitForBGPSessions(t *testing.T, ipv4nbrs []string, ipv6nbrs []string) error {
statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(tc.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp()
statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(tc.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(tc.dut)).Bgp()
verifySessionState := func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool {
state, ok := val.Val()
if !ok {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func (tc *testCase) configureRoutingPolicy(t *testing.T) error {
// configureBGP configures BGP neighbors on the DUT.
func (tc *testCase) configureBGP(t *testing.T) {
dut := tc.dut
dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut))
nbrs := []*BGPNeighbor{
{as: ateAS, neighborip: ateP1.IPv4, version: IPv4},
{as: ateAS, neighborip: ateP1.IPv6, version: IPv6},
Expand Down Expand Up @@ -251,7 +251,7 @@ const (
func createBGPNeighbor(peerGrpNameV4, peerGrpNameV6 string, nbrs []*BGPNeighbor, dut *ondatra.DUTDevice) *oc.NetworkInstance_Protocol {
d := &oc.Root{}
ni := d.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut))
niProtocol := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
niProtocol := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut))
bgp := niProtocol.GetOrCreateBgp()

global := bgp.GetOrCreateGlobal()
Expand Down Expand Up @@ -315,7 +315,7 @@ func updateNeighborMaxPrefix(t *testing.T, dut *ondatra.DUTDevice, neighbors []*
}

func (tc *testCase) waitForBGPSessions(t *testing.T, ipv4nbrs []string, ipv6nbrs []string) error {
statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(tc.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp()
statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(tc.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(tc.dut)).Bgp()
verifySessionState := func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool {
state, ok := val.Val()
if !ok {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -361,10 +361,10 @@ func (d *dutData) Configure(t *testing.T, dut *ondatra.DUTDevice) {
}
}

dutProto := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
dutProto := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut))
niProtocol := &oc.NetworkInstance_Protocol{
Identifier: oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP,
Name: ygot.String("BGP"),
Name: ygot.String(deviations.NwInstBgpProtoName(dut)),
Bgp: bgpOC,
}
rpl, err := configureRoutingPolicy(&oc.Root{})
Expand All @@ -378,7 +378,7 @@ func (d *dutData) Configure(t *testing.T, dut *ondatra.DUTDevice) {
func (d *dutData) AwaitBGPEstablished(t *testing.T, dut *ondatra.DUTDevice, neighbors []string) {
for _, neighbor := range neighbors {
gnmi.Await(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).
Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").
Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).
Bgp().
Neighbor(neighbor).
SessionState().State(), time.Second*120, oc.Bgp_Neighbor_SessionState_ESTABLISHED)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice) {
}
configureRoutePolicy(t, dut, rplName, rplType)

dutConfPath := dc.NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
dutConfPath := dc.NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut))
dutConf := createBGPNeighborP1(dutAS, ate1AS, dut)
gnmi.Replace(t, dut, dutConfPath.Config(), dutConf)
dutConf = createBGPNeighborP2(dutAS, ate2AS, dut)
Expand Down Expand Up @@ -164,7 +164,7 @@ func createBGPNeighborP1(localAs, peerAs uint32, dut *ondatra.DUTDevice) *oc.Net

d := &oc.Root{}
ni1 := d.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut))
niProto := ni1.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
niProto := ni1.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut))
bgp := niProto.GetOrCreateBgp()

global := bgp.GetOrCreateGlobal()
Expand Down Expand Up @@ -236,7 +236,7 @@ func createBGPNeighborP2(localAs, peerAs uint32, dut *ondatra.DUTDevice) *oc.Net

d := &oc.Root{}
ni1 := d.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut))
niProto := ni1.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
niProto := ni1.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut))
bgp := niProto.GetOrCreateBgp()

global := bgp.GetOrCreateGlobal()
Expand Down Expand Up @@ -313,7 +313,7 @@ func configureRoutePolicy(t *testing.T, dut *ondatra.DUTDevice, name string, pr
}

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()
statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp()
nbrPath := statePath.Neighbor(ateP2.IPv4)
nbrPathv6 := statePath.Neighbor(ateP2.IPv6)
compare := func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool {
Expand Down
20 changes: 10 additions & 10 deletions feature/bgp/addpath/otg_tests/addpath_scale/addpath_scale_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ func TestAddPathScale(t *testing.T) {
configureRoutePolicy(t, dut, "ALLOW", oc.RoutingPolicy_PolicyResultType_ACCEPT_ROUTE)

nbrList := buildNeighborList(atePort2, atePort3, atePort4)
dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut))
t.Run("configureBGP", func(t *testing.T) {
dutConf := bgpWithNbr(dutAS, nbrList, dut, "ALLOW", "ALLOW")
gnmi.Replace(t, dut, dutConfPath.Config(), dutConf)
Expand Down Expand Up @@ -299,7 +299,7 @@ func TestAddPathScaleWithRoutePolicy(t *testing.T) {
configureImportBGPPolicy(t, dut)

nbrList := buildNeighborList(atePort2, atePort3, atePort4)
dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut))
t.Run("configureBGP", func(t *testing.T) {
dutConf := bgpWithNbr(dutAS, nbrList, dut, "community-match", "ALLOW")
gnmi.Replace(t, dut, dutConfPath.Config(), dutConf)
Expand Down Expand Up @@ -456,8 +456,8 @@ func validateAddPathReceiveSend(t *testing.T, dut *ondatra.DUTDevice, ate *ondat
func configAddPathDisabled(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATEDevice) {
ocRoot := &oc.Root{}
nbrList := buildNeighborList(atePort2, atePort3, atePort4)
bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp()
bgp := ocRoot.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").GetOrCreateBgp()
bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp()
bgp := ocRoot.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp()
for _, nbr := range nbrList {
nbrD := bgp.GetOrCreateNeighbor(nbr.neighborip)
afiSafiType := oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST
Expand All @@ -475,8 +475,8 @@ func configAddPathDisabled(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.AT
func configAddPathReceive(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATEDevice) {
ocRoot := &oc.Root{}
nbrList := buildNeighborList(atePort2, atePort3, atePort4)
bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp()
bgp := ocRoot.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").GetOrCreateBgp()
bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp()
bgp := ocRoot.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp()
for _, nbr := range nbrList {
nbrD := bgp.GetOrCreateNeighbor(nbr.neighborip)
afiSafiType := oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST
Expand All @@ -494,8 +494,8 @@ func configAddPathReceive(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATE
func configAddPathReceiveSend(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATEDevice) {
ocRoot := &oc.Root{}
nbrList := buildNeighborList(atePort2, atePort3, atePort4)
bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp()
bgp := ocRoot.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").GetOrCreateBgp()
bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp()
bgp := ocRoot.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp()
for _, nbr := range nbrList {
nbrD := bgp.GetOrCreateNeighbor(nbr.neighborip)
afiSafiType := oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST
Expand All @@ -515,7 +515,7 @@ func configAddPathReceiveSend(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra

func validatePrefixes(t *testing.T, dut *ondatra.DUTDevice, neighborIPv4, neighborIPv6 string) {
t.Helper()
bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp()
bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp()

gnmi.Await(t, dut, bgpPath.Neighbor(neighborIPv4).SessionState().State(), 2*time.Minute, oc.Bgp_Neighbor_SessionState_ESTABLISHED)
ipv4Pfx := bgpPath.Neighbor(neighborIPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Prefixes()
Expand Down Expand Up @@ -939,7 +939,7 @@ func configureRoutePolicy(t *testing.T, dut *ondatra.DUTDevice, name string, pr
func bgpWithNbr(as uint32, nbrs []*bgpNeighbor, dut *ondatra.DUTDevice, impPolicy, expPolicy string) *oc.NetworkInstance_Protocol {
d := &oc.Root{}
ni1 := d.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut))
niProto := ni1.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")
niProto := ni1.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut))
bgp := niProto.GetOrCreateBgp()

g := bgp.GetOrCreateGlobal()
Expand Down
Loading
Loading