diff --git a/feature/acl/otg_tests/acl_large_scale/acl_large_scale_test.go b/feature/acl/otg_tests/acl_large_scale/acl_large_scale_test.go index f325455c520..bedde1d0ac0 100644 --- a/feature/acl/otg_tests/acl_large_scale/acl_large_scale_test.go +++ b/feature/acl/otg_tests/acl_large_scale/acl_large_scale_test.go @@ -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}, @@ -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() diff --git a/feature/afts/otg_tests/afts_atomic/afts_atomic_test.go b/feature/afts/otg_tests/afts_atomic/afts_atomic_test.go index ff3977110c3..b989ee21bd0 100644 --- a/feature/afts/otg_tests/afts_atomic/afts_atomic_test.go +++ b/feature/afts/otg_tests/afts_atomic/afts_atomic_test.go @@ -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 { diff --git a/feature/afts/otg_tests/afts_base/afts_base_test.go b/feature/afts/otg_tests/afts_base/afts_base_test.go index 0ae63536d14..d891f103433 100644 --- a/feature/afts/otg_tests/afts_base/afts_base_test.go +++ b/feature/afts/otg_tests/afts_base/afts_base_test.go @@ -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}, @@ -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() @@ -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 { @@ -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 { diff --git a/feature/afts/otg_tests/afts_reboot/afts_reboot_test.go b/feature/afts/otg_tests/afts_reboot/afts_reboot_test.go index a718379ef2f..378b68a0fb7 100644 --- a/feature/afts/otg_tests/afts_reboot/afts_reboot_test.go +++ b/feature/afts/otg_tests/afts_reboot/afts_reboot_test.go @@ -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 { diff --git a/feature/afts/otg_tests/afts_slowcollector/slow_collector_test.go b/feature/afts/otg_tests/afts_slowcollector/slow_collector_test.go index a41ef0b7180..0cd44610190 100644 --- a/feature/afts/otg_tests/afts_slowcollector/slow_collector_test.go +++ b/feature/afts/otg_tests/afts_slowcollector/slow_collector_test.go @@ -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}, @@ -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() @@ -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 { diff --git a/feature/afts/otg_tests/collector_flap/collector_flap_test.go b/feature/afts/otg_tests/collector_flap/collector_flap_test.go index 71d413c3f15..bbc62b5abdc 100644 --- a/feature/afts/otg_tests/collector_flap/collector_flap_test.go +++ b/feature/afts/otg_tests/collector_flap/collector_flap_test.go @@ -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}, @@ -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() @@ -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 { diff --git a/feature/afts/summary/otg_tests/route_summary_counters_test/route_summary_counters_test.go b/feature/afts/summary/otg_tests/route_summary_counters_test/route_summary_counters_test.go index c3d13f570f3..c5268f6494e 100644 --- a/feature/afts/summary/otg_tests/route_summary_counters_test/route_summary_counters_test.go +++ b/feature/afts/summary/otg_tests/route_summary_counters_test/route_summary_counters_test.go @@ -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{}) @@ -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) diff --git a/feature/afts/summary/otg_tests/scale_aft_summary/route_test.go b/feature/afts/summary/otg_tests/scale_aft_summary/route_test.go index e283663711e..eba4c3ca168 100644 --- a/feature/afts/summary/otg_tests/scale_aft_summary/route_test.go +++ b/feature/afts/summary/otg_tests/scale_aft_summary/route_test.go @@ -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) @@ -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() @@ -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() @@ -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 { diff --git a/feature/bgp/addpath/otg_tests/addpath_scale/addpath_scale_test.go b/feature/bgp/addpath/otg_tests/addpath_scale/addpath_scale_test.go index 3c3cf40383e..db7f301ef76 100644 --- a/feature/bgp/addpath/otg_tests/addpath_scale/addpath_scale_test.go +++ b/feature/bgp/addpath/otg_tests/addpath_scale/addpath_scale_test.go @@ -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) @@ -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) @@ -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 @@ -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 @@ -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 @@ -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() @@ -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() diff --git a/feature/bgp/addpath/otg_tests/route_propagation_test/route_propagation_test.go b/feature/bgp/addpath/otg_tests/route_propagation_test/route_propagation_test.go index 6a0d95b0f02..71243e41b67 100644 --- a/feature/bgp/addpath/otg_tests/route_propagation_test/route_propagation_test.go +++ b/feature/bgp/addpath/otg_tests/route_propagation_test/route_propagation_test.go @@ -291,10 +291,10 @@ func (d *dutData) Configure(t *testing.T, dut *ondatra.DUTDevice) { } dutProto := gnmi.OC().NetworkInstance(ni). - Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) key := oc.NetworkInstance_Protocol_Key{ Identifier: oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, - Name: "BGP", + Name: deviations.NwInstBgpProtoName(dut), } niOC := &oc.NetworkInstance{ @@ -303,7 +303,7 @@ func (d *dutData) Configure(t *testing.T, dut *ondatra.DUTDevice) { Protocol: map[oc.NetworkInstance_Protocol_Key]*oc.NetworkInstance_Protocol{ key: { Identifier: oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, - Name: ygot.String("BGP"), + Name: ygot.String(deviations.NwInstBgpProtoName(dut)), Bgp: d.bgpOC, }, }, @@ -320,7 +320,7 @@ func (d *dutData) AwaitBGPEstablished(t *testing.T, dut *ondatra.DUTDevice) { ni := d.networkInstance(dut) for neighbor := range d.bgpOC.Neighbor { gnmi.Await(t, dut, gnmi.OC().NetworkInstance(ni). - 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) @@ -474,7 +474,7 @@ func checkOTGBGP6Prefix(t *testing.T, otg *otg.OTG, config gosnappi.Config, expe // verifyAddPathState verifies DUT telemetry for BGP ADD-Path receive states. func verifyAddPathState(t *testing.T, dut *ondatra.DUTDevice, ni, tag string, afi oc.E_BgpTypes_AFI_SAFI_TYPE, rxNbr string, cfg addPathCfg) { t.Helper() - bgpPath := gnmi.OC().NetworkInstance(ni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + bgpPath := gnmi.OC().NetworkInstance(ni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() if cfg.nbrReceive != nil { q := bgpPath.Neighbor(rxNbr).AfiSafi(afi).AddPaths().Receive().State() @@ -1063,7 +1063,7 @@ func TestAddPath(t *testing.T) { t.Logf("%s START | Config: %s | Expect: effective receive=%t, ADD_PATHS=%t, DUT(%s) rcv=%d, ATE port-2=4 paths (1/prefix)", tag, tc.desc, receiveOn, receiveOn, af.rxNbr, wantRcv) t.Cleanup(func() { - gnmi.Delete(t, dut, gnmi.OC().NetworkInstance(defaultNI).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Config()) + gnmi.Delete(t, dut, gnmi.OC().NetworkInstance(defaultNI).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config()) }) d := dutData{ bgpOC: addPathBGP(af.afi, af.rxNbr, af.txNbr, tc.cfg, routePolicyUnderAFIUnsupported), @@ -1085,7 +1085,7 @@ func TestAddPath(t *testing.T) { // With ADD-Path receive enabled the DUT keeps every path ID for each // prefix; with it disabled each new path implicitly replaces the // previous one, so the DUT keeps one path per prefix. - rcvQ := gnmi.OC().NetworkInstance(defaultNI).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Neighbor(af.rxNbr).AfiSafi(af.afi).Prefixes().Received().State() + rcvQ := gnmi.OC().NetworkInstance(defaultNI).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(af.rxNbr).AfiSafi(af.afi).Prefixes().Received().State() if _, ok := gnmi.Watch(t, dut, rcvQ, time.Minute, func(v *ygnmi.Value[uint32]) bool { got, present := v.Val() return present && got == wantRcv diff --git a/feature/bgp/admin_distance/otg_tests/admin_distance_test/admin_distance_test.go b/feature/bgp/admin_distance/otg_tests/admin_distance_test/admin_distance_test.go index ae1bc5ae5ea..a13457f44c7 100644 --- a/feature/bgp/admin_distance/otg_tests/admin_distance_test/admin_distance_test.go +++ b/feature/bgp/admin_distance/otg_tests/admin_distance_test/admin_distance_test.go @@ -40,7 +40,6 @@ const ( v4Network = "192.168.10.0" v6Network = "2024:db8:64:64::" prefixesCount = 1 - bgpName = "BGP" dutAS = uint32(64656) ateAS = uint32(64657) peerGrpNameV4 = "BGP-PEER-GROUP-V4" @@ -131,7 +130,7 @@ func TestAdminDistance(t *testing.T) { }, } - bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(ts.DUT)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp() + bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(ts.DUT)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(ts.DUT)).Bgp() t.Run("Test Admin Distance", func(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { @@ -203,7 +202,7 @@ func configureRoutePolicy(t *testing.T, dut *ondatra.DUTDevice, name string, pr func changeProtocolToIBGP(t *testing.T, ts *isissession.TestSession) { root := &oc.Root{} dni := root.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(ts.DUT)) - bgpP := dni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName) + bgpP := dni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(ts.DUT)) bgpP.GetOrCreateBgp().GetOrCreateNeighbor(isissession.ATETrafficAttrs.IPv4).SetPeerAs(dutAS) bgpP.GetOrCreateBgp().GetOrCreateNeighbor(isissession.ATETrafficAttrs.IPv6).SetPeerAs(dutAS) gnmi.Update(t, ts.DUT, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(ts.DUT)).Config(), dni) @@ -274,7 +273,7 @@ func setupEBGPAndAdvertise(t *testing.T, ts *isissession.TestSession) { dni := root.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(ts.DUT)) dni.SetType(oc.NetworkInstanceTypes_NETWORK_INSTANCE_TYPE_DEFAULT_INSTANCE) - bgpP := dni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName) + bgpP := dni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(ts.DUT)) bgpP.SetEnabled(true) bgp := bgpP.GetOrCreateBgp() diff --git a/feature/bgp/bgp_isis_redistribution/otg_tests/bgp_isis_redistribution_test/bgp_isis_redistribution_test.go b/feature/bgp/bgp_isis_redistribution/otg_tests/bgp_isis_redistribution_test/bgp_isis_redistribution_test.go index 7cc6b6b776c..42a89db7905 100644 --- a/feature/bgp/bgp_isis_redistribution/otg_tests/bgp_isis_redistribution_test/bgp_isis_redistribution_test.go +++ b/feature/bgp/bgp_isis_redistribution/otg_tests/bgp_isis_redistribution_test/bgp_isis_redistribution_test.go @@ -38,7 +38,6 @@ import ( ) const ( - bgpName = "BGP" maskLenExact = "exact" dummyAS = uint32(64655) dutAS = uint32(64656) @@ -277,7 +276,7 @@ func setupEBGPAndAdvertise(t *testing.T, ts *isissession.TestSession) { dni := root.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(ts.DUT)) dni.SetType(oc.NetworkInstanceTypes_NETWORK_INSTANCE_TYPE_DEFAULT_INSTANCE) - bgpP := dni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName) + bgpP := dni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(ts.DUT)) bgpP.SetEnabled(true) bgp := bgpP.GetOrCreateBgp() diff --git a/feature/bgp/bgp_session_mode/otg_tests/bgp_session_mode_configuration_test/bgp_session_mode_configuration_test.go b/feature/bgp/bgp_session_mode/otg_tests/bgp_session_mode_configuration_test/bgp_session_mode_configuration_test.go index 262a4d4be9f..9d0acc2d9fb 100644 --- a/feature/bgp/bgp_session_mode/otg_tests/bgp_session_mode_configuration_test/bgp_session_mode_configuration_test.go +++ b/feature/bgp/bgp_session_mode/otg_tests/bgp_session_mode_configuration_test/bgp_session_mode_configuration_test.go @@ -98,7 +98,7 @@ type bgpTestParams struct { func bgpCreateNbr(bgpParams *bgpTestParams, dut *ondatra.DUTDevice) *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() @@ -142,7 +142,7 @@ func bgpCreateNbr(bgpParams *bgpTestParams, dut *ondatra.DUTDevice) *oc.NetworkI // 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()) + gnmi.BatchDelete(resetBatch, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config()) if deviations.NetworkInstanceTableDeletionRequired(dut) { tablePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).TableAny() @@ -159,7 +159,7 @@ func bgpClearConfig(t *testing.T, dut *ondatra.DUTDevice) { // verifyBgpTelemetry checks that the dut has an established BGP session with reasonable settings. func verifyBgpTelemetry(t *testing.T, dut *ondatra.DUTDevice, wantState oc.E_Bgp_Neighbor_SessionState, transMode string, transModeOnATE string) { - 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(ateAttrs.IPv4) if deviations.BgpSessionStateIdleInPassiveMode(dut) { if transModeOnATE == nbrLvlPassive || transModeOnATE == peerLvlPassive { @@ -282,7 +282,7 @@ func TestBgpSessionModeConfiguration(t *testing.T) { t.Log("Verifying port status") verifyPortsUp(t, dut.Device) - 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)) cases := []struct { name string diff --git a/feature/bgp/bmp/otg_tests/bmp_base_session_test/bmp_base_session_test.go b/feature/bgp/bmp/otg_tests/bmp_base_session_test/bmp_base_session_test.go index f61652bb212..833e598a452 100644 --- a/feature/bgp/bmp/otg_tests/bmp_base_session_test/bmp_base_session_test.go +++ b/feature/bgp/bmp/otg_tests/bmp_base_session_test/bmp_base_session_test.go @@ -624,7 +624,7 @@ func verifyPrefixCountV4(t *testing.T, dut *ondatra.DUTDevice) error { c, ok := val.Val() return ok && c == postPolicyV4RouteCount } - 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() prefixes := statePath.Neighbor(ateP1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Prefixes() if got, ok := gnmi.Watch(t, dut, prefixes.Received().State(), 2*time.Minute, compare).Await(t); !ok { return fmt.Errorf("received prefixes v4 mismatch: got %v, want %v", got, postPolicyV4RouteCount) @@ -638,7 +638,7 @@ func verifyPrefixCountV6(t *testing.T, dut *ondatra.DUTDevice) error { c, ok := val.Val() return ok && c == postPolicyV6RouteCount } - 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() prefixes := statePath.Neighbor(ateP1.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Prefixes() if got, ok := gnmi.Watch(t, dut, prefixes.Received().State(), 2*time.Minute, compare).Await(t); !ok { diff --git a/feature/bgp/bmp/otg_tests/bmp_post_policy_test/bmp_post_policy_test.go b/feature/bgp/bmp/otg_tests/bmp_post_policy_test/bmp_post_policy_test.go index 12311ec0723..1f53377e793 100644 --- a/feature/bgp/bmp/otg_tests/bmp_post_policy_test/bmp_post_policy_test.go +++ b/feature/bgp/bmp/otg_tests/bmp_post_policy_test/bmp_post_policy_test.go @@ -649,7 +649,7 @@ func verifyPrefixCountV4(t *testing.T, dut *ondatra.DUTDevice) error { c, ok := val.Val() return ok && c == postPolicyRoutev4CountperNeighbor } - 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() prefixes := statePath.Neighbor(ateP1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Prefixes() if got, ok := gnmi.Watch(t, dut, prefixes.Received().State(), timeout, compare).Await(t); !ok { return fmt.Errorf("received prefixes v4 mismatch: got %v, want %v", got, postPolicyRoutev4CountperNeighbor) @@ -664,7 +664,7 @@ func verifyPrefixCountV6(t *testing.T, dut *ondatra.DUTDevice) error { c, ok := val.Val() return ok && c == postPolicyRoutev6CountperNeighbor } - 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() prefixes := statePath.Neighbor(ateP1.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Prefixes() if got, ok := gnmi.Watch(t, dut, prefixes.Received().State(), timeout, compare).Await(t); !ok { diff --git a/feature/bgp/bmp/otg_tests/bmp_pre_policy_test/bmp_pre_policy_test.go b/feature/bgp/bmp/otg_tests/bmp_pre_policy_test/bmp_pre_policy_test.go index 15d2db45b2b..911e1af630a 100644 --- a/feature/bgp/bmp/otg_tests/bmp_pre_policy_test/bmp_pre_policy_test.go +++ b/feature/bgp/bmp/otg_tests/bmp_pre_policy_test/bmp_pre_policy_test.go @@ -602,7 +602,7 @@ func mustVerifyPrefixCountV4(t *testing.T, dut *ondatra.DUTDevice) error { c, ok := val.Val() return ok && c == routev4CountperNeighbor } - 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() prefixes := statePath.Neighbor(ateP1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Prefixes() if got, ok := gnmi.Watch(t, dut, prefixes.Received().State(), timeout, compare).Await(t); !ok { return fmt.Errorf("received prefixes v4 mismatch: got %v, want %v", got, routev4CountperNeighbor) @@ -617,7 +617,7 @@ func mustVerifyPrefixCountV6(t *testing.T, dut *ondatra.DUTDevice) error { c, ok := val.Val() return ok && c == routev6CountperNeighbor } - 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() prefixes := statePath.Neighbor(ateP1.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Prefixes() if got, ok := gnmi.Watch(t, dut, prefixes.Received().State(), 10*time.Minute, compare).Await(t); !ok { diff --git a/feature/bgp/confederation/otg_tests/bgp_confederation_test/bgp_confederation_test.go b/feature/bgp/confederation/otg_tests/bgp_confederation_test/bgp_confederation_test.go index 85148653cd8..79b07e3819d 100644 --- a/feature/bgp/confederation/otg_tests/bgp_confederation_test/bgp_confederation_test.go +++ b/feature/bgp/confederation/otg_tests/bgp_confederation_test/bgp_confederation_test.go @@ -54,7 +54,6 @@ const ( extPeerAS = 64510 // AS of ATE R1, outside the confederation. dutRouterID = "192.0.2.254" - bgpInstance = "BGP" // BGP protocol name from the README Canonical OC. allowPolicy = "ALLOW" // Accept-all import and export policy for every peer. plenIPv4 = 30 @@ -642,7 +641,7 @@ func onChange(dut *ondatra.DUTDevice) *gnmi.Opts { // bgpPath returns the path of the DUT BGP instance in the DEFAULT network // instance. func bgpPath(dut *ondatra.DUTDevice) *netinstbgp.NetworkInstance_Protocol_BgpPath { - return gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpInstance).Bgp() + return gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() } // verifyConfederationState verifies the DUT BGP global AS, confederation diff --git a/feature/bgp/gracefulrestart/otg_tests/bgp_graceful_restart_test/bgp_graceful_restart_test.go b/feature/bgp/gracefulrestart/otg_tests/bgp_graceful_restart_test/bgp_graceful_restart_test.go index 0f5c419d872..d18e6485783 100644 --- a/feature/bgp/gracefulrestart/otg_tests/bgp_graceful_restart_test/bgp_graceful_restart_test.go +++ b/feature/bgp/gracefulrestart/otg_tests/bgp_graceful_restart_test/bgp_graceful_restart_test.go @@ -173,7 +173,7 @@ func buildNbrList() []*bgpNeighbor { func bgpWithNbr(as uint32, keepaliveTimer uint16, nbrs []*bgpNeighbor, dut *ondatra.DUTDevice) *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() @@ -255,7 +255,7 @@ func bgpWithNbr(as uint32, keepaliveTimer uint16, nbrs []*bgpNeighbor, dut *onda func checkBgpGRConfig(t *testing.T, dut *ondatra.DUTDevice) { t.Log("Verifying BGP configuration") - 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() globalPath := statePath.Global() isGrEnabled := gnmi.Get(t, dut, globalPath.GracefulRestart().Enabled().State()) @@ -284,7 +284,7 @@ func checkBgpGRConfig(t *testing.T, dut *ondatra.DUTDevice) { func checkBgpStatus(t *testing.T, dut *ondatra.DUTDevice) { t.Log("Verifying BGP state") - 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() for _, attr := range []attrs.Attributes{ateIBGP, ateEBGP} { @@ -534,7 +534,7 @@ func configACLInterface(iFace *oc.Acl_Interface, ifName string) *acl.Acl_Interfa func verifyBGPActive(t *testing.T, mode string, dst attrs.Attributes) { t.Logf("Waiting for %s BGP neighbor %s to go to ACTIVE state", mode, dst.IPv4) dut := ondatra.DUT(t, "dut") - 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(dst.IPv4) bgpState := oc.Bgp_Neighbor_SessionState_ACTIVE @@ -583,7 +583,7 @@ func TestBGPGracefulRestart(t *testing.T) { // Configure BGP+Neighbors on the DUT t.Log("Configure BGP with Graceful Restart option under Global Bgp") - 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)) nbrList := buildNbrList() dutConf := bgpWithNbr(dutAS, 60, nbrList, dut) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) @@ -759,7 +759,7 @@ func TestBGPGracefulRestart(t *testing.T) { // Configure BGP+Neighbors on the DUT with longer staleroute timer than holdtime timer t.Log("Configure BGP with Graceful Restart option under Global Bgp") - 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)) nbrList := buildNbrList() dutConf := bgpWithNbr(dutAS, keepaliveTimer, nbrList, dut) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) @@ -890,7 +890,7 @@ func TestBGPGracefulRestart(t *testing.T) { // Configure BGP+Neighbors on the DUT t.Log("Configure BGP with Graceful Restart option under Global Bgp") - 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)) nbrList := buildNbrList() dutConf := bgpWithNbr(dutAS, 60, nbrList, dut) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) diff --git a/feature/bgp/gracefulrestart/otg_tests/exrr/exrr_test.go b/feature/bgp/gracefulrestart/otg_tests/exrr/exrr_test.go index 25ed5519e5c..f73750f8eca 100644 --- a/feature/bgp/gracefulrestart/otg_tests/exrr/exrr_test.go +++ b/feature/bgp/gracefulrestart/otg_tests/exrr/exrr_test.go @@ -580,7 +580,7 @@ func buildNbrListibgp() []*bgpNeighbor { func ebgpWithNbr(params cfgplugins.BGPGracefulRestartConfig, nbrs []*bgpNeighbor, dut *ondatra.DUTDevice) *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() @@ -652,7 +652,7 @@ func ebgpWithNbr(params cfgplugins.BGPGracefulRestartConfig, nbrs []*bgpNeighbor func ibgpWithNbr(params cfgplugins.BGPGracefulRestartConfig, nbrs []*bgpNeighbor, dut *ondatra.DUTDevice) *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() @@ -721,7 +721,7 @@ func ibgpWithNbr(params cfgplugins.BGPGracefulRestartConfig, nbrs []*bgpNeighbor func mustCheckBgpGRConfig(t *testing.T, params cfgplugins.BGPGracefulRestartConfig, dut *ondatra.DUTDevice) error { t.Helper() t.Log("Verifying BGP configuration") - 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() isGrEnabled := gnmi.Get(t, dut, statePath.Global().GracefulRestart().Enabled().State()) t.Logf("isGrEnabled %v", isGrEnabled) @@ -752,7 +752,7 @@ func mustCheckBgpGRConfig(t *testing.T, params cfgplugins.BGPGracefulRestartConf func mustCheckBgpStatus(t *testing.T, dut *ondatra.DUTDevice, routeCount uint32) { t.Helper() t.Log("Verifying BGP state") - 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() for _, attr := range []attrs.Attributes{ateEBGP, ateIBGP} { @@ -822,7 +822,7 @@ func mustCheckBgpStatus(t *testing.T, dut *ondatra.DUTDevice, routeCount uint32) func mustCheckBgpStatusDown(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() t.Log("Verifying BGP state down") - 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() for _, attr := range []attrs.Attributes{ateEBGP, ateIBGP} { @@ -1297,7 +1297,7 @@ func setup(t *testing.T, bgpGracefulRestartConfigParams cfgplugins.BGPGracefulRe // Configure BGP+Neighbors on the DUT t.Log("Configure BGP with Graceful Restart option under Global Bgp") - 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)) nbrList := buildNbrListebgp() dutConf := ebgpWithNbr(bgpGracefulRestartConfigParams, nbrList, dut) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) diff --git a/feature/bgp/linkbandwidth_community/otg_tests/linkbandwidth_aggregation/linkbandwidth_aggregation_test.go b/feature/bgp/linkbandwidth_community/otg_tests/linkbandwidth_aggregation/linkbandwidth_aggregation_test.go index 2d88994a1fb..46f7247f0e5 100644 --- a/feature/bgp/linkbandwidth_community/otg_tests/linkbandwidth_aggregation/linkbandwidth_aggregation_test.go +++ b/feature/bgp/linkbandwidth_community/otg_tests/linkbandwidth_aggregation/linkbandwidth_aggregation_test.go @@ -242,7 +242,7 @@ func TestLinkBandwidthExtendedCommunityCumulative(t *testing.T) { t.Run("configureBGP", func(t *testing.T) { top, dutConf := cfgplugins.ConfigureEBgpPeersScale(t, dut, ate, top, eBgpConfigList) dutConf = configureBgpPolicy(t, dutConf, 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)) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) fptest.LogQuery(t, "DUT BGP Config", dutConfPath.Config(), gnmi.Get(t, dut, dutConfPath.Config())) advertiseRoutesWithEBGPExtCommunitys(t, top) @@ -730,7 +730,7 @@ func configureRoutePolicy(t *testing.T, dut *ondatra.DUTDevice) { func disableEnableBgpWithNbr(t *testing.T, dut *ondatra.DUTDevice, enablePeers bool) { 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() cfg := &cfgplugins.EBgpConfigScale{ @@ -757,7 +757,7 @@ func disableEnableBgpWithNbr(t *testing.T, dut *ondatra.DUTDevice, enablePeers b bgpNbr.PeerGroup = ygot.String(nbr.Pg) } - 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)) gnmi.Update(t, dut, dutConfPath.Config(), niProto) } diff --git a/feature/bgp/multipath/otg_tests/bgp_multipath_ecmp_test/bgp_multipath_ecmp_test.go b/feature/bgp/multipath/otg_tests/bgp_multipath_ecmp_test/bgp_multipath_ecmp_test.go index 6ecc76b34f2..31fa305e88a 100644 --- a/feature/bgp/multipath/otg_tests/bgp_multipath_ecmp_test/bgp_multipath_ecmp_test.go +++ b/feature/bgp/multipath/otg_tests/bgp_multipath_ecmp_test/bgp_multipath_ecmp_test.go @@ -214,7 +214,7 @@ func TestBGPSetup(t *testing.T) { bs := cfgplugins.NewBGPSession(t, cfgplugins.PortCount4, nil) bs.WithEBGP(t, []oc.E_BgpTypes_AFI_SAFI_TYPE{oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST}, []string{"port3", "port4"}, true, !tc.enableMultiAS) dni := deviations.DefaultNetworkInstance(bs.DUT) - bgp := bs.DUTConf.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").GetOrCreateBgp() + bgp := bs.DUTConf.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(bs.DUT)).GetOrCreateBgp() gEBGP := bgp.GetOrCreateGlobal().GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateUseMultiplePaths().GetOrCreateEbgp() if tc.enableMultipath { t.Logf("Enable Multipath") diff --git a/feature/bgp/multipath/otg_tests/bgp_multipath_wecmp_lbw_community_test/bgp_multipath_wecmp_test.go b/feature/bgp/multipath/otg_tests/bgp_multipath_wecmp_lbw_community_test/bgp_multipath_wecmp_test.go index 614826d51ad..1717c395db4 100644 --- a/feature/bgp/multipath/otg_tests/bgp_multipath_wecmp_lbw_community_test/bgp_multipath_wecmp_test.go +++ b/feature/bgp/multipath/otg_tests/bgp_multipath_wecmp_lbw_community_test/bgp_multipath_wecmp_test.go @@ -199,7 +199,7 @@ func TestBGPSetup(t *testing.T) { bs.WithEBGP(t, []oc.E_BgpTypes_AFI_SAFI_TYPE{oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST}, []string{"port3", "port4"}, true, false) dni := deviations.DefaultNetworkInstance(bs.DUT) - bgp := bs.DUTConf.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").GetOrCreateBgp() + bgp := bs.DUTConf.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(bs.DUT)).GetOrCreateBgp() switch bs.DUT.Vendor() { case ondatra.NOKIA: //BGP multipath enable/disable at the peer-group level not required b/376799583 diff --git a/feature/bgp/otg_tests/aigp_test/aigp_test.go b/feature/bgp/otg_tests/aigp_test/aigp_test.go index d375c519c47..cbfedaac4e0 100644 --- a/feature/bgp/otg_tests/aigp_test/aigp_test.go +++ b/feature/bgp/otg_tests/aigp_test/aigp_test.go @@ -754,7 +754,7 @@ func configureBGP(t *testing.T, dut *ondatra.DUTDevice, bgpCfg map[string]*niBGP // Create BGP protocol object for this NI niObj := d.GetOrCreateNetworkInstance(resolvedNI) - proto := niObj.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + proto := niObj.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) bgp := proto.GetOrCreateBgp() bgp.GetOrCreateGlobal().SetAs(niCfg.globalAsn) @@ -773,13 +773,13 @@ func configureBGP(t *testing.T, dut *ondatra.DUTDevice, bgpCfg map[string]*niBGP // Configure each neighbor into this NI's BGP object for _, nbr := range niCfg.bgpNbrs { if nbr.removeBgpPeer { - gnmi.Delete(t, dut, gnmi.OC().NetworkInstance(resolvedNI).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Neighbor(nbr.nbrIp).Config()) + gnmi.Delete(t, dut, gnmi.OC().NetworkInstance(resolvedNI).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(nbr.nbrIp).Config()) continue } configureBGPNeighbor(t, dut, resolvedNI, niCfg.defaultAsn, bgp, nbr) } - bgpPath := gnmi.OC().NetworkInstance(resolvedNI).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + bgpPath := gnmi.OC().NetworkInstance(resolvedNI).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) gnmi.Update(t, dut, bgpPath.Config(), proto) } @@ -1011,7 +1011,7 @@ func verifyAIGPInRIB(t *testing.T, dut *ondatra.DUTDevice, ni, nbrAddr, prefix s var found bool if !deviations.BGPRibOcPathUnsupported(dut) { - bgpRIBPath := gnmi.OC().NetworkInstance(ni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Rib() + bgpRIBPath := gnmi.OC().NetworkInstance(ni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Rib() if isV4 { routePath := bgpRIBPath.AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Ipv4Unicast().LocRib().Route(prefix, oc.UnionString(nbrAddr), 0) locRibVal, ok := gnmi.Watch(t, dut, routePath.State(), 30*time.Second, func(val *ygnmi.Value[*oc.NetworkInstance_Protocol_Bgp_Rib_AfiSafi_Ipv4Unicast_LocRib_Route]) bool { @@ -1057,7 +1057,7 @@ func verifyAIGPInRIB(t *testing.T, dut *ondatra.DUTDevice, ni, nbrAddr, prefix s } func validateAIGPMetric(t *testing.T, dut *ondatra.DUTDevice, ni string, nbrAddr string, attrIndex uint64, wantAIGP uint64, nexthop string) { - attrSet := gnmi.Get(t, dut, gnmi.OC().NetworkInstance(ni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Rib().AttrSet(attrIndex).State()) + attrSet := gnmi.Get(t, dut, gnmi.OC().NetworkInstance(ni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Rib().AttrSet(attrIndex).State()) gotAIGP := attrSet.GetAigp() if gotAIGP != wantAIGP { t.Errorf("fail: aigp for neighbor %s in NI %s: want %d, got %d", nbrAddr, ni, wantAIGP, gotAIGP) @@ -1117,7 +1117,7 @@ func verifyBestPath(t *testing.T, dut *ondatra.DUTDevice, ni, nbrAddr, prefix st if wantBest != 0 { wantBestFlag = true } - bgpRib := gnmi.OC().NetworkInstance(ni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Rib() + bgpRib := gnmi.OC().NetworkInstance(ni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Rib() if isV4 { route := gnmi.Get(t, dut, bgpRib.AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Ipv4Unicast().Neighbor(nbrAddr).AdjRibInPost().Route(prefix, 0).State()) @@ -1150,7 +1150,7 @@ func verifyBGPUpdatesSentNonZero(t *testing.T, dut *ondatra.DUTDevice, ni, nbrAd t.Helper() var lastUpdates uint64 _, ok := gnmi.Watch(t, dut, - gnmi.OC().NetworkInstance(ni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Neighbor(nbrAddr).Messages().Sent().UPDATE().State(), + gnmi.OC().NetworkInstance(ni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(nbrAddr).Messages().Sent().UPDATE().State(), time.Minute, func(val *ygnmi.Value[uint64]) bool { updates, present := val.Val() if !present { @@ -1167,7 +1167,7 @@ func verifyBGPUpdatesSentNonZero(t *testing.T, dut *ondatra.DUTDevice, ni, nbrAd // verifyRouteReflectorClientState checks peer-group route-reflector-client state. func verifyRouteReflectorClientState(t *testing.T, dut *ondatra.DUTDevice, ni, pgName string, wantClient bool) { t.Helper() - rrClient := gnmi.Get(t, dut, gnmi.OC().NetworkInstance(ni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().PeerGroup(pgName).RouteReflector().RouteReflectorClient().State()) + rrClient := gnmi.Get(t, dut, gnmi.OC().NetworkInstance(ni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().PeerGroup(pgName).RouteReflector().RouteReflectorClient().State()) if rrClient != wantClient { t.Errorf("peer-group %s in NI %s: route-reflector-client want %v, got %v", pgName, ni, wantClient, rrClient) @@ -1177,7 +1177,7 @@ func verifyRouteReflectorClientState(t *testing.T, dut *ondatra.DUTDevice, ni, p func enableAIGPOnPeer(t *testing.T, dut *ondatra.DUTDevice, ni string, defaultAsn uint32, nbrIp string, v4 bool, enable bool) { d := &oc.Root{} niObj := d.GetOrCreateNetworkInstance(ni) - proto := niObj.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + proto := niObj.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) bgp := proto.GetOrCreateBgp() n := bgp.GetOrCreateNeighbor(nbrIp) diff --git a/feature/bgp/otg_tests/base_bgp_session_parameters/base_bgp_session_parameters_test.go b/feature/bgp/otg_tests/base_bgp_session_parameters/base_bgp_session_parameters_test.go index 3b4ccb917af..60e93300aa0 100644 --- a/feature/bgp/otg_tests/base_bgp_session_parameters/base_bgp_session_parameters_test.go +++ b/feature/bgp/otg_tests/base_bgp_session_parameters/base_bgp_session_parameters_test.go @@ -116,7 +116,7 @@ type bgpTestParams struct { // 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()) + gnmi.BatchDelete(resetBatch, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config()) if deviations.NetworkInstanceTableDeletionRequired(dut) { tablePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).TableAny() @@ -129,7 +129,7 @@ func bgpClearConfig(t *testing.T, dut *ondatra.DUTDevice) { } } resetBatch.Set(t, dut) - nbrPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Neighbor(ateAttrs.IPv4) + nbrPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(ateAttrs.IPv4) gnmi.Watch(t, dut, nbrPath.SessionState().State(), 30*time.Second, func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool { state, present := val.Val() return !present || state == oc.Bgp_Neighbor_SessionState_IDLE @@ -140,7 +140,7 @@ func bgpClearConfig(t *testing.T, dut *ondatra.DUTDevice) { func bgpCreateNbr(bgpParams *bgpTestParams, dut *ondatra.DUTDevice) *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() global := bgp.GetOrCreateGlobal() global.As = ygot.Uint32(bgpParams.localAS) @@ -178,7 +178,7 @@ func bgpCreateNbr(bgpParams *bgpTestParams, dut *ondatra.DUTDevice) *oc.NetworkI // Verify BGP capabilities like route refresh as32 and mpbgp. func verifyBGPCapabilities(t *testing.T, dut *ondatra.DUTDevice) { t.Log("Verifying BGP capabilities") - 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(ateAttrs.IPv4) capabilities := map[oc.E_BgpTypes_BGP_CAPABILITY]bool{ @@ -202,7 +202,7 @@ func verifyBgpTelemetry(t *testing.T, dut *ondatra.DUTDevice) { ifName := dut.Port(t, "port1").Name() lastFlapTime := gnmi.Get(t, dut, gnmi.OC().Interface(ifName).LastChange().State()) t.Log("Verifying BGP state") - 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(ateAttrs.IPv4) // Get BGP adjacency state @@ -345,8 +345,8 @@ func TestEstablishAndDisconnect(t *testing.T) { fptest.ConfigureDefaultNetworkInstance(t, dut) t.Log("Configure BGP") - dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") - statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) + statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() nbrPath := statePath.Neighbor(ateAttrs.IPv4) bgpClearConfig(t, dut) @@ -439,8 +439,8 @@ func TestPassword(t *testing.T) { gnmi.Replace(t, dut, dutConfNIPath.Type().Config(), oc.NetworkInstanceTypes_NETWORK_INSTANCE_TYPE_DEFAULT_INSTANCE) t.Log("Configure BGP") - dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") - statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) + statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() nbrPath := statePath.Neighbor(ateAttrs.IPv4) bgpClearConfig(t, dut) @@ -529,8 +529,8 @@ func TestParameters(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") - statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) + statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() nbrPath := statePath.Neighbor(ateIP) cases := []struct { diff --git a/feature/bgp/otg_tests/bgp_2byte_4byte_asn/bgp_2byte_4byte_asn_test.go b/feature/bgp/otg_tests/bgp_2byte_4byte_asn/bgp_2byte_4byte_asn_test.go index 016e1bdc594..d3acd3f236d 100644 --- a/feature/bgp/otg_tests/bgp_2byte_4byte_asn/bgp_2byte_4byte_asn_test.go +++ b/feature/bgp/otg_tests/bgp_2byte_4byte_asn/bgp_2byte_4byte_asn_test.go @@ -137,8 +137,8 @@ func TestBgpSession(t *testing.T) { t.Log("Configure BGP on DUT") fptest.ConfigureDefaultNetworkInstance(t, dut) - dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") - statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) + statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() gnmi.Replace(t, dut, dutConfPath.Config(), tc.dutConf) fptest.LogQuery(t, "DUT BGP Config ", dutConfPath.Config(), gnmi.Get(t, dut, dutConfPath.Config())) @@ -163,7 +163,7 @@ func TestBgpSession(t *testing.T) { func bgpClearConfig(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() resetBatch := &gnmi.SetBatch{} - gnmi.BatchDelete(resetBatch, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Config()) + gnmi.BatchDelete(resetBatch, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config()) if deviations.NetworkInstanceTableDeletionRequired(dut) { tablePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).TableAny() @@ -180,7 +180,7 @@ func bgpClearConfig(t *testing.T, dut *ondatra.DUTDevice) { func verifyPeer(t *testing.T, nbr *bgpNbr, dut *ondatra.DUTDevice) { t.Helper() - 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(nbr.peerIP) glblPath := statePath.Global() @@ -250,7 +250,7 @@ func configureATE(t *testing.T, ateParams *bgpNbr, connectionType string, asWidt func createBgpNeighbor(nbr *bgpNbr, dut *ondatra.DUTDevice) *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() global := bgp.GetOrCreateGlobal() diff --git a/feature/bgp/otg_tests/bgp_2byte_4byte_asn_policy_test/bgp_2byte_4byte_asn_policy_test.go b/feature/bgp/otg_tests/bgp_2byte_4byte_asn_policy_test/bgp_2byte_4byte_asn_policy_test.go index 0408d76a6cc..ec072bafa72 100644 --- a/feature/bgp/otg_tests/bgp_2byte_4byte_asn_policy_test/bgp_2byte_4byte_asn_policy_test.go +++ b/feature/bgp/otg_tests/bgp_2byte_4byte_asn_policy_test/bgp_2byte_4byte_asn_policy_test.go @@ -105,8 +105,8 @@ func TestBgpSession(t *testing.T) { fptest.AssignToNetworkInstance(t, dut, dut.Port(t, "port1").Name(), deviations.DefaultNetworkInstance(dut), 0) } - dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") - statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) + statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() defaultCount := uint32(0) @@ -383,7 +383,7 @@ func awaitBGPPolicy(t *testing.T, dut *ondatra.DUTDevice, nbr *bgpNbr, policyNam afiSafiType = oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST } // importPolicyPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Neighbor(nbr.peerIP).AfiSafi(afiSafiType).ApplyPolicy().ImportPolicy().State() - importPolicyPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().PeerGroup("ATE").AfiSafi(afiSafiType).ApplyPolicy().ImportPolicy().State() + importPolicyPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().PeerGroup("ATE").AfiSafi(afiSafiType).ApplyPolicy().ImportPolicy().State() _, ok := gnmi.Watch(t, dut, importPolicyPath, timeout, func(val *ygnmi.Value[[]string]) bool { policies, present := val.Val() return present && len(policies) > 0 && policies[0] == policyName @@ -409,7 +409,7 @@ func verifyPrefixesTelemetry(t *testing.T, dut *ondatra.DUTDevice, wantInstalled // received IPv4 prefixes func verifyPrefixesTelemetryV4(t *testing.T, dut *ondatra.DUTDevice, wantInstalled uint32) { t.Helper() - 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() prefixesv4 := statePath.Neighbor(ateSrc.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Prefixes() gotInstalled, ok := gnmi.Watch(t, dut, prefixesv4.Installed().State(), 120*time.Second, func(val *ygnmi.Value[uint32]) bool { @@ -425,7 +425,7 @@ func verifyPrefixesTelemetryV4(t *testing.T, dut *ondatra.DUTDevice, wantInstall // verifyPrefixesTelemetryV6 confirms that the dut shows the correct numbers of installed, sent and // received IPv6 prefixes func verifyPrefixesTelemetryV6(t *testing.T, dut *ondatra.DUTDevice, wantInstalledv6 uint32) { - 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() prefixesv6 := statePath.Neighbor(ateSrc.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Prefixes() gotInstalledv6, ok := gnmi.Watch(t, dut, prefixesv6.Installed().State(), 120*time.Second, func(val *ygnmi.Value[uint32]) bool { @@ -441,7 +441,7 @@ func verifyPrefixesTelemetryV6(t *testing.T, dut *ondatra.DUTDevice, wantInstall // 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()) + gnmi.BatchDelete(resetBatch, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config()) if deviations.NetworkInstanceTableDeletionRequired(dut) { tablePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).TableAny() @@ -457,7 +457,7 @@ func bgpClearConfig(t *testing.T, dut *ondatra.DUTDevice) { } func verifyPeer(t *testing.T, nbr *bgpNbr, dut *ondatra.DUTDevice) { - 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(nbr.peerIP) glblPath := statePath.Global() @@ -581,7 +581,7 @@ func configureATE(t *testing.T, ateParams *bgpNbr, connectionType string, asWidt func applyBgpPolicy(policyName string, dut *ondatra.DUTDevice, isV4 bool) *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() pg := bgp.GetOrCreatePeerGroup("ATE") @@ -614,14 +614,14 @@ func deleteBgpPolicy(t *testing.T, dut *ondatra.DUTDevice, isV4 bool) { aftType = oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST } - policyConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().PeerGroup("ATE").AfiSafi(aftType).ApplyPolicy().Config() + policyConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().PeerGroup("ATE").AfiSafi(aftType).ApplyPolicy().Config() gnmi.Delete(t, dut, policyConfPath) } func createBgpNeighbor(nbr *bgpNbr, dut *ondatra.DUTDevice) *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() global := bgp.GetOrCreateGlobal() diff --git a/feature/bgp/otg_tests/bgp_afi_safi_defaults/bgp_afi_safi_defaults_test.go b/feature/bgp/otg_tests/bgp_afi_safi_defaults/bgp_afi_safi_defaults_test.go index 124cb330101..ad30fce4fe4 100644 --- a/feature/bgp/otg_tests/bgp_afi_safi_defaults/bgp_afi_safi_defaults_test.go +++ b/feature/bgp/otg_tests/bgp_afi_safi_defaults/bgp_afi_safi_defaults_test.go @@ -136,7 +136,7 @@ func bgpCreateNbr(t *testing.T, localAs, peerAs uint32, dut *ondatra.DUTDevice, t.Helper() dutOcRoot := &oc.Root{} ni1 := dutOcRoot.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() global.RouterId = ygot.String(dutPort2.IPv4) @@ -230,7 +230,7 @@ func verifyOtgBgpTelemetry(t *testing.T, otg *otg.OTG, c gosnappi.Config, otgPee func verifyBgpTelemetry(t *testing.T, dut *ondatra.DUTDevice, nbrsList []*bgpNeighbor) { t.Helper() t.Logf("Verifying BGP state.") - 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() for _, nbr := range nbrsList { nbrPath := bgpPath.Neighbor(nbr.neighborip) @@ -264,7 +264,7 @@ func verifyBgpTelemetry(t *testing.T, dut *ondatra.DUTDevice, nbrsList []*bgpNei func verifyBgpSession(t *testing.T, dut *ondatra.DUTDevice, nbrsList []*bgpNeighbor) { t.Helper() t.Logf("Verifying BGP state.") - 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() for _, nbr := range nbrsList { nbrPath := bgpPath.Neighbor(nbr.neighborip) state := gnmi.Get(t, dut, nbrPath.SessionState().State()) @@ -344,7 +344,7 @@ func verifyBgpCapabilities(t *testing.T, dut *ondatra.DUTDevice, afiSafiLevel st t.Helper() t.Log("Verifying BGP AFI-SAFI capabilities.") - 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() var nbrPath *netinstbgp.NetworkInstance_Protocol_Bgp_Neighbor_AfiSafiPathAny for _, nbr := range nbrs { @@ -411,7 +411,7 @@ func verifyBgpCapabilities(t *testing.T, dut *ondatra.DUTDevice, afiSafiLevel st // 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()) + gnmi.BatchDelete(resetBatch, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config()) if deviations.NetworkInstanceTableDeletionRequired(dut) { tablePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).TableAny() @@ -446,7 +446,7 @@ func TestAfiSafiOcDefaults(t *testing.T) { fptest.ConfigureDefaultNetworkInstance(t, 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)) cases := []struct { desc string @@ -540,7 +540,7 @@ func TestAfiSafiSetToFalse(t *testing.T) { 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") + dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) cases := []struct { desc string diff --git a/feature/bgp/otg_tests/bgp_always_compare_med/bgp_always_compare_med_test.go b/feature/bgp/otg_tests/bgp_always_compare_med/bgp_always_compare_med_test.go index 0a4b88f55e3..73bfebc3734 100644 --- a/feature/bgp/otg_tests/bgp_always_compare_med/bgp_always_compare_med_test.go +++ b/feature/bgp/otg_tests/bgp_always_compare_med/bgp_always_compare_med_test.go @@ -156,7 +156,7 @@ func bgpCreateNbr(localAs, peerAs uint32, dut *ondatra.DUTDevice) *oc.NetworkIns dutOcRoot := &oc.Root{} ni1 := dutOcRoot.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() global.RouterId = ygot.String(dutDst2.IPv4) @@ -249,7 +249,7 @@ func verifyBgpTelemetry(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() var nbrIP = []string{ateSrc.IPv4, ateDst1.IPv4, ateDst2.IPv4} t.Logf("Verifying BGP state.") - 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() for _, nbr := range nbrIP { nbrPath := bgpPath.Neighbor(nbr) @@ -396,11 +396,11 @@ func sendTraffic(t *testing.T, otg *otg.OTG, c gosnappi.Config) { func setMED(t *testing.T, dut *ondatra.DUTDevice, d *oc.Root) { t.Helper() dutPolicyConfPath2 := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)). - Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp(). + Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp(). PeerGroup(peerGrpName2) dutPolicyConfPath3 := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)). - Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp(). + Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp(). PeerGroup(peerGrpName3) // Apply setMed import policy on eBGP Peer1 - ATE Port2 - with MED 100. @@ -492,7 +492,7 @@ func verifyBGPCapabilities(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() t.Log("Verifying BGP capabilities.") var nbrIP = []string{ateSrc.IPv4, ateDst1.IPv4, ateDst2.IPv4} - 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() for _, nbr := range nbrIP { nbrPath := statePath.Neighbor(nbr) capabilities := map[oc.E_BgpTypes_BGP_CAPABILITY]bool{ @@ -514,7 +514,7 @@ func verifyBGPCapabilities(t *testing.T, dut *ondatra.DUTDevice) { // sent and received IPv4 prefixes. func verifyPrefixesTelemetry(t *testing.T, dut *ondatra.DUTDevice, wantInstalled, wantSent uint32) { t.Helper() - 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() prefixesv4 := statePath.Neighbor(ateSrc.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Prefixes() if gotInstalled, ok := gnmi.Watch(t, dut, prefixesv4.Installed().State(), time.Minute, func(v *ygnmi.Value[uint32]) bool { got, ok := v.Val() @@ -557,7 +557,7 @@ func TestAlwaysCompareMED(t *testing.T) { fptest.ConfigureDefaultNetworkInstance(t, 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)) t.Run("Configure BGP Neighbors", func(t *testing.T) { t.Logf("Start DUT BGP Config.") gnmi.Delete(t, dut, dutConfPath.Config()) @@ -611,7 +611,7 @@ func TestAlwaysCompareMED(t *testing.T) { t.Run("Remove MED settings on DUT", func(t *testing.T) { t.Log("Disable MED settings on DUT.") - dutPolicyConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + dutPolicyConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() // Apply the allow-all policy to remove MED modifications if deviations.RoutePolicyUnderAFIUnsupported(dut) { @@ -629,7 +629,7 @@ func TestAlwaysCompareMED(t *testing.T) { t.Log("Resetting BGP sessions to force complete route refresh...") // Get the BGP instance path for neighbor configuration - 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() // First, disable all neighbors neighborsRestored := false diff --git a/feature/bgp/otg_tests/bgp_long_lived_graceful_restart/bgp_long_lived_graceful_restart_test.go b/feature/bgp/otg_tests/bgp_long_lived_graceful_restart/bgp_long_lived_graceful_restart_test.go index d483aba2f6e..84865a6cdfa 100644 --- a/feature/bgp/otg_tests/bgp_long_lived_graceful_restart/bgp_long_lived_graceful_restart_test.go +++ b/feature/bgp/otg_tests/bgp_long_lived_graceful_restart/bgp_long_lived_graceful_restart_test.go @@ -319,7 +319,7 @@ func buildNbrList(asN uint32) []*bgpNeighbor { func bgpWithNbr(as uint32, nbrs []*bgpNeighbor, dut *ondatra.DUTDevice) *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() @@ -385,7 +385,7 @@ func bgpWithNbr(as uint32, nbrs []*bgpNeighbor, dut *ondatra.DUTDevice) *oc.Netw func checkBgpStatus(t *testing.T, dut *ondatra.DUTDevice, nbrIP []*bgpNeighbor) { t.Helper() - 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() for _, nbr := range nbrIP { nbrPath := statePath.Neighbor(nbr.neighborip) t.Logf("Waiting for BGP neighbor to establish...") @@ -622,7 +622,7 @@ func stopATENewPeers(t *testing.T, ate *ondatra.ATEDevice, peerNames []string) { func removeNewPeers(t *testing.T, dut *ondatra.DUTDevice, nbrs []*bgpNeighbor) { t.Helper() - dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() for _, nbr := range nbrs { deleteWithRetry(t, dut, dutConfPath.Neighbor(nbr.neighborip).Config()) } @@ -646,7 +646,7 @@ func setBgpPolicy(t *testing.T, dut *ondatra.DUTDevice, d *oc.Root) { actions5.GetOrCreateBgpActions().SetLocalPref = ygot.Uint32(100) updateWithRetry(t, dut, gnmi.OC().RoutingPolicy().Config(), rp) - dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() if deviations.RoutePolicyUnderAFIUnsupported(dut) { updateWithRetry(t, dut, dutConfPath.PeerGroup(peerv4GrpName).ApplyPolicy().ExportPolicy().Config(), []string{"ALLOW", setMEDPolicy}) @@ -665,9 +665,9 @@ func setBgpPolicy(t *testing.T, dut *ondatra.DUTDevice, d *oc.Root) { func configureDUTNewPeers(t *testing.T, dut *ondatra.DUTDevice, nbrs []*bgpNeighbor) { t.Helper() d := &oc.Root{} - 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)) 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() // Note: we have to define the peer group even if we aren't setting any policy because it's @@ -763,7 +763,7 @@ func buildCliConfigRequest(config string) *gpb.SetRequest { // verifyGracefulRestart validates graceful restart telemetry on DUT. func verifyGracefulRestart(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() - 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(ateDst.IPv4) isGrEnabled := gnmi.Get(t, dut, statePath.Global().GracefulRestart().Enabled().State()) @@ -887,7 +887,7 @@ func gnmiOperationWithRetry(t *testing.T, opName string, retryCount int, op func func cleanupDUT(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() t.Log("Cleaning up DUT configuration...") - 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)) gnmi.Delete(t, dut, dutConfPath.Config()) if gnmi.Lookup(t, dut, gnmi.OC().RoutingPolicy().PolicyDefinition("ALLOW").Config()).IsPresent() { gnmi.Delete(t, dut, gnmi.OC().RoutingPolicy().PolicyDefinition("ALLOW").Config()) @@ -920,7 +920,7 @@ func TestTrafficWithGracefulRestartLLGR(t *testing.T) { }) nbrList := buildNbrList(ateAS) - 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) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) @@ -995,7 +995,7 @@ func TestTrafficWithGracefulRestartLLGR(t *testing.T) { otgutils.VerifyNoPacketLoss(t, ate.OTG(), allFlows) }) - 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(ateDst.IPv4) t.Run("VerifyBGPNOTEstablished", func(t *testing.T) { t.Log("Waiting for BGP neighbor to be not in Established state after applying ACL DENY policy..") @@ -1137,7 +1137,7 @@ func TestTrafficWithGracefulRestart(t *testing.T) { nbrList := buildNbrList(ateAS) t.Run("configureBGP", func(t *testing.T) { - 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)) dutConf := bgpWithNbr(dutAS, nbrList, dut) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) }) @@ -1210,7 +1210,7 @@ func TestTrafficWithGracefulRestart(t *testing.T) { otgutils.VerifyNoPacketLoss(t, ate.OTG(), allFlows) }) - 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(ateDst.IPv4) t.Run("VerifyBGPNOTEstablished", func(t *testing.T) { t.Log("Waiting for BGP neighbor to be not in Established state after applying ACL DENY policy..") 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 c9b1662577e..792a28a7c25 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 @@ -118,7 +118,7 @@ func bgpCreateNbr(t *testing.T, dut *ondatra.DUTDevice) *oc.NetworkInstance_Prot t.Helper() dutOcRoot := &oc.Root{} ni1 := dutOcRoot.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() global.RouterId = ygot.String(dutPort2.IPv4) @@ -223,7 +223,7 @@ func advBGPRouteFromOTG(t *testing.T, args *otgTestArgs, asSeg []uint32) { // verifyPrefixesTelemetry validates the installed and sent prefix counts on the DUT. 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() + statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() prefixesv4 := statePath.Neighbor(nbr).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Prefixes() gnmi.Watch(t, dut, prefixesv4.Installed().State(), 45*time.Second, func(val *ygnmi.Value[uint32]) bool { @@ -295,7 +295,7 @@ func testSplitHorizonNoAllowOwnIn(t *testing.T, args *otgTestArgs) { // RT-1.54.2: Test allow-own-as 1. Verifies that the DUT accepts a route with 1 occurrence of its AS. 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") + dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(args.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(args.dut)) gnmi.Replace(t, args.dut, dutConfPath.Bgp().PeerGroup(peerGrpName1).AsPathOptions().AllowOwnAs().Config(), uint8(1)) advBGPRouteFromOTG(t, args, []uint32{65500, dutLocalAS1, 65499}) @@ -306,7 +306,7 @@ func testSplitHorizonAllowOwnAs1(t *testing.T, args *otgTestArgs) { // RT-1.54.3: Test allow-own-as 3. Verifies that the DUT accepts up to 3 occurrences but rejects 4. 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") + dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(args.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(args.dut)) gnmi.Replace(t, args.dut, dutConfPath.Bgp().PeerGroup(peerGrpName1).AsPathOptions().AllowOwnAs().Config(), uint8(3)) t.Run("Re-advertise with 3 Occurrences", func(t *testing.T) { @@ -324,7 +324,7 @@ func testSplitHorizonAllowOwnAs3(t *testing.T, args *otgTestArgs) { // RT-1.54.4: Test allow-own-as 4. Verifies that the DUT accepts 4 occurrences. 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") + dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(args.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(args.dut)) gnmi.Replace(t, args.dut, dutConfPath.Bgp().PeerGroup(peerGrpName1).AsPathOptions().AllowOwnAs().Config(), uint8(4)) advBGPRouteFromOTG(t, args, []uint32{dutLocalAS1, dutLocalAS1, dutLocalAS1, dutLocalAS1, 65499}) @@ -335,7 +335,7 @@ func testSplitHorizonAllowOwnAs4(t *testing.T, args *otgTestArgs) { // RT-1.54.5: Test "DUT's AS as Originating AS". Verifies loops where the local AS is the source. func testSplitHorizonOriginatingAS(t *testing.T, args *otgTestArgs) { t.Log("Test RT-1.54.5: DUT's AS as Originating AS") - dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(args.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(args.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(args.dut)) gnmi.Replace(t, args.dut, dutConfPath.Bgp().PeerGroup(peerGrpName1).AsPathOptions().AllowOwnAs().Config(), uint8(1)) advBGPRouteFromOTG(t, args, []uint32{65502, 65500, dutLocalAS1}) @@ -363,7 +363,7 @@ func TestBGPOverrideASPathSplitHorizon(t *testing.T) { fptest.ConfigureDefaultNetworkInstance(t, dut) configureRoutePolicy(t, dut, policyName, oc.RoutingPolicy_PolicyResultType_ACCEPT_ROUTE) cfgplugins.BGPClearConfig(t, 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)) gnmi.Replace(t, dut, dutConfPath.Config(), bgpCreateNbr(t, dut)) }) diff --git a/feature/bgp/otg_tests/bgp_remove_private_as/bgp_remove_private_as_test.go b/feature/bgp/otg_tests/bgp_remove_private_as/bgp_remove_private_as_test.go index f4b98f0ec2a..a3a645e8c9a 100644 --- a/feature/bgp/otg_tests/bgp_remove_private_as/bgp_remove_private_as_test.go +++ b/feature/bgp/otg_tests/bgp_remove_private_as/bgp_remove_private_as_test.go @@ -158,7 +158,7 @@ func bgpCreateNbr(localAs, peerAs uint32, dut *ondatra.DUTDevice) *oc.NetworkIns 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() global.RouterId = ygot.String(dutDst.IPv4) @@ -227,7 +227,7 @@ func verifyBGPTelemetry(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() var nbrIP = []string{ateSrc.IPv4, ateDst.IPv4} t.Logf("Verifying BGP state.") - 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() for _, nbr := range nbrIP { var status *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState] nbrPath := statePath.Neighbor(nbr) @@ -251,7 +251,7 @@ func verifyBGPTelemetry(t *testing.T, dut *ondatra.DUTDevice) { // 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() + statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() prefixesv4 := statePath.Neighbor(nbr).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Prefixes() _, ok := gnmi.Watch(t, dut, prefixesv4.Installed().State(), 2*time.Minute, func(val *ygnmi.Value[uint32]) bool { gotInstalled, ok := val.Val() @@ -445,7 +445,7 @@ func TestRemovePrivateAS(t *testing.T) { fptest.ConfigureDefaultNetworkInstance(t, 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)) t.Run("Configure BGP Neighbors", func(t *testing.T) { gnmi.Delete(t, dut, dutConfPath.Config()) configureRoutePolicy(t, dut, policyName, oc.RoutingPolicy_PolicyResultType_ACCEPT_ROUTE) diff --git a/feature/bgp/otg_tests/bgp_scale_test/bgp_scale_test.go b/feature/bgp/otg_tests/bgp_scale_test/bgp_scale_test.go index 58bbd574c3c..93318614f79 100644 --- a/feature/bgp/otg_tests/bgp_scale_test/bgp_scale_test.go +++ b/feature/bgp/otg_tests/bgp_scale_test/bgp_scale_test.go @@ -762,7 +762,7 @@ func measureConvergence(t *testing.T, dut *ondatra.DUTDevice, afi []string, v4Ro testConvergence[i] = func(t testing.TB) { time.Sleep(10 * time.Second) statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)). - Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() var prefixes *netinstbgp.NetworkInstance_Protocol_Bgp_Neighbor_AfiSafi_PrefixesPath var peer string var routeCount, routeCountWithdraw, prevSent uint32 @@ -1035,7 +1035,7 @@ func dutSetup(t *testing.T, dut *ondatra.DUTDevice, top gosnappi.Config, ate *on IPv6PrefixLen: 126, }) } - 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("configure DUT", func(t *testing.T) { configureDUTLoopback(t, dut) @@ -1054,7 +1054,7 @@ func dutSetup(t *testing.T, dut *ondatra.DUTDevice, top gosnappi.Config, ate *on weightNHConfig += distanceConfigv6 helpers.GnmiCLIConfig(t, dut, weightNHConfig) - cfgplugins.DeviationCiscoRoutingPolicyBGPToISIS(t, dut, dutAS, "BGP", "TAG_7", "SNH", 7) + cfgplugins.DeviationCiscoRoutingPolicyBGPToISIS(t, dut, dutAS, deviations.NwInstBgpProtoName(dut), "TAG_7", "SNH", 7) } if dut.Vendor() == ondatra.JUNIPER { @@ -1111,7 +1111,7 @@ func validateLinkBWNotAdvertised(t *testing.T, dut *ondatra.DUTDevice, ate *onda // verifyBgpTelemetry verifies BGP telemetry. func verifyBgpTelemetry(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATEDevice, top gosnappi.Config, nbrList []*bgpNeighbor) { 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() counter := 0 counter2 := 0 @@ -1149,7 +1149,7 @@ func verifyBGPCapabilities(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.AT nbrIP := []string{"192.0.2.2", "102.1.2.2", "153.1.2.2", "203.0.113.1", "2001:db8::192:0:2:2", "1002::102:1:2:2", "1003::153:1:2:2", "2001:db8::203:0:113:1"} - 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() testBGPCapabilities := make([]func(testing.TB), len(nbrIP)) @@ -1239,7 +1239,7 @@ func verifyMSS(t *testing.T, dut *ondatra.DUTDevice, nbrList []*bgpNeighbor, dut ipv4 = atePort1.IPv4 ipv6 = atePort1.IPv6 } - 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)) if !deviations.SkipTCPNegotiatedMSSCheck(dut) { t.Run("Verify that the default TCP MSS value is set below the default interface MTU value.", func(t *testing.T) { // Fetch interface MTU value to compare negotiated tcp mss. @@ -1678,7 +1678,7 @@ func configureDUTBGP(t *testing.T, as uint32, nbrs []*bgpNeighbor, dut *ondatra. afi := "" 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 Configuration using cfgplugins diff --git a/feature/bgp/otg_tests/bgp_tcp_mss_path_mtu/bgp_tcp_mss_path_mtu_test.go b/feature/bgp/otg_tests/bgp_tcp_mss_path_mtu/bgp_tcp_mss_path_mtu_test.go index efac523eb98..c476a147331 100644 --- a/feature/bgp/otg_tests/bgp_tcp_mss_path_mtu/bgp_tcp_mss_path_mtu_test.go +++ b/feature/bgp/otg_tests/bgp_tcp_mss_path_mtu/bgp_tcp_mss_path_mtu_test.go @@ -131,7 +131,7 @@ func configureDUT(t *testing.T) { func bgpCreateNbr(t *testing.T, dut *ondatra.DUTDevice, authPwd, routerID string, localAs uint32, nbrs []*bgpNeighbor) *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() global := bgp.GetOrCreateGlobal() global.RouterId = ygot.String(routerID) @@ -167,7 +167,7 @@ func bgpCreateNbr(t *testing.T, dut *ondatra.DUTDevice, authPwd, routerID string // verifyBGPTelemetry checks that the dut has an established BGP session with reasonable settings. func verifyBGPTelemetry(t *testing.T, dut *ondatra.DUTDevice, nbrIP []string) { t.Helper() - 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() for _, nbr := range nbrIP { nbrPath := statePath.Neighbor(nbr) t.Logf("Waiting for BGP neighbor %s to establish", nbr) @@ -250,7 +250,7 @@ func verifyOTGBGPEstablished(t *testing.T, otg *otg.OTG, dut *ondatra.DUTDevice, } else { t.Logf("OTG BGP peer %s session state is absent", peerName) } - dutPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Neighbor(neighbor).SessionState().State() + dutPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(neighbor).SessionState().State() if state, present := gnmi.Lookup(t, dut, dutPath).Val(); present { t.Logf("DUT BGP neighbor %s final session state: %s", neighbor, state) } else { @@ -467,8 +467,8 @@ func TestTcpMssPathMtu(t *testing.T) { fptest.ConfigureDefaultNetworkInstance(t, dut2) }) - dut1ConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut1)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") - dut2ConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut2)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + dut1ConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut1)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut1)) + dut2ConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut2)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut2)) t.Run("Configure BGP Neighbors DUT1", func(t *testing.T) { t.Logf("Start DUT1 BGP Config.") diff --git a/feature/bgp/policybase/otg_tests/actions_med_localpref_prepend_flow_control/actions_MED_LocPref_prepend_flow_control_test.go b/feature/bgp/policybase/otg_tests/actions_med_localpref_prepend_flow_control/actions_MED_LocPref_prepend_flow_control_test.go index 77157c47a93..966110906de 100644 --- a/feature/bgp/policybase/otg_tests/actions_med_localpref_prepend_flow_control/actions_MED_LocPref_prepend_flow_control_test.go +++ b/feature/bgp/policybase/otg_tests/actions_med_localpref_prepend_flow_control/actions_MED_LocPref_prepend_flow_control_test.go @@ -149,7 +149,7 @@ func createNewBgpSession(dut *ondatra.DUTDevice) *oc.NetworkInstance_Protocol { nbs := []*bgpNghbrs{nb1, nb2} dutOcRoot := &oc.Root{} ni1 := dutOcRoot.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() for _, nb := range nbs { @@ -193,7 +193,7 @@ func createNewBgpSession(dut *ondatra.DUTDevice) *oc.NetworkInstance_Protocol { func VerifyBgpState(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() var nbrIP = []string{atePort1.IPv4, atePort1.IPv6, atePort2.IPv4, atePort2.IPv6} - 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() watch := gnmi.Watch(t, dut, bgpPath.State(), 2*time.Minute, func(val *ygnmi.Value[*oc.NetworkInstance_Protocol_Bgp]) bool { path, _ := val.Val() for _, nbr := range nbrIP { @@ -274,7 +274,7 @@ func configureASLocalPrefMEDPolicy(t *testing.T, dut *ondatra.DUTDevice, policyT // configureBGPDefaultImportExportPolicy configures default import/export policies func configureBGPDefaultImportExportPolicy(t *testing.T, dut *ondatra.DUTDevice, ipv4, ipv6 string, polType oc.E_RoutingPolicy_DefaultPolicyType) { 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() batchConfig := &gnmi.SetBatch{} nbrPolPathv4 := bgpPath.Neighbor(ipv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() nbrPolPathv6 := bgpPath.Neighbor(ipv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() @@ -288,7 +288,7 @@ func configureBGPDefaultImportExportPolicy(t *testing.T, dut *ondatra.DUTDevice, // configureBGPImportExportPolicy configures import/export policies func configureBGPImportExportPolicy(t *testing.T, dut *ondatra.DUTDevice, ipv4, ipv6, policyDef 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() batchConfig := &gnmi.SetBatch{} nbrPolPathv4 := bgpPath.Neighbor(ipv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() nbrPolPathv6 := bgpPath.Neighbor(ipv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() @@ -305,7 +305,7 @@ func configureBGPImportExportPolicy(t *testing.T, dut *ondatra.DUTDevice, ipv4, // deleteBGPImportExportPolicy configures import/export policies func deleteBGPImportExportPolicy(t *testing.T, dut *ondatra.DUTDevice, ipv4, ipv6 string, ipv4_2 string, ipv6_2 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() batchConfig := &gnmi.SetBatch{} nbrPolPathv4 := bgpPath.Neighbor(ipv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() nbrPolPathv6 := bgpPath.Neighbor(ipv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() @@ -329,7 +329,7 @@ func verifyBgpPolicyTelemetry(t *testing.T, dut *ondatra.DUTDevice, ipAddr strin t.Logf("BGP Policy telemetry verification for the neighbor %v", ipAddr) - 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() var afiSafiPath *netinstbgp.NetworkInstance_Protocol_Bgp_Neighbor_AfiSafiPath if isV4 { afiSafiPath = statePath.Neighbor(ipAddr).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST) @@ -591,7 +591,7 @@ func TestBGPPolicy(t *testing.T) { fptest.ConfigureDefaultNetworkInstance(t, 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)) t.Run("Configure BGP v4 and v6 Neighbors", func(t *testing.T) { gnmi.Delete(t, dut, dutConfPath.Config()) diff --git a/feature/bgp/policybase/otg_tests/aspath_and_community_test/aspath_and_community_test.go b/feature/bgp/policybase/otg_tests/aspath_and_community_test/aspath_and_community_test.go index a5975c7dad0..31fb7de3d9c 100644 --- a/feature/bgp/policybase/otg_tests/aspath_and_community_test/aspath_and_community_test.go +++ b/feature/bgp/policybase/otg_tests/aspath_and_community_test/aspath_and_community_test.go @@ -36,7 +36,6 @@ const ( prefixV6Len = 126 trafficPps = 100 totalPackets = 1200 - bgpName = "BGP" ImpPolicy = "routing-policy-ASPATH-COMMUNITY" RPLPermitAll = "PERMIT-ALL" ) @@ -134,16 +133,16 @@ func configureImportBGPPolicy(t *testing.T, dut *ondatra.DUTDevice, ipv4 string, } dni := deviations.DefaultNetworkInstance(dut) - pathV6 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(ipv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() - policyV6 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(ipv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() + pathV6 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(ipv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() + policyV6 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(ipv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() if !deviations.DefaultRoutePolicyUnsupported(dut) { policyV6.SetDefaultImportPolicy(oc.RoutingPolicy_DefaultPolicyType_REJECT_ROUTE) } policyV6.SetImportPolicy([]string{ImpPolicy}) gnmi.Replace(t, dut, pathV6.Config(), policyV6) - pathV4 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(ipv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() - policyV4 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(ipv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() + pathV4 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(ipv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() + policyV4 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(ipv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() if !deviations.DefaultRoutePolicyUnsupported(dut) { policyV4.SetDefaultImportPolicy(oc.RoutingPolicy_DefaultPolicyType_REJECT_ROUTE) } diff --git a/feature/bgp/policybase/otg_tests/aspath_test/aspath_test.go b/feature/bgp/policybase/otg_tests/aspath_test/aspath_test.go index bb5b6194d03..2dc887fd229 100644 --- a/feature/bgp/policybase/otg_tests/aspath_test/aspath_test.go +++ b/feature/bgp/policybase/otg_tests/aspath_test/aspath_test.go @@ -36,7 +36,6 @@ const ( prefixV6Len = 126 trafficPps = 100 totalPackets = 1200 - bgpName = "BGP" RPLPermitAll = "PERMIT-ALL" ) @@ -89,16 +88,16 @@ func configureImportBGPPolicy(t *testing.T, dut *ondatra.DUTDevice, ipv4 string, gnmi.Replace(t, dut, gnmi.OC().RoutingPolicy().Config(), rp) dni := deviations.DefaultNetworkInstance(dut) - pathV6 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(ipv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() - policyV6 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(ipv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() + pathV6 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(ipv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() + policyV6 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(ipv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() if !deviations.DefaultRoutePolicyUnsupported(dut) { policyV6.SetDefaultImportPolicy(oc.RoutingPolicy_DefaultPolicyType_REJECT_ROUTE) } policyV6.SetImportPolicy([]string{"routePolicy"}) gnmi.Replace(t, dut, pathV6.Config(), policyV6) - pathV4 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(ipv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() - policyV4 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(ipv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() + pathV4 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(ipv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() + policyV4 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(ipv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() if !deviations.DefaultRoutePolicyUnsupported(dut) { policyV4.SetDefaultImportPolicy(oc.RoutingPolicy_DefaultPolicyType_REJECT_ROUTE) } diff --git a/feature/bgp/policybase/otg_tests/bgp_3level_nested_policy_test/bgp_3level_nested_policy_test.go b/feature/bgp/policybase/otg_tests/bgp_3level_nested_policy_test/bgp_3level_nested_policy_test.go index 5288d6b9692..b483eeabaea 100644 --- a/feature/bgp/policybase/otg_tests/bgp_3level_nested_policy_test/bgp_3level_nested_policy_test.go +++ b/feature/bgp/policybase/otg_tests/bgp_3level_nested_policy_test/bgp_3level_nested_policy_test.go @@ -26,7 +26,6 @@ const ( dutAS = uint32(65501) ateAS1 = uint32(65502) ateAS2 = uint32(65503) - bgpName = "BGP" asPathRepeat = 15 plenV4 = 30 plenV6 = 126 @@ -280,7 +279,7 @@ func unconfigureImportRoutingPolicyV4(t *testing.T, dut *ondatra.DUTDevice) { // Clear any existing policy dni := deviations.DefaultNetworkInstance(dut) - policyPath1 := 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().ImportPolicy().Config() + policyPath1 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy().ImportPolicy().Config() gnmi.BatchDelete(batch, policyPath1) policyPath2 := gnmi.OC().RoutingPolicy().Config() gnmi.BatchDelete(batch, policyPath2) @@ -294,7 +293,7 @@ func unconfigureExportRoutingPolicyV4(t *testing.T, dut *ondatra.DUTDevice) { // Clear any existing policy dni := deviations.DefaultNetworkInstance(dut) - policyPath1 := 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().ExportPolicy().Config() + policyPath1 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy().ExportPolicy().Config() gnmi.BatchDelete(batch, policyPath1) policyPath2 := gnmi.OC().RoutingPolicy().Config() gnmi.BatchDelete(batch, policyPath2) @@ -307,7 +306,7 @@ func unconfigureImportRoutingPolicyV6(t *testing.T, dut *ondatra.DUTDevice) { // Clear any existing policy dni := deviations.DefaultNetworkInstance(dut) - policyPath1 := 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().ImportPolicy().Config() + policyPath1 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy().ImportPolicy().Config() gnmi.BatchDelete(batch, policyPath1) policyPath2 := gnmi.OC().RoutingPolicy().Config() gnmi.BatchDelete(batch, policyPath2) @@ -320,7 +319,7 @@ func unconfigureExportRoutingPolicyV6(t *testing.T, dut *ondatra.DUTDevice) { // Clear any existing policy dni := deviations.DefaultNetworkInstance(dut) - policyPath1 := 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().ExportPolicy().Config() + policyPath1 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy().ExportPolicy().Config() gnmi.BatchDelete(batch, policyPath1) policyPath2 := gnmi.OC().RoutingPolicy().Config() gnmi.BatchDelete(batch, policyPath2) @@ -394,9 +393,9 @@ func configureImportRoutingPolicyV4(t *testing.T, dut *ondatra.DUTDevice) { // Attach invert-policy-v4 to neighbor import dni := deviations.DefaultNetworkInstance(dut) - importPath := 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().Config() + importPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy().Config() gnmi.BatchDelete(batch, importPath) - apply := 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 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() apply.SetImportPolicy([]string{v4InvertPolicy}) // Set default import policy to reject apply.SetDefaultImportPolicy(oc.RoutingPolicy_DefaultPolicyType_REJECT_ROUTE) @@ -411,7 +410,7 @@ func validateImportRoutingPolicyV4(t *testing.T, dut *ondatra.DUTDevice, ate *on validateCommunityValue(t, dut, v4CommunitySet) if !deviations.BGPRibOcPathUnsupported(dut) { dni := deviations.DefaultNetworkInstance(dut) - bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Rib() + bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Rib() locRib := gnmi.Get[*oc.NetworkInstance_Protocol_Bgp_Rib_AfiSafi_Ipv4Unicast_LocRib](t, dut, bgpRIBPath.AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Ipv4Unicast().LocRib().State()) found := false for k, lr := range locRib.Route { @@ -525,10 +524,10 @@ func configureExportRoutingPolicyV4(t *testing.T, dut *ondatra.DUTDevice) { // Apply parent policy (invert-policy-v4) to BGP neighbor AFI-SAFI or peer-group if deviations.RoutePolicyUnderAFIUnsupported(dut) { // apply under peer-group - path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().PeerGroup(peerGrpNamev4).ApplyPolicy() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().PeerGroup(peerGrpNamev4).ApplyPolicy() gnmi.BatchDelete(batch, path.Config()) - policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreatePeerGroup(peerGrpNamev4).GetOrCreateApplyPolicy() + policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreatePeerGroup(peerGrpNamev4).GetOrCreateApplyPolicy() policy.SetExportPolicy([]string{v4InvertPolicy}) // Explicitly set default export policy to REJECT_ROUTE as README asks @@ -538,10 +537,10 @@ func configureExportRoutingPolicyV4(t *testing.T, dut *ondatra.DUTDevice) { gnmi.BatchReplace(batch, path.Config(), policy) } else { // apply under neighbor AFI-SAFI - 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() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() gnmi.BatchDelete(batch, path.Config()) - 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 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() policy.SetExportPolicy([]string{v4InvertPolicy}) policy.SetDefaultExportPolicy(oc.RoutingPolicy_DefaultPolicyType_REJECT_ROUTE) @@ -662,9 +661,9 @@ func configureImportRoutingPolicyV6(t *testing.T, dut *ondatra.DUTDevice) { // Attach invert-policy-v6 to neighbor import dni := deviations.DefaultNetworkInstance(dut) - importPath := 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().Config() + importPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy().Config() gnmi.BatchDelete(batch, importPath) - apply := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() + apply := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() apply.SetImportPolicy([]string{v6InvertPolicy}) // Set default import policy to reject apply.SetDefaultImportPolicy(oc.RoutingPolicy_DefaultPolicyType_REJECT_ROUTE) @@ -679,7 +678,7 @@ func validateImportRoutingPolicyV6(t *testing.T, dut *ondatra.DUTDevice, ate *on validateCommunityValue(t, dut, v6CommunitySet) if !deviations.BGPRibOcPathUnsupported(dut) { dni := deviations.DefaultNetworkInstance(dut) - bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Rib() + bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Rib() locRib := gnmi.Get[*oc.NetworkInstance_Protocol_Bgp_Rib_AfiSafi_Ipv6Unicast_LocRib](t, dut, bgpRIBPath.AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Ipv6Unicast().LocRib().State()) found := false for k, lr := range locRib.Route { @@ -790,10 +789,10 @@ func configureExportRoutingPolicyV6(t *testing.T, dut *ondatra.DUTDevice) { if deviations.RoutePolicyUnderAFIUnsupported(dut) { // Apply under peer-group - path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().PeerGroup(peerGrpNamev6).ApplyPolicy() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().PeerGroup(peerGrpNamev6).ApplyPolicy() gnmi.BatchDelete(batch, path.Config()) - policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreatePeerGroup(peerGrpNamev6).GetOrCreateApplyPolicy() + policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreatePeerGroup(peerGrpNamev6).GetOrCreateApplyPolicy() policy.SetExportPolicy([]string{v6InvertPolicy}) policy.SetDefaultExportPolicy(oc.RoutingPolicy_DefaultPolicyType_REJECT_ROUTE) @@ -802,10 +801,10 @@ func configureExportRoutingPolicyV6(t *testing.T, dut *ondatra.DUTDevice) { gnmi.BatchReplace(batch, path.Config(), policy) } else { // Apply under neighbor AFI-SAFI - path := 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() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() gnmi.BatchDelete(batch, path.Config()) - policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() + policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() policy.SetExportPolicy([]string{v6InvertPolicy}) policy.SetDefaultExportPolicy(oc.RoutingPolicy_DefaultPolicyType_REJECT_ROUTE) @@ -866,7 +865,7 @@ func awaitBGPPolicy(t *testing.T, dut *ondatra.DUTDevice, nbr *bgpNbr, childPoli if nbr.isV4 { afiSafiType = oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST } - policyPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Neighbor(nbr.peerIP).AfiSafi(afiSafiType).ApplyPolicy().ExportPolicy().State() + policyPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(nbr.peerIP).AfiSafi(afiSafiType).ApplyPolicy().ExportPolicy().State() _, ok := gnmi.Watch(t, dut, policyPath, timeout, func(val *ygnmi.Value[[]string]) bool { policies, present := val.Val() return present && len(policies) > 0 && policies[0] == childPolicyName @@ -955,7 +954,7 @@ func (td *testData) advertiseRoutesWithEBGP(t *testing.T) { t.Helper() root := &oc.Root{} ni := root.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(td.dut)) - bgpP := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName) + bgpP := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(td.dut)) bgpP.SetEnabled(true) bgp := bgpP.GetOrCreateBgp() @@ -1048,7 +1047,7 @@ func (td *testData) advertiseRoutesWithEBGP(t *testing.T) { // verifyDUTBGPEstablished verifies on dut for BGP peer establishment. func (td *testData) verifyDUTBGPEstablished(t *testing.T) { t.Helper() - sp := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(td.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().NeighborAny().SessionState().State() + sp := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(td.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(td.dut)).Bgp().NeighborAny().SessionState().State() watch := gnmi.WatchAll(t, td.dut, sp, 2*time.Minute, func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool { state, ok := val.Val() if !ok || state != oc.Bgp_Neighbor_SessionState_ESTABLISHED { diff --git a/feature/bgp/policybase/otg_tests/chained_policies_test/chained_policies_test.go b/feature/bgp/policybase/otg_tests/chained_policies_test/chained_policies_test.go index 014b08fefe2..73a169ab85c 100644 --- a/feature/bgp/policybase/otg_tests/chained_policies_test/chained_policies_test.go +++ b/feature/bgp/policybase/otg_tests/chained_policies_test/chained_policies_test.go @@ -51,7 +51,6 @@ const ( dutAS = uint32(65656) ateAS1 = uint32(65657) ateAS2 = uint32(65658) - bgpName = "BGP" maskLenExact = "exact" localPref = 200 med = 1000 @@ -276,8 +275,8 @@ func configureImportRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice, operatio } } 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 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() + policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() if !deviations.DefaultImportExportPolicyUnsupported(dut) { policy.SetDefaultImportPolicy(oc.RoutingPolicy_DefaultPolicyType_REJECT_ROUTE) } @@ -298,7 +297,7 @@ func configureImportRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice, operatio func validateImportRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATEDevice) { 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() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).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 !deviations.FlattenPolicyWithMultipleStatements(dut) { @@ -307,7 +306,7 @@ func validateImportRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice, ate *onda } } if !deviations.BGPRibOcPathUnsupported(dut) { - bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Rib() + bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Rib() locRib := gnmi.Get[*oc.NetworkInstance_Protocol_Bgp_Rib_AfiSafi_Ipv4Unicast_LocRib](t, dut, bgpRIBPath.AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Ipv4Unicast().LocRib().State()) found := false for k, lr := range locRib.Route { @@ -391,8 +390,8 @@ func configureExportRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice, operatio } 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 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() + policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() if !deviations.DefaultImportExportPolicyUnsupported(dut) { policy.SetDefaultExportPolicy(oc.RoutingPolicy_DefaultPolicyType_REJECT_ROUTE) } @@ -400,8 +399,8 @@ func configureExportRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice, operatio // As Per RFC 8212, Routes contained in an Adj-RIB-In associated with an EBGP peer // SHALL NOT be considered eligible in the Decision Process if no // explicit Import Policy has been applied. - importPolPath := 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() - eBGPPeerPolicy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(atePort2.IPv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() + importPolPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort2.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() + eBGPPeerPolicy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(atePort2.IPv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() if !deviations.DefaultImportExportPolicyUnsupported(dut) { eBGPPeerPolicy.SetDefaultImportPolicy(oc.RoutingPolicy_DefaultPolicyType_ACCEPT_ROUTE) } @@ -428,7 +427,7 @@ func configureExportRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice, operatio func validateExportRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATEDevice) { 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() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).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()) exportPolicies := policy.GetExportPolicy() if !deviations.FlattenPolicyWithMultipleStatements(dut) { @@ -504,8 +503,8 @@ func configureImportRoutingPolicyV6(t *testing.T, dut *ondatra.DUTDevice, operat } dni := deviations.DefaultNetworkInstance(dut) - path := 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() - policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() + policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() if !deviations.DefaultImportExportPolicyUnsupported(dut) { policy.SetDefaultImportPolicy(oc.RoutingPolicy_DefaultPolicyType_REJECT_ROUTE) } @@ -526,7 +525,7 @@ func configureImportRoutingPolicyV6(t *testing.T, dut *ondatra.DUTDevice, operat func validateImportRoutingPolicyV6(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATEDevice) { dni := deviations.DefaultNetworkInstance(dut) - path := 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() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() policy := gnmi.Get[*oc.NetworkInstance_Protocol_Bgp_Neighbor_AfiSafi_ApplyPolicy](t, dut, path.State()) importPolicies := policy.GetImportPolicy() if !deviations.FlattenPolicyWithMultipleStatements(dut) { @@ -535,7 +534,7 @@ func validateImportRoutingPolicyV6(t *testing.T, dut *ondatra.DUTDevice, ate *on } } if !deviations.BGPRibOcPathUnsupported(dut) { - bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Rib() + bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Rib() locRib := gnmi.Get[*oc.NetworkInstance_Protocol_Bgp_Rib_AfiSafi_Ipv6Unicast_LocRib](t, dut, bgpRIBPath.AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Ipv6Unicast().LocRib().State()) found := false for k, lr := range locRib.Route { @@ -617,8 +616,8 @@ func configureExportRoutingPolicyV6(t *testing.T, dut *ondatra.DUTDevice, operat } dni := deviations.DefaultNetworkInstance(dut) - path := 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() - policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() + policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() if !deviations.DefaultImportExportPolicyUnsupported(dut) { policy.SetDefaultExportPolicy(oc.RoutingPolicy_DefaultPolicyType_REJECT_ROUTE) } @@ -626,8 +625,8 @@ func configureExportRoutingPolicyV6(t *testing.T, dut *ondatra.DUTDevice, operat // As Per RFC 8212, Routes contained in an Adj-RIB-In associated with an EBGP peer // SHALL NOT be considered eligible in the Decision Process if no // explicit Import Policy has been applied. - importPolPath := 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() - eBGPPeerPolicy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(atePort2.IPv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() + importPolPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort2.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() + eBGPPeerPolicy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(atePort2.IPv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() if !deviations.DefaultImportExportPolicyUnsupported(dut) { eBGPPeerPolicy.SetDefaultImportPolicy(oc.RoutingPolicy_DefaultPolicyType_ACCEPT_ROUTE) } @@ -654,7 +653,7 @@ func configureExportRoutingPolicyV6(t *testing.T, dut *ondatra.DUTDevice, operat func validateExportRoutingPolicyV6(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATEDevice) { dni := deviations.DefaultNetworkInstance(dut) - path := 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() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() policy := gnmi.Get[*oc.NetworkInstance_Protocol_Bgp_Neighbor_AfiSafi_ApplyPolicy](t, dut, path.State()) exportPolicies := policy.GetExportPolicy() if !deviations.FlattenPolicyWithMultipleStatements(dut) { @@ -787,7 +786,7 @@ func (td *testData) advertiseRoutesWithEBGP(t *testing.T) { root := &oc.Root{} ni := root.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(td.dut)) - bgpP := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName) + bgpP := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(td.dut)) bgpP.SetEnabled(true) bgp := bgpP.GetOrCreateBgp() @@ -891,7 +890,7 @@ func (td *testData) advertiseRoutesWithEBGP(t *testing.T) { } func (td *testData) verifyDUTBGPEstablished(t *testing.T) { - sp := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(td.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().NeighborAny().SessionState().State() + sp := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(td.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(td.dut)).Bgp().NeighborAny().SessionState().State() watch := gnmi.WatchAll(t, td.dut, sp, 2*time.Minute, func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool { state, ok := val.Val() if !ok || state != oc.Bgp_Neighbor_SessionState_ESTABLISHED { diff --git a/feature/bgp/policybase/otg_tests/comm_match_action_test/bgp_comm_match_action_test.go b/feature/bgp/policybase/otg_tests/comm_match_action_test/bgp_comm_match_action_test.go index 2768546245a..999fd06f4d9 100644 --- a/feature/bgp/policybase/otg_tests/comm_match_action_test/bgp_comm_match_action_test.go +++ b/feature/bgp/policybase/otg_tests/comm_match_action_test/bgp_comm_match_action_test.go @@ -200,7 +200,7 @@ func bgpCreateNbr(localAs, peerAs uint32, dut *ondatra.DUTDevice) *oc.NetworkIns // Configure BGP on DUT dutOcRoot := &oc.Root{} ni1 := dutOcRoot.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() @@ -256,7 +256,7 @@ func bgpCreateNbr(localAs, peerAs uint32, dut *ondatra.DUTDevice) *oc.NetworkIns func verifyBgpState(t *testing.T, dut *ondatra.DUTDevice) { 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() t.Logf("Waiting for BGP neighbor to establish...") for _, nbr := range ebgpNbrs { @@ -358,7 +358,7 @@ func configureRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice, policyName str gnmi.BatchReplace(batchConfig, gnmi.OC().RoutingPolicy().PolicyDefinition(policyName).Config(), pdef) } - 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() if nbr != nil { applyPolicy := &oc.NetworkInstance_Protocol_Bgp_Neighbor_AfiSafi_ApplyPolicy{} applyPolicy.SetImportPolicy([]string{policyName}) @@ -556,7 +556,7 @@ func validateATEIPv4PrefixCommunitySet(t *testing.T, ate *ondatra.ATEDevice, bgp } func validateDutIPv4PrefixCommunitySet(t *testing.T, dut *ondatra.DUTDevice, bgpNbr *bgpNeighbor, subnet string, wantCommunitySet []string) { - 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() statePath := bgpPath.Rib().AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Ipv4Unicast() state := gnmi.Get(t, dut, statePath.State()) @@ -603,7 +603,7 @@ func validateATEIPv6PrefixCommunitySet(t *testing.T, ate *ondatra.ATEDevice, bgp } func validateDutIPv6PrefixCommunitySet(t *testing.T, dut *ondatra.DUTDevice, bgpNbr *bgpNeighbor, subnet string, wantCommunitySet []string) { - 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() statePath := bgpPath.Rib().AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Ipv6Unicast() state := gnmi.Get(t, dut, statePath.State()) @@ -637,7 +637,7 @@ func TestBGPCommMatchAction(t *testing.T) { configureDUT(t, 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)) gnmi.Delete(t, dut, dutConfPath.Config()) dutConf := bgpCreateNbr(dutAS, ateAS1, dut) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) diff --git a/feature/bgp/policybase/otg_tests/community_test/community_test.go b/feature/bgp/policybase/otg_tests/community_test/community_test.go index 6f6952cfeed..95e7a3995fd 100644 --- a/feature/bgp/policybase/otg_tests/community_test/community_test.go +++ b/feature/bgp/policybase/otg_tests/community_test/community_test.go @@ -36,7 +36,6 @@ const ( prefixV6Len = 126 trafficPps = 100 totalPackets = 1200 - bgpName = "BGP" RPLPermitAll = "PERMIT-ALL" comunitySetNameRegex = "any_my_regex_comms" ) @@ -114,14 +113,14 @@ func configureImportBGPPolicy(t *testing.T, dut *ondatra.DUTDevice, ipv4 string, } dni := deviations.DefaultNetworkInstance(dut) - pathV6 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(ipv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() - policyV6 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(ipv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() + pathV6 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(ipv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() + policyV6 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(ipv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() // policyV6.SetDefaultImportPolicy(oc.RoutingPolicy_DefaultPolicyType_REJECT_ROUTE) policyV6.SetImportPolicy([]string{"routePolicy"}) gnmi.Replace(t, dut, pathV6.Config(), policyV6) - pathV4 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(ipv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() - policyV4 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(ipv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() + pathV4 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(ipv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() + policyV4 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(ipv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() // policyV4.SetDefaultImportPolicy(oc.RoutingPolicy_DefaultPolicyType_REJECT_ROUTE) policyV4.SetImportPolicy([]string{"routePolicy"}) gnmi.Replace(t, dut, pathV4.Config(), policyV4) diff --git a/feature/bgp/policybase/otg_tests/default_policies_test/bgp_default_policies_test.go b/feature/bgp/policybase/otg_tests/default_policies_test/bgp_default_policies_test.go index aa348b01ca3..73a38ab6bb4 100644 --- a/feature/bgp/policybase/otg_tests/default_policies_test/bgp_default_policies_test.go +++ b/feature/bgp/policybase/otg_tests/default_policies_test/bgp_default_policies_test.go @@ -198,7 +198,7 @@ func bgpCreateNbr(localAs, peerAs uint32, dut *ondatra.DUTDevice) *oc.NetworkIns dutOcRoot := &oc.Root{} ni1 := dutOcRoot.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() @@ -253,7 +253,7 @@ func verifyBgpTelemetry(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() var nbrIP = []string{atePort1.IPv4, otgIsisPort2LoopV4, atePort1.IPv6, otgIsisPort2LoopV6} t.Logf("Verifying BGP state.") - 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() for _, nbr := range nbrIP { nbrPath := bgpPath.Neighbor(nbr) @@ -413,7 +413,7 @@ func verifyBGPCapabilities(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() t.Log("Verifying BGP capabilities.") var nbrIP = []string{atePort1.IPv4, otgIsisPort2LoopV4, atePort1.IPv6, otgIsisPort2LoopV6} - 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() for _, nbr := range nbrIP { nbrPath := statePath.Neighbor(nbr) capabilities := map[oc.E_BgpTypes_BGP_CAPABILITY]bool{ @@ -434,7 +434,7 @@ func verifyBGPCapabilities(t *testing.T, dut *ondatra.DUTDevice) { func verifyInitialPrefixesTelemetry(t *testing.T, dut *ondatra.DUTDevice, nbr string, wantRx uint32, isV4 bool) { t.Helper() - 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() t.Logf("Prefix telemetry on DUT for peer %v", nbr) var prefixPath *netinstbgp.NetworkInstance_Protocol_Bgp_Neighbor_AfiSafi_PrefixesPath @@ -539,7 +539,7 @@ type bgpNbrList struct { func configureBGPDefaultPolicy(t *testing.T, dut *ondatra.DUTDevice, polType oc.E_RoutingPolicy_DefaultPolicyType) { t.Helper() nbrList := []*bgpNbrList{ebgpNbrV4, ebgpNbrV6, ibgpNbrV4, ibgpNbrV6} - 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() for _, nbr := range nbrList { nbrPolPath := bgpPath.Neighbor(nbr.nbrAddr).AfiSafi(nbr.afiSafi).ApplyPolicy() @@ -550,7 +550,7 @@ func configureBGPDefaultPolicy(t *testing.T, dut *ondatra.DUTDevice, polType oc. func deleteBGPPolicy(t *testing.T, dut *ondatra.DUTDevice, nbrList []*bgpNbrList) { 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() for _, nbr := range nbrList { nbrAfiSafiPath := bgpPath.Neighbor(nbr.nbrAddr).AfiSafi(nbr.afiSafi) b := &gnmi.SetBatch{} @@ -601,7 +601,7 @@ func configurePrefixMatchAndDefaultStatement(t *testing.T, dut *ondatra.DUTDevic func configureRoutingPolicyDefaultAction(t *testing.T, dut *ondatra.DUTDevice, action string, defaultStatementOnly bool) { t.Helper() batchConfig := &gnmi.SetBatch{} - 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() t.Logf("Delete prefix set policies") deleteBGPPolicy(t, dut, []*bgpNbrList{ebgpNbrV4, ebgpNbrV6, ibgpNbrV4, ibgpNbrV6}) @@ -749,7 +749,7 @@ func testDefaultPolicyRejectRouteActionOnly(t *testing.T, dut *ondatra.DUTDevice func configureRoutePolicies(t *testing.T, dut *ondatra.DUTDevice) { 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() batchConfig := &gnmi.SetBatch{} gnmi.BatchUpdate(batchConfig, gnmi.OC().RoutingPolicy().Config(), configurePrefixMatchPolicy(t, dut, ebgpImportIPv4, maskLenExact, maskLen32, []string{ipv4Prefix1, ipv4Prefix2})) @@ -788,7 +788,7 @@ func verifyPostPolicyPrefixTelemetry(t *testing.T, dut *ondatra.DUTDevice, nbr * t.Logf("Prefix telemetry validation for the neighbor %v", nbr.ipAddr) - 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() var afiSafiPath *netinstbgp.NetworkInstance_Protocol_Bgp_Neighbor_AfiSafiPath if nbr.isV4 { afiSafiPath = statePath.Neighbor(nbr.ipAddr).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST) @@ -900,7 +900,7 @@ func TestBGPDefaultPolicies(t *testing.T) { configureISIS(t, dut, dutIsisIntfNames, dutAreaAddress, dutSysID) }) - 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("Configure BGP Neighbors", func(t *testing.T) { gnmi.Delete(t, dut, dutConfPath.Config()) dutConf := bgpCreateNbr(dutAS, ateAS, dut) diff --git a/feature/bgp/policybase/otg_tests/import_export_multi_test/import_export_multi_test.go b/feature/bgp/policybase/otg_tests/import_export_multi_test/import_export_multi_test.go index 0501867eee8..9f60329bd15 100644 --- a/feature/bgp/policybase/otg_tests/import_export_multi_test/import_export_multi_test.go +++ b/feature/bgp/policybase/otg_tests/import_export_multi_test/import_export_multi_test.go @@ -43,7 +43,6 @@ const ( totalPackets = 1200 localPref = 5 medValue = 100 - bgpName = "BGP" otglocalPref = "local-pref" otgMED = "med" otgASPath = "as-path" @@ -128,7 +127,7 @@ func TestMain(m *testing.M) { func deleteBGPPolicy(t *testing.T, dut *ondatra.DUTDevice, nbrList []*bgpNbrList) { 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() for _, nbr := range nbrList { nbrAfiSafiPath := bgpPath.Neighbor(nbr.nbrAddr).AfiSafi(nbr.afiSafi) b := &gnmi.SetBatch{} @@ -162,14 +161,14 @@ func configureImportExportAcceptAllBGPPolicy(t *testing.T, dut *ondatra.DUTDevic gnmi.Update(t, dut, gnmi.OC().RoutingPolicy().Config(), rp) dni := deviations.DefaultNetworkInstance(dut) - pathV6 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(ipv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() - policyV6 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(ipv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() + pathV6 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(ipv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() + policyV6 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(ipv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() policyV6.SetImportPolicy([]string{"routePolicy"}) policyV6.SetExportPolicy([]string{"routePolicy"}) gnmi.Replace(t, dut, pathV6.Config(), policyV6) - pathV4 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(ipv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() - policyV4 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(ipv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() + pathV4 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(ipv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() + policyV4 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(ipv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() policyV4.SetImportPolicy([]string{"routePolicy"}) policyV4.SetExportPolicy([]string{"routePolicy"}) gnmi.Replace(t, dut, pathV4.Config(), policyV4) @@ -509,8 +508,8 @@ func configureImportExportMultifacetMatchActionsBGPPolicy(t *testing.T, dut *ond // Configure the parent BGP import and export policy. dni := deviations.DefaultNetworkInstance(dut) - pathV6 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(ipv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() - policyV6 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(ipv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() + pathV6 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(ipv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() + policyV6 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(ipv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() policyV6.SetImportPolicy([]string{parentPolicy}) policyV6.SetExportPolicy([]string{parentPolicy}) if !deviations.DefaultRoutePolicyUnsupported(dut) { @@ -519,8 +518,8 @@ func configureImportExportMultifacetMatchActionsBGPPolicy(t *testing.T, dut *ond } gnmi.Replace(t, dut, pathV6.Config(), policyV6) - pathV4 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(ipv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() - policyV4 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(ipv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() + pathV4 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(ipv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() + policyV4 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(ipv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() policyV4.SetImportPolicy([]string{parentPolicy}) policyV4.SetExportPolicy([]string{parentPolicy}) if !deviations.DefaultRoutePolicyUnsupported(dut) { @@ -529,8 +528,8 @@ func configureImportExportMultifacetMatchActionsBGPPolicy(t *testing.T, dut *ond } gnmi.Replace(t, dut, pathV4.Config(), policyV4) - pathV61 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(ipv61).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() - policyV61 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(ipv61).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() + pathV61 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(ipv61).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() + policyV61 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(ipv61).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() policyV61.SetExportPolicy([]string{parentPolicy}) if !deviations.DefaultRoutePolicyUnsupported(dut) { policyV61.SetDefaultImportPolicy(oc.RoutingPolicy_DefaultPolicyType_REJECT_ROUTE) @@ -538,11 +537,11 @@ func configureImportExportMultifacetMatchActionsBGPPolicy(t *testing.T, dut *ond } gnmi.Replace(t, dut, pathV61.Config(), policyV61) if !deviations.SkipBgpSendCommunityType(dut) { - gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(ipv61).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).SendCommunityType().Config(), []oc.E_Bgp_CommunityType{oc.Bgp_CommunityType_STANDARD, oc.Bgp_CommunityType_EXTENDED}) + gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(ipv61).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).SendCommunityType().Config(), []oc.E_Bgp_CommunityType{oc.Bgp_CommunityType_STANDARD, oc.Bgp_CommunityType_EXTENDED}) } - pathV41 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(ipv41).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() - policyV41 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(ipv41).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() + pathV41 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(ipv41).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() + policyV41 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(ipv41).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() policyV41.SetExportPolicy([]string{parentPolicy}) if !deviations.DefaultRoutePolicyUnsupported(dut) { policyV41.SetDefaultImportPolicy(oc.RoutingPolicy_DefaultPolicyType_REJECT_ROUTE) @@ -550,7 +549,7 @@ func configureImportExportMultifacetMatchActionsBGPPolicy(t *testing.T, dut *ond } gnmi.Replace(t, dut, pathV41.Config(), policyV41) if !deviations.SkipBgpSendCommunityType(dut) { - gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(ipv41).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).SendCommunityType().Config(), []oc.E_Bgp_CommunityType{oc.Bgp_CommunityType_STANDARD, oc.Bgp_CommunityType_EXTENDED}) + gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(ipv41).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).SendCommunityType().Config(), []oc.E_Bgp_CommunityType{oc.Bgp_CommunityType_STANDARD, oc.Bgp_CommunityType_EXTENDED}) } } @@ -747,7 +746,7 @@ func verifyTrafficV4AndV6(t *testing.T, bs *cfgplugins.BGPSession, testResults [ func awaitBGPReady(t *testing.T, bs *cfgplugins.BGPSession, ipv4, ipv6, ipv41, ipv61 string) { t.Helper() - bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(bs.DUT)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp() + bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(bs.DUT)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(bs.DUT)).Bgp() for _, nbr := range []string{ipv4, ipv6, ipv41, ipv61} { gnmi.Await(t, bs.DUT, bgpPath.Neighbor(nbr).SessionState().State(), 2*time.Minute, oc.Bgp_Neighbor_SessionState_ESTABLISHED) } @@ -762,7 +761,7 @@ func awaitBGPReady(t *testing.T, bs *cfgplugins.BGPSession, ipv4, ipv6, ipv41, i func validateLocalPreferenceV4(t *testing.T, dut *ondatra.DUTDevice, prefix string, metricValue uint32) { dni := deviations.DefaultNetworkInstance(dut) - bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Rib() + bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Rib() locRib := gnmi.Get[*oc.NetworkInstance_Protocol_Bgp_Rib_AfiSafi_Ipv4Unicast_LocRib](t, dut, bgpRIBPath.AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Ipv4Unicast().LocRib().State()) found := false for k, lr := range locRib.Route { @@ -800,7 +799,7 @@ func validateLocalPreferenceV4(t *testing.T, dut *ondatra.DUTDevice, prefix stri func validateLocalPreferenceV6(t *testing.T, dut *ondatra.DUTDevice, prefix string, metricValue uint32) { dni := deviations.DefaultNetworkInstance(dut) - bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Rib() + bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Rib() locRib := gnmi.Get[*oc.NetworkInstance_Protocol_Bgp_Rib_AfiSafi_Ipv6Unicast_LocRib](t, dut, bgpRIBPath.AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Ipv6Unicast().LocRib().State()) found := false for k, lr := range locRib.Route { 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 22fc7a66801..e30b7c6b009 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 @@ -63,7 +63,6 @@ const ( v6RoutePrefix = uint32(128) dutAS = uint32(32001) ateAS = uint32(32002) - bgpName = "BGP" maskLenExact = "exact" localPref = 200 v4Flow = "flow-v4" @@ -290,10 +289,10 @@ 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() + path1 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).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, deviations.NwInstBgpProtoName(dut)).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, deviations.NwInstBgpProtoName(dut)).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, deviations.NwInstBgpProtoName(dut)).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()) @@ -307,19 +306,19 @@ func applyImportPolicyDut(t *testing.T, dut *ondatra.DUTDevice, policyName strin removeImportAndExportPolicy(t, dut) // 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() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() + policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() policy.SetImportPolicy([]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(atePort1.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() - policy = root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() + path = gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() + policy = root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() policy.SetImportPolicy([]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") + niProto := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) 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) @@ -327,7 +326,7 @@ func applyImportPolicyDut(t *testing.T, dut *ondatra.DUTDevice, policyName strin 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) + gnmi.Update(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config(), niProto) } func applyExportPolicyDut(t *testing.T, dut *ondatra.DUTDevice, policyName string) { @@ -339,19 +338,19 @@ func applyExportPolicyDut(t *testing.T, dut *ondatra.DUTDevice, policyName strin } // 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() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort2.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() + policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).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() + path = gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort2.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() + policy = root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).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") + niProto := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) 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) @@ -359,12 +358,12 @@ func applyExportPolicyDut(t *testing.T, dut *ondatra.DUTDevice, policyName strin 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) + gnmi.Update(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config(), niProto) } func validateImportPolicyDut(t *testing.T, dut *ondatra.DUTDevice, td testData, 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() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() _, ok := gnmi.Watch(t, dut, path.State(), 2*time.Minute, func(v *ygnmi.Value[*oc.NetworkInstance_Protocol_Bgp_Neighbor_AfiSafi_ApplyPolicy]) bool { value, ok := v.Val() if !ok { @@ -399,7 +398,7 @@ func validateImportPolicyDut(t *testing.T, dut *ondatra.DUTDevice, td testData, func validateExportPolicyDut(t *testing.T, dut *ondatra.DUTDevice, td testData, 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() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort2.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() _, ok := gnmi.Watch(t, dut, path.State(), 2*time.Minute, func(v *ygnmi.Value[*oc.NetworkInstance_Protocol_Bgp_Neighbor_AfiSafi_ApplyPolicy]) bool { value, ok := v.Val() if !ok { @@ -719,19 +718,19 @@ func configureImportRoutingPolicyAllowAll(t *testing.T, dut *ondatra.DUTDevice) // Apply ipv4 policy to bgp neighbour. dni := deviations.DefaultNetworkInstance(dut) - path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Neighbor(atePort1.IPv4). + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).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). + policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)). GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() policy.SetImportPolicy([]string{"allow-all"}) 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(). + path = gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp(). Neighbor(atePort1.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() - policy = root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName). + policy = root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)). GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() policy.SetImportPolicy([]string{"allow-all"}) gnmi.Replace(t, dut, path.Config(), policy) @@ -739,7 +738,7 @@ func configureImportRoutingPolicyAllowAll(t *testing.T, dut *ondatra.DUTDevice) func validateImportRoutingPolicyAllowAll(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATEDevice, td testData) { dni := deviations.DefaultNetworkInstance(dut) - path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp(). + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp(). Neighbor(atePort1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() _, policyOK := gnmi.Watch(t, dut, path.State(), 2*time.Minute, func(v *ygnmi.Value[*oc.NetworkInstance_Protocol_Bgp_Neighbor_AfiSafi_ApplyPolicy]) bool { @@ -759,7 +758,7 @@ func validateImportRoutingPolicyAllowAll(t *testing.T, dut *ondatra.DUTDevice, a return present }).Await(t) if ok { - bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Rib() + bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Rib() locRib := gnmi.Get[*oc.NetworkInstance_Protocol_Bgp_Rib_AfiSafi_Ipv4Unicast_LocRib](t, dut, bgpRIBPath. AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Ipv4Unicast().LocRib().State()) expected := map[string]bool{ @@ -777,7 +776,7 @@ func validateImportRoutingPolicyAllowAll(t *testing.T, dut *ondatra.DUTDevice, a t.Fatalf("Not all V4 routes found. expected:%d got:%d", len(expected), found) } } - pathV6 := 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() + pathV6 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() _, policyV6OK := gnmi.Watch(t, dut, pathV6.State(), 2*time.Minute, func(v *ygnmi.Value[*oc.NetworkInstance_Protocol_Bgp_Neighbor_AfiSafi_ApplyPolicy]) bool { val, ok := v.Val() if !ok { @@ -794,7 +793,7 @@ func validateImportRoutingPolicyAllowAll(t *testing.T, dut *ondatra.DUTDevice, a return present }).Await(t) if oks { - bgpRIBPathV6 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Rib() + bgpRIBPathV6 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Rib() locRibv6 := gnmi.Get[*oc.NetworkInstance_Protocol_Bgp_Rib_AfiSafi_Ipv6Unicast_LocRib](t, dut, bgpRIBPathV6.AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Ipv6Unicast().LocRib().State()) found = 0 expectedV6 := map[string]bool{ @@ -1145,7 +1144,7 @@ func (td *testData) advertiseRoutesWithEBGP(t *testing.T) { root := &oc.Root{} ni := root.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(td.dut)) - bgpP := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName) + bgpP := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(td.dut)) bgpP.SetEnabled(true) bgp := bgpP.GetOrCreateBgp() @@ -1242,7 +1241,7 @@ func (td *testData) advertiseRoutesWithEBGP(t *testing.T) { } func (td *testData) verifyDUTBGPEstablished(t *testing.T) { - sp := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(td.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().NeighborAny().SessionState().State() + sp := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(td.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(td.dut)).Bgp().NeighborAny().SessionState().State() watch := gnmi.WatchAll(t, td.dut, sp, 2*time.Minute, func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool { state, ok := val.Val() if !ok || state != oc.Bgp_Neighbor_SessionState_ESTABLISHED { @@ -1341,7 +1340,7 @@ func baseSetupConfigAndVerification(t *testing.T, td testData) { func verifyExtCommunityIndexV4(t *testing.T, td testData, v4Address string) { dni := deviations.DefaultNetworkInstance(td.dut) - bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Rib() + bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(td.dut)).Bgp().Rib() locRib := gnmi.Get[*oc.NetworkInstance_Protocol_Bgp_Rib_AfiSafi_Ipv4Unicast_LocRib](t, td.dut, bgpRIBPath.AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Ipv4Unicast().LocRib().State()) t.Logf("RIB: %v", locRib) for route, prefix := range locRib.Route { @@ -1361,7 +1360,7 @@ func verifyExtCommunityIndexV4(t *testing.T, td testData, v4Address string) { func verifyExtCommunityIndexV6(t *testing.T, td testData, v6Address string) { dni := deviations.DefaultNetworkInstance(td.dut) - bgpRIBPathV6 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Rib() + bgpRIBPathV6 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(td.dut)).Bgp().Rib() locRibv6 := gnmi.Get[*oc.NetworkInstance_Protocol_Bgp_Rib_AfiSafi_Ipv6Unicast_LocRib](t, td.dut, bgpRIBPathV6.AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Ipv6Unicast().LocRib().State()) t.Logf("RIB: %v", locRibv6) for route, prefix := range locRibv6.Route { diff --git a/feature/bgp/policybase/otg_tests/multipath_bgp_ecmp_protocol_nexthop/multipath_bgp_ecmp_protocol_nexthop_test.go b/feature/bgp/policybase/otg_tests/multipath_bgp_ecmp_protocol_nexthop/multipath_bgp_ecmp_protocol_nexthop_test.go index 80801b24c17..576839a2dcc 100644 --- a/feature/bgp/policybase/otg_tests/multipath_bgp_ecmp_protocol_nexthop/multipath_bgp_ecmp_protocol_nexthop_test.go +++ b/feature/bgp/policybase/otg_tests/multipath_bgp_ecmp_protocol_nexthop/multipath_bgp_ecmp_protocol_nexthop_test.go @@ -378,7 +378,7 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice) { t.Logf("Now configuring BGP config on DUT") // Configure BGP neighbors and peer groups on 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)) gnmi.Delete(t, dut, dutConfPath.Config()) dutConf := bgpCreateNbr(dutAS, ateAS, dut) @@ -398,7 +398,7 @@ type bgpNeighbor struct { // enableMultipath enables multipath for the given DUT device with the given maximum paths. func enableMultipath(t *testing.T, dut *ondatra.DUTDevice, maxpaths uint32, ipv4 bool) { dni := deviations.DefaultNetworkInstance(dut) - bgpPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + bgpPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) bgpProto := gnmi.Get(t, dut, bgpPath.Config()) bgp := bgpProto.GetOrCreateBgp() cliConfig := "" @@ -484,7 +484,7 @@ func bgpCreateNbr(localAs, peerAs uint32, dut *ondatra.DUTDevice) *oc.NetworkIns nbrs := []*bgpNeighbor{nbr1v4, nbr2v4, nbr3v4, nbr1v6, nbr2v6, nbr3v6} dev := &oc.Root{} ni := dev.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)) - niProto := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + niProto := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) bgp := niProto.GetOrCreateBgp() global := bgp.GetOrCreateGlobal() @@ -689,7 +689,7 @@ func configureOTG(t *testing.T, otg *otg.OTG) gosnappi.Config { func verifyBGPPrefixesTelemetry(t *testing.T, dut *ondatra.DUTDevice, nbrs []string, wantRx uint32, isV4 bool) { t.Helper() - 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() for _, nbr := range nbrs { t.Logf("Prefix telemetry on DUT for peer %v", nbr) var prefixPath *netinstbgp.NetworkInstance_Protocol_Bgp_Neighbor_AfiSafi_PrefixesPath @@ -708,7 +708,7 @@ func verifyBGPPrefixesTelemetry(t *testing.T, dut *ondatra.DUTDevice, nbrs []str } func verifyBGPSessionTelemetry(t *testing.T, dut *ondatra.DUTDevice) { - 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() t.Logf("Verifying DUT BGP sessions up for IPv4") for _, neighborIP := range []string{ateP2Lo0IP, ateP3Lo0IP, ateP4Lo0IP} { diff --git a/feature/bgp/policybase/otg_tests/nested_policies/nested_policies_test.go b/feature/bgp/policybase/otg_tests/nested_policies/nested_policies_test.go index ebb5c6c43e4..e732c99b069 100644 --- a/feature/bgp/policybase/otg_tests/nested_policies/nested_policies_test.go +++ b/feature/bgp/policybase/otg_tests/nested_policies/nested_policies_test.go @@ -51,7 +51,6 @@ const ( dutAS = uint32(65656) ateAS1 = uint32(65657) ateAS2 = uint32(65658) - bgpName = "BGP" maskLenExact = "exact" localPref = 200 med = 1000 @@ -294,15 +293,15 @@ func configureImportRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice) { // Configure the parent BGP import policy. if deviations.RoutePolicyUnderAFIUnsupported(dut) { //policy under peer group - path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().PeerGroup(peerGrpNamev4).ApplyPolicy() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().PeerGroup(peerGrpNamev4).ApplyPolicy() gnmi.BatchDelete(batch, path.Config()) - policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreatePeerGroup(peerGrpNamev4).GetOrCreateApplyPolicy() + policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreatePeerGroup(peerGrpNamev4).GetOrCreateApplyPolicy() policy.SetImportPolicy([]string{v4LPPolicy}) gnmi.BatchReplace(batch, path.Config(), policy) } else { - 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() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() gnmi.BatchDelete(batch, path.Config()) - 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 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() policy.SetImportPolicy([]string{v4LPPolicy}) if !deviations.RoutingPolicyChainingUnsupported(dut) { gnmi.BatchUpdate(batch, path.Config(), policy) @@ -318,7 +317,7 @@ func configureImportRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice) { func validateImportRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATEDevice) { if !deviations.BGPRibOcPathUnsupported(dut) { dni := deviations.DefaultNetworkInstance(dut) - bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Rib() + bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Rib() locRib := gnmi.Get[*oc.NetworkInstance_Protocol_Bgp_Rib_AfiSafi_Ipv4Unicast_LocRib](t, dut, bgpRIBPath.AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Ipv4Unicast().LocRib().State()) found := false for k, lr := range locRib.Route { @@ -405,15 +404,15 @@ func configureExportRoutingPolicy(t *testing.T, dut *ondatra.DUTDevice) { // Configure the parent BGP import policy. if deviations.RoutePolicyUnderAFIUnsupported(dut) { //policy under peer group - path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().PeerGroup(peerGrpNamev4).ApplyPolicy() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().PeerGroup(peerGrpNamev4).ApplyPolicy() gnmi.BatchDelete(batch, path.Config()) - policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreatePeerGroup(peerGrpNamev4).GetOrCreateApplyPolicy() + policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreatePeerGroup(peerGrpNamev4).GetOrCreateApplyPolicy() policy.SetExportPolicy([]string{v4ASPPolicy}) gnmi.BatchReplace(batch, path.Config(), policy) } else { - 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() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() gnmi.BatchDelete(batch, path.Config()) - 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 := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() policy.SetExportPolicy([]string{v4ASPPolicy}) if !deviations.RoutingPolicyChainingUnsupported(dut) { gnmi.BatchUpdate(batch, path.Config(), policy) @@ -512,19 +511,19 @@ func configureImportRoutingPolicyV6(t *testing.T, dut *ondatra.DUTDevice) { // Configure the parent BGP import policy. if deviations.RoutePolicyUnderAFIUnsupported(dut) { //policy under peer group - pathV4 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().PeerGroup(peerGrpNamev4).ApplyPolicy() + pathV4 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().PeerGroup(peerGrpNamev4).ApplyPolicy() gnmi.BatchDelete(batch, pathV4.Config()) - path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().PeerGroup(peerGrpNamev6).ApplyPolicy() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().PeerGroup(peerGrpNamev6).ApplyPolicy() gnmi.BatchDelete(batch, path.Config()) - policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreatePeerGroup(peerGrpNamev6).GetOrCreateApplyPolicy() + policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreatePeerGroup(peerGrpNamev6).GetOrCreateApplyPolicy() policy.SetImportPolicy([]string{v6LPPolicy}) gnmi.BatchReplace(batch, path.Config(), policy) } else { - pathV4 := 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() + pathV4 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() gnmi.BatchDelete(batch, pathV4.Config()) - path := 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() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() gnmi.BatchDelete(batch, path.Config()) - policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() + policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() policy.SetImportPolicy([]string{v6LPPolicy}) if !deviations.RoutingPolicyChainingUnsupported(dut) { gnmi.BatchUpdate(batch, path.Config(), policy) @@ -540,7 +539,7 @@ func configureImportRoutingPolicyV6(t *testing.T, dut *ondatra.DUTDevice) { func validateImportRoutingPolicyV6(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATEDevice) { if !deviations.BGPRibOcPathUnsupported(dut) { dni := deviations.DefaultNetworkInstance(dut) - bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().Rib() + bgpRIBPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Rib() locRib := gnmi.Get[*oc.NetworkInstance_Protocol_Bgp_Rib_AfiSafi_Ipv6Unicast_LocRib](t, dut, bgpRIBPath.AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Ipv6Unicast().LocRib().State()) found := false for k, lr := range locRib.Route { @@ -626,19 +625,19 @@ func configureExportRoutingPolicyV6(t *testing.T, dut *ondatra.DUTDevice) { // Configure the parent BGP export policy. if deviations.RoutePolicyUnderAFIUnsupported(dut) { //policy under peer group - pathV4 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().PeerGroup(peerGrpNamev4).ApplyPolicy() + pathV4 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().PeerGroup(peerGrpNamev4).ApplyPolicy() gnmi.BatchDelete(batch, pathV4.Config()) - path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().PeerGroup(peerGrpNamev6).ApplyPolicy() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().PeerGroup(peerGrpNamev6).ApplyPolicy() gnmi.BatchDelete(batch, path.Config()) - policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreatePeerGroup(peerGrpNamev6).GetOrCreateApplyPolicy() + policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreatePeerGroup(peerGrpNamev6).GetOrCreateApplyPolicy() policy.SetExportPolicy([]string{v6LPPolicy}) gnmi.BatchReplace(batch, path.Config(), policy) } else { - pathV4 := 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() + pathV4 := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() gnmi.BatchDelete(batch, pathV4.Config()) - path := 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() + path := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort1.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() gnmi.BatchDelete(batch, path.Config()) - policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() + policy := root.GetOrCreateNetworkInstance(dni).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(atePort1.IPv6).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() policy.SetExportPolicy([]string{v6ASPPolicy}) if !deviations.RoutingPolicyChainingUnsupported(dut) { gnmi.BatchUpdate(batch, path.Config(), policy) @@ -784,7 +783,7 @@ func (td *testData) advertiseRoutesWithEBGP(t *testing.T) { root := &oc.Root{} ni := root.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(td.dut)) - bgpP := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName) + bgpP := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(td.dut)) bgpP.SetEnabled(true) bgp := bgpP.GetOrCreateBgp() @@ -881,7 +880,7 @@ func (td *testData) advertiseRoutesWithEBGP(t *testing.T) { // verifyDUTBGPEstablished verifies on dut for BGP peer establishment. func (td *testData) verifyDUTBGPEstablished(t *testing.T) { - sp := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(td.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpName).Bgp().NeighborAny().SessionState().State() + sp := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(td.dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(td.dut)).Bgp().NeighborAny().SessionState().State() watch := gnmi.WatchAll(t, td.dut, sp, 2*time.Minute, func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool { state, ok := val.Val() if !ok || state != oc.Bgp_Neighbor_SessionState_ESTABLISHED { diff --git a/feature/bgp/policybase/otg_tests/prefix_set_test/bgp_prefix_set_test.go b/feature/bgp/policybase/otg_tests/prefix_set_test/bgp_prefix_set_test.go index 066ea568b70..edbfbe2350b 100644 --- a/feature/bgp/policybase/otg_tests/prefix_set_test/bgp_prefix_set_test.go +++ b/feature/bgp/policybase/otg_tests/prefix_set_test/bgp_prefix_set_test.go @@ -233,7 +233,7 @@ func applyPrefixSetPolicy(t *testing.T, dut *ondatra.DUTDevice, prefixSet []*pre gnmi.BatchUpdate(batchConfig, gnmi.OC().RoutingPolicy().Config(), rp) // Apply routing-policy with BGP neighbor - 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() if importPolicy { gnmi.BatchReplace(batchConfig, bgpPath.Neighbor(bgpNbr.nbrAddr).AfiSafi(bgpNbr.afiSafi).ApplyPolicy().ImportPolicy().Config(), []string{policyName}) } else { @@ -247,7 +247,7 @@ func bgpCreateNbr(localAs, peerAs uint32, dut *ondatra.DUTDevice) *oc.NetworkIns // Configure BGP on DUT dutOcRoot := &oc.Root{} ni1 := dutOcRoot.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() @@ -283,7 +283,7 @@ func bgpCreateNbr(localAs, peerAs uint32, dut *ondatra.DUTDevice) *oc.NetworkIns func verifyBgpState(t *testing.T, dut *ondatra.DUTDevice) { 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() t.Logf("Waiting for BGP neighbor to establish...") for _, nbr := range ebgpNbrs { @@ -378,7 +378,7 @@ func configureOTG(t *testing.T, otg *otg.OTG) { func validatePrefixCount(t *testing.T, dut *ondatra.DUTDevice, nbr bgpNeighbor, wantInstalled, wantRx, wantSent uint32) { t.Helper() - 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() t.Logf("Validating prefix count for peer %v", nbr.nbrAddr) prefixPath := statePath.Neighbor(nbr.nbrAddr).AfiSafi(nbr.afiSafi).Prefixes() @@ -454,7 +454,7 @@ func TestBGPPrefixSet(t *testing.T) { t.Run("Establish BGP sessions", func(t *testing.T) { configureDUT(t, 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)) gnmi.Delete(t, dut, dutConfPath.Config()) dutConf := bgpCreateNbr(dutAS, ateAS, dut) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) diff --git a/feature/bgp/policybase/otg_tests/route_installation_test/route_installation_test.go b/feature/bgp/policybase/otg_tests/route_installation_test/route_installation_test.go index dfe22173680..7f8ab8afa14 100644 --- a/feature/bgp/policybase/otg_tests/route_installation_test/route_installation_test.go +++ b/feature/bgp/policybase/otg_tests/route_installation_test/route_installation_test.go @@ -168,7 +168,7 @@ func bgpCreateNbr(localAs, peerAs uint32, policy string, dut *ondatra.DUTDevice) 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() global.RouterId = ygot.String(dutDst.IPv4) @@ -303,7 +303,7 @@ func verifyBgpTelemetry(t *testing.T, dut *ondatra.DUTDevice) { ifName := dut.Port(t, "port1").Name() lastFlapTime := gnmi.Get(t, dut, gnmi.OC().Interface(ifName).LastChange().State()) t.Logf("Verifying BGP state") - 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(ateSrc.IPv4) nbrPathv6 := statePath.Neighbor(ateSrc.IPv6) @@ -369,7 +369,7 @@ func verifyBgpTelemetry(t *testing.T, dut *ondatra.DUTDevice) { // received IPv4 prefixes. // TODO: Need to refactor and compare using cmp.diff. func verifyPrefixesTelemetry(t *testing.T, dut *ondatra.DUTDevice, wantInstalled, wantRx, wantSent uint32) { - 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() prefixesv4 := statePath.Neighbor(ateDst.IPv4).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) @@ -387,7 +387,7 @@ func verifyPrefixesTelemetry(t *testing.T, dut *ondatra.DUTDevice, wantInstalled // verifyPrefixesTelemetryV6 confirms that the dut shows the correct numbers of installed, sent and // received IPv6 prefixes. func verifyPrefixesTelemetryV6(t *testing.T, dut *ondatra.DUTDevice, wantInstalledv6, wantRxv6, wantSentv6 uint32) { - 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() prefixesv6 := statePath.Neighbor(ateDst.IPv6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Prefixes() if gotInstalledv6 := gnmi.Get(t, dut, prefixesv6.Installed().State()); gotInstalledv6 != wantInstalledv6 { @@ -406,7 +406,7 @@ func verifyPrefixesTelemetryV6(t *testing.T, dut *ondatra.DUTDevice, wantInstall // verifyPolicyTelemetry confirms that the dut policy is set as expected. func verifyPolicyTelemetry(t *testing.T, dut *ondatra.DUTDevice, policy string) { if deviations.RoutePolicyUnderAFIUnsupported(dut) { - 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() policytel := gnmi.Get(t, dut, statePath.PeerGroup(peerGrpNamev4).ApplyPolicy().ImportPolicy().State()) for _, val := range policytel { if val != policy { @@ -414,7 +414,7 @@ func verifyPolicyTelemetry(t *testing.T, dut *ondatra.DUTDevice, policy string) } } } else { - 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() policytelv4 := gnmi.Get(t, dut, statePath.PeerGroup(peerGrpNamev4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy().ImportPolicy().State()) policytelv6 := gnmi.Get(t, dut, statePath.PeerGroup(peerGrpNamev6).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy().ImportPolicy().State()) for _, val := range policytelv4 { @@ -596,7 +596,7 @@ func TestEstablish(t *testing.T) { fptest.ConfigureDefaultNetworkInstance(t, dut) // Configure BGP+Neighbors on the DUT. t.Logf("Start DUT BGP Config") - 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)) gnmi.Delete(t, dut, dutConfPath.Config()) d := &oc.Root{} rpl, err := configureBGPPolicy(d, t) @@ -707,7 +707,7 @@ func TestBGPPolicy(t *testing.T) { ate := ondatra.ATE(t, "ate") // Configure Routing Policy on the DUT. - dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() fptest.LogQuery(t, "DUT BGP Config before", dutConfPath.Config(), gnmi.Get(t, dut, dutConfPath.Config())) d := &oc.Root{} t.Log("Configure BGP Policy with BGP actions on the neighbor") @@ -720,7 +720,7 @@ func TestBGPPolicy(t *testing.T) { // Configure ATE to setup traffic. otg := ate.OTG() otgConfig := configureATE(t, otg) - gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Config(), bgp) + gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config(), bgp) // Verify the OTG BGP state t.Logf("Verify OTG BGP sessions up") diff --git a/feature/bgp/policybase/otg_tests/statement_insertion_removal/statement_insertion_removal_test.go b/feature/bgp/policybase/otg_tests/statement_insertion_removal/statement_insertion_removal_test.go index 565465438be..69a5ee90138 100644 --- a/feature/bgp/policybase/otg_tests/statement_insertion_removal/statement_insertion_removal_test.go +++ b/feature/bgp/policybase/otg_tests/statement_insertion_removal/statement_insertion_removal_test.go @@ -210,7 +210,7 @@ func bgpCreateNbr(localAs, peerAs uint32, dut *ondatra.DUTDevice) *oc.NetworkIns // Configure BGP on DUT dutOcRoot := &oc.Root{} ni1 := dutOcRoot.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() @@ -249,7 +249,7 @@ func bgpCreateNbr(localAs, peerAs uint32, dut *ondatra.DUTDevice) *oc.NetworkIns func verifyBgpState(t *testing.T, dut *ondatra.DUTDevice) { 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() t.Logf("Waiting for BGP neighbor to establish...") for _, nbr := range ebgpNbrs { @@ -320,21 +320,21 @@ func TestStatementInsertionRemoval(t *testing.T) { otg := ate.OTG() configureDUT(t, 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)) gnmi.Delete(t, dut, dutConfPath.Config()) dutConf := bgpCreateNbr(dutAS, ateAS, dut) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) configureOTG(t, otg) verifyBgpState(t, dut) - bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) t.Run("initial_policy", func(t *testing.T) { rp := createRoutePolicy(t, dut, communitySetsConfigurations["initial"]) gnmi.Replace(t, dut, gnmi.OC().RoutingPolicy().Config(), rp) - pathV4 := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().PeerGroup(peerGrpName).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() + pathV4 := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().PeerGroup(peerGrpName).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() d := &oc.Root{} - policyV4 := d.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").GetOrCreateBgp().GetOrCreatePeerGroup(peerGrpName).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() + policyV4 := d.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreatePeerGroup(peerGrpName).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() policyV4.SetImportPolicy([]string{policyName}) policyV4.SetExportPolicy([]string{policyName}) gnmi.Update(t, dut, pathV4.Config(), policyV4) diff --git a/feature/bgp/prefixlimit/otg_tests/bgp_prefix_limit_test/bgp_prefix_limit_test.go b/feature/bgp/prefixlimit/otg_tests/bgp_prefix_limit_test/bgp_prefix_limit_test.go index 888de00c575..a51912bfc4c 100644 --- a/feature/bgp/prefixlimit/otg_tests/bgp_prefix_limit_test/bgp_prefix_limit_test.go +++ b/feature/bgp/prefixlimit/otg_tests/bgp_prefix_limit_test/bgp_prefix_limit_test.go @@ -140,7 +140,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 := createBGPNeighbor(dutAS, ateAS, prefixLimit, grRestartTime, dut) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) } @@ -297,7 +297,7 @@ func createBGPNeighbor(localAs, peerAs, pLimit uint32, restartTime uint16, dut * 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() @@ -378,7 +378,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(ateDst.IPv4) nbrPathv6 := statePath.Neighbor(ateDst.IPv6) compare := func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool { @@ -478,7 +478,7 @@ func (tc *testCase) verifyBGPTelemetry(t *testing.T, dut *ondatra.DUTDevice) { return ok && c == installedRoutes } t.Log("Verifying BGP state") - 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() prefixes := statePath.Neighbor(ateDst.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Prefixes() if got, ok := gnmi.Watch(t, dut, prefixes.Received().State(), 2*time.Minute, compare).Await(t); !ok { t.Errorf("Received prefixes v4 mismatch: got %v, want %v", got, installedRoutes) diff --git a/feature/bgp/route_selection/otg_tests/route_leakage_between_nondefault_vrfs/route_leakage_between_nondefault_vrfs_test.go b/feature/bgp/route_selection/otg_tests/route_leakage_between_nondefault_vrfs/route_leakage_between_nondefault_vrfs_test.go index 322ff68b75a..c987d30c5ad 100644 --- a/feature/bgp/route_selection/otg_tests/route_leakage_between_nondefault_vrfs/route_leakage_between_nondefault_vrfs_test.go +++ b/feature/bgp/route_selection/otg_tests/route_leakage_between_nondefault_vrfs/route_leakage_between_nondefault_vrfs_test.go @@ -271,8 +271,8 @@ func configureATE(t *testing.T, ate *ondatra.ATEDevice) gosnappi.Config { func verifyBGP(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() - bgpPath1 := gnmi.OC().NetworkInstance(vrf1Name).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() - bgpPath2 := gnmi.OC().NetworkInstance(vrf2Name).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + bgpPath1 := gnmi.OC().NetworkInstance(vrf1Name).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() + bgpPath2 := gnmi.OC().NetworkInstance(vrf2Name).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() t.Logf("Waiting for BGP session to be ESTABLISHED in %s", vrf1Name) status1, ok := gnmi.Watch(t, dut, bgpPath1.Neighbor(otgPort1.IPv4).SessionState().State(), bgpWaitTime, func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool { @@ -445,7 +445,7 @@ func enableDefaultVRFBGP(t *testing.T, dut *ondatra.DUTDevice) { d := gnmi.OC() bgp := &oc.NetworkInstance_Protocol{ Identifier: oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, - Name: ygot.String("BGP"), + Name: ygot.String(deviations.NwInstBgpProtoName(dut)), Enabled: ygot.Bool(true), Bgp: &oc.NetworkInstance_Protocol_Bgp{}, } @@ -453,7 +453,7 @@ func enableDefaultVRFBGP(t *testing.T, dut *ondatra.DUTDevice) { As: ygot.Uint32(globalAS), RouterId: ygot.String("1.1.1.1"), } - gnmi.Replace(t, dut, d.NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Config(), bgp) + gnmi.Replace(t, dut, d.NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config(), bgp) } func configureVrf(t *testing.T, dut *ondatra.DUTDevice, vrfName, interfaceName, routerId, peerAddress string, routerAS, peerAS uint32) { @@ -465,7 +465,7 @@ func configureVrf(t *testing.T, dut *ondatra.DUTDevice, vrfName, interfaceName, niIntf.Interface = ygot.String(interfaceName) niIntf.Subinterface = ygot.Uint32(0) - proto := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + proto := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) bgp := proto.GetOrCreateBgp() global := bgp.GetOrCreateGlobal() global.As = ygot.Uint32(routerAS) diff --git a/feature/bgp/static_route_bgp_redistribution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go b/feature/bgp/static_route_bgp_redistribution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go index 4695a573d87..32a43689cee 100644 --- a/feature/bgp/static_route_bgp_redistribution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go +++ b/feature/bgp/static_route_bgp_redistribution/otg_tests/static_route_bgp_redistribution_test/static_route_bgp_redistribution_test.go @@ -212,7 +212,7 @@ func configureDUTBGP(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() dutOcRoot := &oc.Root{} - bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) if deviations.DefaultBgpInstanceName(dut) != "" { bgpPath = gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.DefaultBgpInstanceName(dut)) } @@ -229,7 +229,7 @@ func configureDUTBGP(t *testing.T, dut *ondatra.DUTDevice) { // setup BGP networkInstance := dutOcRoot.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)) - networkInstanceProtocolBgp := networkInstance.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + networkInstanceProtocolBgp := networkInstance.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) networkInstanceProtocolBgp.SetEnabled(true) if deviations.DefaultBgpInstanceName(dut) != "" { @@ -330,7 +330,7 @@ func awaitBGPEstablished(t *testing.T, dut *ondatra.DUTDevice, neighbors []strin for _, neighbor := range neighbors { if deviations.DefaultBgpInstanceName(dut) == "" { 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*240, oc.Bgp_Neighbor_SessionState_ESTABLISHED) diff --git a/feature/bgp/tests/local_bgp_test/local_bgp_test.go b/feature/bgp/tests/local_bgp_test/local_bgp_test.go index eb3cddfa456..7e86290f1e3 100644 --- a/feature/bgp/tests/local_bgp_test/local_bgp_test.go +++ b/feature/bgp/tests/local_bgp_test/local_bgp_test.go @@ -68,7 +68,7 @@ func bgpWithNbr(nbr *oc.NetworkInstance_Protocol_Bgp_Neighbor, 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() bgp.GetOrCreateGlobal().SetAs(cfg.as) bgp.GetOrCreateGlobal().GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).SetEnabled(true) @@ -122,7 +122,7 @@ func configureRoutePolicy(t *testing.T, dut *ondatra.DUTDevice, name string, pr // 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()) + gnmi.BatchDelete(resetBatch, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config()) if deviations.NetworkInstanceTableDeletionRequired(dut) { tablePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).TableAny() @@ -162,9 +162,9 @@ func TestEstablish(t *testing.T) { } // Get BGP paths - dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") - ateConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") - statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) + ateConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) + statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() nbrPath := statePath.Neighbor(ateAttrs.IPv4) for _, applyPolicyToAfiSafi := range []bool{true, false} { @@ -238,9 +238,9 @@ func TestDisconnect(t *testing.T) { ate := ondatra.DUT(t, "dut2") configureRoutePolicy(t, dut, policyName, oc.RoutingPolicy_PolicyResultType_ACCEPT_ROUTE) configureRoutePolicy(t, ate, policyName, oc.RoutingPolicy_PolicyResultType_ACCEPT_ROUTE) - dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") - ateConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") - statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) + ateConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) + statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() ateIP := ateAttrs.IPv4 dutIP := dutAttrs.IPv4 nbrPath := statePath.Neighbor(ateIP) @@ -294,9 +294,9 @@ func TestParameters(t *testing.T) { ate := ondatra.DUT(t, "dut2") configureRoutePolicy(t, dut, policyName, oc.RoutingPolicy_PolicyResultType_ACCEPT_ROUTE) configureRoutePolicy(t, ate, policyName, oc.RoutingPolicy_PolicyResultType_ACCEPT_ROUTE) - dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") - ateConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") - statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + dutConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) + ateConfPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) + statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() nbrPath := statePath.Neighbor(ateIP) // Configure Network instance type, it has to be configured explicitly by user. @@ -480,7 +480,7 @@ func TestParameters(t *testing.T) { wantState1.GetOrCreateGlobal().GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Enabled = nil wantState1.GetOrCreateNeighbor(ateAttrs.IPv4).Enabled = nil } - 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() if description := gnmi.Get(t, dut, bgpPath.PeerGroup(peerGrpName).Description().State()); description != descriptionPeerGrp { t.Errorf("Peer group description: got %v, want %v", description, descriptionPeerGrp) } diff --git a/feature/bgp/timers/otg_tests/bgp_keepalive_and_holdtimer_configuration_test/bgp_keepalive_and_holdtimer_configuration_test.go b/feature/bgp/timers/otg_tests/bgp_keepalive_and_holdtimer_configuration_test/bgp_keepalive_and_holdtimer_configuration_test.go index f8d8dc816e9..885dfece089 100644 --- a/feature/bgp/timers/otg_tests/bgp_keepalive_and_holdtimer_configuration_test/bgp_keepalive_and_holdtimer_configuration_test.go +++ b/feature/bgp/timers/otg_tests/bgp_keepalive_and_holdtimer_configuration_test/bgp_keepalive_and_holdtimer_configuration_test.go @@ -238,7 +238,7 @@ func ateFlowConfig(t *testing.T, topo gosnappi.Config, srcEth gosnappi.DeviceEth func bgpCreateNbr(dut *ondatra.DUTDevice) *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() global := bgp.GetOrCreateGlobal() global.As = ygot.Uint32(uint32(bgpGlobalAttrs.dutAS)) @@ -327,7 +327,7 @@ const ( func (tc *testCase) bgpTimersConfig(t *testing.T, dut *ondatra.DUTDevice) *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() switch tc.bgpConfigType { @@ -350,7 +350,7 @@ func (tc *testCase) bgpTimersConfig(t *testing.T, dut *ondatra.DUTDevice) *oc.Ne // waitForBGPSession waits for the BGP session state to become established. 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(ateDst.IPv4) nbrPathv6 := statePath.Neighbor(ateDst.IPv6) compare := func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool { @@ -422,7 +422,7 @@ func (tc *testCase) verifyPortsUp(t *testing.T, dev *ondatra.Device) { // verifyBGPTimers verify BGP timers like keepalive timer and hold timer. func (tc *testCase) verifyBGPTimers(t *testing.T, dut *ondatra.DUTDevice) { t.Log("Verifying BGP timers") - 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() switch tc.bgpConfigType { case bgpConfigTypeNeighbor: for _, nbr := range bgpNbrs { @@ -477,7 +477,7 @@ func (tc *testCase) run(t *testing.T, conf *config, dut *ondatra.DUTDevice, ate t.Log(tc.desc) configureBGPRoutes(t, conf, uint32(tc.numRoutes)) // Configure BGP Timers - 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.Logf("Start DUT BGP Config") dutBgpTimerConf := tc.bgpTimersConfig(t, dut) gnmi.Update(t, dut, dutConfPath.Config(), dutBgpTimerConf) @@ -498,7 +498,7 @@ func (tc *testCase) run(t *testing.T, conf *config, dut *ondatra.DUTDevice, ate // Verify BGP Neighbor Descriptions for _, nbr := range bgpNbrs { neighborDescription := "Description for neigbor " + nbr.neighborip - 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() if description := gnmi.Get(t, dut, bgpPath.Neighbor(nbr.neighborip).Description().State()); description != neighborDescription { t.Errorf("Neighbor description: got %v, want %v", description, neighborDescription) } @@ -515,7 +515,7 @@ func configureDUTATE(t *testing.T) (*config, *ondatra.DUTDevice, *ondatra.ATEDev configureRoutePolicy(t, dut, bgpGlobalAttrs.rplName, oc.RoutingPolicy_PolicyResultType_ACCEPT_ROUTE) fptest.ConfigureDefaultNetworkInstance(t, dut) t.Logf("Start DUT BGP Config") - 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)) dutConf := bgpCreateNbr(dut) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) fptest.LogQuery(t, "DUT BGP Config", dutConfPath.Config(), gnmi.Get(t, dut, dutConfPath.Config())) diff --git a/feature/gnmi/otg_tests/drained_configuration_convergence_time/drained_configuration_convergence_time_bgp_test.go b/feature/gnmi/otg_tests/drained_configuration_convergence_time/drained_configuration_convergence_time_bgp_test.go index 099f1116986..7222465257b 100644 --- a/feature/gnmi/otg_tests/drained_configuration_convergence_time/drained_configuration_convergence_time_bgp_test.go +++ b/feature/gnmi/otg_tests/drained_configuration_convergence_time/drained_configuration_convergence_time_bgp_test.go @@ -125,7 +125,7 @@ func setASPath(t *testing.T, dut *ondatra.DUTDevice, d *oc.Root) { // setPolicyPeerGroup to set BGP Import policy. func setPolicyPeerGroup(t *testing.T, dut *ondatra.DUTDevice, d *oc.Root, policy []string) { netInstance := d.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)) - bgp := netInstance.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").GetOrCreateBgp() + bgp := netInstance.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp() pg := bgp.GetOrCreatePeerGroup(setup.PeerGrpName) pg.PeerAs = ygot.Uint32(setup.ATEAs) pg.PeerGroupName = ygot.String(setup.PeerGrpName) @@ -134,18 +134,18 @@ func setPolicyPeerGroup(t *testing.T, dut *ondatra.DUTDevice, d *oc.Root, policy if deviations.RoutePolicyUnderAFIUnsupported(dut) { pgpolicy := pg.GetOrCreateApplyPolicy() pgpolicy.ImportPolicy = policy - gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().PeerGroup(setup.PeerGrpName).Config(), pg) + gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().PeerGroup(setup.PeerGrpName).Config(), pg) } else { pgpolicy := afipg.GetOrCreateApplyPolicy() pgpolicy.ImportPolicy = policy - gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().PeerGroup(setup.PeerGrpName).Config(), pg) + gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().PeerGroup(setup.PeerGrpName).Config(), pg) } } // setPolicyAfiSafi applies an import policy at the AFI-SAFI level, if supported. func setPolicyAfiSafi(t *testing.T, dut *ondatra.DUTDevice, d *oc.Root, policy []string) { netInstance := d.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)) - bgp := netInstance.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").GetOrCreateBgp() + bgp := netInstance.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp() pg := bgp.GetOrCreatePeerGroup(setup.PeerGrpName) pg.PeerAs = ygot.Uint32(setup.ATEAs) pg.PeerGroupName = ygot.String(setup.PeerGrpName) @@ -156,7 +156,7 @@ func setPolicyAfiSafi(t *testing.T, dut *ondatra.DUTDevice, d *oc.Root, policy [ afipg.Enabled = ygot.Bool(true) pgpolicy := afipg.GetOrCreateApplyPolicy() pgpolicy.ImportPolicy = policy - gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().PeerGroup(setup.PeerGrpName).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Config(), afipg) + gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().PeerGroup(setup.PeerGrpName).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Config(), afipg) } } @@ -166,7 +166,7 @@ func isConverged(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATEDevice, a time.Sleep(10 * time.Second) // Check if all prefixes are learned at ATE. statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)). - Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() prefixLoop: for repeat := 4; repeat > 0; repeat-- { prefixesv4 := statePath.Neighbor(setup.ATEIPList[ap.ID()].String()). @@ -187,7 +187,7 @@ prefixLoop: func replacePeerGroupExportPolicy(t *testing.T, dut *ondatra.DUTDevice, policy string) { bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)). - Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() if deviations.RoutePolicyUnderAFIUnsupported(dut) { policyPath := bgpPath.PeerGroup(setup.PeerGrpName).ApplyPolicy() applyPolicy, present := gnmi.Lookup(t, dut, policyPath.Config()).Val() @@ -209,7 +209,7 @@ func replacePeerGroupExportPolicy(t *testing.T, dut *ondatra.DUTDevice, policy s func deletePeerGroupApplyPolicy(t *testing.T, dut *ondatra.DUTDevice) { bgpPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)). - Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() peerGroupPath := bgpPath.PeerGroup(setup.PeerGrpName) if deviations.RoutePolicyUnderAFIUnsupported(dut) { gnmi.Delete(t, dut, peerGroupPath.ApplyPolicy().Config()) diff --git a/feature/gnmi/tests/full_configuration_replace_test/full_configuration_replace_test.go b/feature/gnmi/tests/full_configuration_replace_test/full_configuration_replace_test.go index d690fdd535d..56c4d3c9cee 100644 --- a/feature/gnmi/tests/full_configuration_replace_test/full_configuration_replace_test.go +++ b/feature/gnmi/tests/full_configuration_replace_test/full_configuration_replace_test.go @@ -64,7 +64,7 @@ func TestGnmiFullConfigReplace(t *testing.T) { fptest.ConfigureDefaultNetworkInstance(t, dut) t.Log("Cleanup exisitng BGP and ISIS configs on DUT before configuring test configs") - dutBGPPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + dutBGPPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) gnmi.Delete(t, dut, dutBGPPath.Config()) dutISISPath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_ISIS, setup.ISISInstance) gnmi.Delete(t, dut, dutISISPath.Config()) diff --git a/feature/gnmi/tests/union_replace_test/union_replace_test.go b/feature/gnmi/tests/union_replace_test/union_replace_test.go index 0de4013d371..66ea4708a43 100644 --- a/feature/gnmi/tests/union_replace_test/union_replace_test.go +++ b/feature/gnmi/tests/union_replace_test/union_replace_test.go @@ -58,11 +58,10 @@ const ( descOCDescP1 = "oc-desc-p1" descCLIDescP2 = "cli-desc-p2" - bgpProtocolName = "BGP" - bgpASOC = uint32(64496) - bgpASCLI = uint32(64497) - policyName = "OVERLAP_POLICY_1" - badIntfMTU = uint16(5000) + bgpASOC = uint32(64496) + bgpASCLI = uint32(64497) + policyName = "OVERLAP_POLICY_1" + badIntfMTU = uint16(5000) breakoutNumChannel = 2 groupIndex = 0 @@ -1879,8 +1878,8 @@ func TestUnionReplace(t *testing.T) { var errs []error t.Log("Get configuration from DUT") t.Log("Set BGP AS in OC and CLI (overlap)") - configPath := gnmi.OC().NetworkInstance(defaultNI).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpProtocolName).Bgp().Global().As().Config() - statePath := gnmi.OC().NetworkInstance(defaultNI).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpProtocolName).Bgp().Global().As().State() + configPath := gnmi.OC().NetworkInstance(defaultNI).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Global().As().Config() + statePath := gnmi.OC().NetworkInstance(defaultNI).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Global().As().State() beforeConfig, beforeConfigPresent := gnmi.Lookup(t, dut, configPath).Val() beforeState, beforeStatePresent := gnmi.Lookup(t, dut, statePath).Val() @@ -1888,7 +1887,7 @@ func TestUnionReplace(t *testing.T) { ni := ocDelta.GetOrCreateNetworkInstance(defaultNI) ni.Type = oc.NetworkInstanceTypes_NETWORK_INSTANCE_TYPE_DEFAULT_INSTANCE bgp := ni. - GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, bgpProtocolName). + GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)). GetOrCreateBgp() global := bgp.GetOrCreateGlobal() global.As = ygot.Uint32(bgpASOC) diff --git a/feature/gnoi/os/tests/osinstall/osinstall_test.go b/feature/gnoi/os/tests/osinstall/osinstall_test.go index 3b06485c9ee..e224c6ee6d4 100644 --- a/feature/gnoi/os/tests/osinstall/osinstall_test.go +++ b/feature/gnoi/os/tests/osinstall/osinstall_test.go @@ -490,7 +490,7 @@ func TestPushAndVerifyBGPConfig(t *testing.T) { gnmi.Replace(t, dut, dutConfNIPath.Type().Config(), oc.NetworkInstanceTypes_NETWORK_INSTANCE_TYPE_DEFAULT_INSTANCE) t.Logf("Create and push BGP config to the 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)) dutConf := bgpCreateNbr(dut) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) @@ -511,7 +511,7 @@ func TestPushAndVerifyBGPConfig(t *testing.T) { func bgpCreateNbr(dut *ondatra.DUTDevice) *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() global := bgp.GetOrCreateGlobal() global.As = ygot.Uint32(uint32(bgpGlobalAttrs.dutAS)) diff --git a/feature/gnoi/system/tests/sso_extended_stability_test/sso_extended_stability_test.go b/feature/gnoi/system/tests/sso_extended_stability_test/sso_extended_stability_test.go index 32172526e5c..368c6c2b9cc 100644 --- a/feature/gnoi/system/tests/sso_extended_stability_test/sso_extended_stability_test.go +++ b/feature/gnoi/system/tests/sso_extended_stability_test/sso_extended_stability_test.go @@ -39,7 +39,6 @@ import ( const ( maxSwitchoverTime = 900 controlcardType = oc.PlatformTypes_OPENCONFIG_HARDWARE_COMPONENT_CONTROLLER_CARD - bgpName = "BGP" ptBGP = oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP ) @@ -361,20 +360,20 @@ func configureVRFsAndBgp(t *testing.T, dut *ondatra.DUTDevice, bs *cfgplugins.BG if _, ok := bs.DUTConf.NetworkInstance[defaultNiName]; ok { delete(bs.DUTConf.NetworkInstance[defaultNiName].Protocol, oc.NetworkInstance_Protocol_Key{ Identifier: ptBGP, - Name: bgpName, + Name: deviations.NwInstBgpProtoName(dut), }) if len(bs.DUTConf.NetworkInstance[defaultNiName].Protocol) == 0 { bs.DUTConf.NetworkInstance[defaultNiName].Protocol = nil } } } else { - bs.DUTConf.GetOrCreateNetworkInstance(defaultNiName).GetOrCreateProtocol(ptBGP, bgpName).GetOrCreateBgp().GetOrCreateGlobal().SetAs(65000) + bs.DUTConf.GetOrCreateNetworkInstance(defaultNiName).GetOrCreateProtocol(ptBGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateGlobal().SetAs(65000) } if deviations.BgpAfiSafiInDefaultNiBeforeOtherNi(dut) { // The parent address family must be initialized in the default network // instance before IPv4 unicast can be enabled in the L3VRFs. Only the // global config is added; neighbors stay in the VRFs. - defaultGlobal := bs.DUTConf.GetOrCreateNetworkInstance(defaultNiName).GetOrCreateProtocol(ptBGP, bgpName).GetOrCreateBgp().GetOrCreateGlobal() + defaultGlobal := bs.DUTConf.GetOrCreateNetworkInstance(defaultNiName).GetOrCreateProtocol(ptBGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateGlobal() defaultGlobal.SetAs(65000) defaultGlobal.SetRouterId(bs.DUTPorts[0].IPv4) defaultGR := defaultGlobal.GetOrCreateGracefulRestart() @@ -416,7 +415,7 @@ func configureVRFsAndBgp(t *testing.T, dut *ondatra.DUTDevice, bs *cfgplugins.BG } // 3. Configure BGP protocols and Graceful Restart on the VRFs - transitBgpProto := transitNi.GetOrCreateProtocol(ptBGP, bgpName) + transitBgpProto := transitNi.GetOrCreateProtocol(ptBGP, deviations.NwInstBgpProtoName(dut)) transitBgp := transitBgpProto.GetOrCreateBgp() transitGlobal := transitBgp.GetOrCreateGlobal() transitGlobal.As = ygot.Uint32(65000) @@ -434,7 +433,7 @@ func configureVRFsAndBgp(t *testing.T, dut *ondatra.DUTDevice, bs *cfgplugins.BG } transitPg.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Enabled = ygot.Bool(true) - decapBgpProto := decapNi.GetOrCreateProtocol(ptBGP, bgpName) + decapBgpProto := decapNi.GetOrCreateProtocol(ptBGP, deviations.NwInstBgpProtoName(dut)) decapBgp := decapBgpProto.GetOrCreateBgp() decapGlobal := decapBgp.GetOrCreateGlobal() decapGlobal.As = ygot.Uint32(65000) @@ -714,7 +713,7 @@ func TestSSOSoftwareStability(t *testing.T) { gnmi.Delete(t, dut, gnmi.OC().NetworkInstance("DECAP_TE_VRF").Config()) gnmi.Delete(t, dut, gnmi.OC().RoutingPolicy().PolicyDefinition("SSO-PERMIT-ALL").Config()) if deviations.ExplicitEnableBGPOnDefaultVRF(dut) || deviations.BgpAfiSafiInDefaultNiBeforeOtherNi(dut) { - gnmi.Delete(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(ptBGP, bgpName).Config()) + gnmi.Delete(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(ptBGP, deviations.NwInstBgpProtoName(dut)).Config()) } gnmi.Delete(t, dut, gnmi.OC().Qos().Config()) }) @@ -743,7 +742,7 @@ func TestSSOSoftwareStability(t *testing.T) { if i >= 2 { vrf = "DECAP_TE_VRF" } - statePath := gnmi.OC().NetworkInstance(vrf).Protocol(ptBGP, bgpName).Bgp().Neighbor(otgPort.IPv4).SessionState().State() + statePath := gnmi.OC().NetworkInstance(vrf).Protocol(ptBGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(otgPort.IPv4).SessionState().State() gnmi.Watch(t, dut, statePath, 5*time.Minute, func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool { state, present := val.Val() return present && state == oc.Bgp_Neighbor_SessionState_ESTABLISHED diff --git a/feature/gribi/otg_tests/encap_frr/encap_frr_test.go b/feature/gribi/otg_tests/encap_frr/encap_frr_test.go index dc888585496..9ac725cfe72 100644 --- a/feature/gribi/otg_tests/encap_frr/encap_frr_test.go +++ b/feature/gribi/otg_tests/encap_frr/encap_frr_test.go @@ -516,7 +516,7 @@ func configureISIS(t *testing.T, dut *ondatra.DUTDevice, intfName, dutAreaAddres func bgpCreateNbr(localAs uint32, dut *ondatra.DUTDevice) *oc.NetworkInstance_Protocol { dutOcRoot := &oc.Root{} ni1 := dutOcRoot.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() @@ -566,7 +566,7 @@ func verifyISISTelemetry(t *testing.T, dut *ondatra.DUTDevice, dutIntf string) { func verifyBgpTelemetry(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() t.Logf("Verifying BGP state.") - 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() nbrPath := bgpPath.Neighbor(otgIsisPort8LoopV4) // Get BGP adjacency state. @@ -1166,7 +1166,7 @@ func TestEncapFrr(t *testing.T) { t.Log("Configure ISIS on DUT") configureISIS(t, dut, dut.Port(t, "port8").Name(), dutAreaAddress, dutSysID) - 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)) gnmi.Delete(t, dut, dutConfPath.Config()) dutConf := bgpCreateNbr(dutAS, dut) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) diff --git a/feature/gribi/otg_tests/encap_frr_with_reencap_vrf_test/encap_frr_with_reencap_vrf_test.go b/feature/gribi/otg_tests/encap_frr_with_reencap_vrf_test/encap_frr_with_reencap_vrf_test.go index 75f4b646291..6e1d05fb4ad 100644 --- a/feature/gribi/otg_tests/encap_frr_with_reencap_vrf_test/encap_frr_with_reencap_vrf_test.go +++ b/feature/gribi/otg_tests/encap_frr_with_reencap_vrf_test/encap_frr_with_reencap_vrf_test.go @@ -571,7 +571,7 @@ func configureISIS(t *testing.T, dut *ondatra.DUTDevice, intfName, dutAreaAddres func bgpCreateNbr(localAs uint32, dut *ondatra.DUTDevice) *oc.NetworkInstance_Protocol { dutOcRoot := &oc.Root{} ni1 := dutOcRoot.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() @@ -622,7 +622,7 @@ func verifyISISTelemetry(t *testing.T, dut *ondatra.DUTDevice, dutIntf string) { func verifyBgpTelemetry(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() t.Logf("Verifying BGP state.") - 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() nbrPath := bgpPath.Neighbor(otgIsisPort8LoopV4) // Get BGP adjacency state. @@ -1104,7 +1104,7 @@ func TestEncapFrr(t *testing.T) { t.Log("Configure ISIS on DUT") configureISIS(t, dut, dut.Port(t, "port8").Name(), dutAreaAddress, dutSysID) - 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)) gnmi.Delete(t, dut, dutConfPath.Config()) dutConf := bgpCreateNbr(dutAS, dut) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) diff --git a/feature/gribi/otg_tests/fib_failed_due_to_hw_res_exhaust_test/fib_failed_due_to_hw_res_exhaust_test.go b/feature/gribi/otg_tests/fib_failed_due_to_hw_res_exhaust_test/fib_failed_due_to_hw_res_exhaust_test.go index 94d01a10396..74f1be6fb95 100644 --- a/feature/gribi/otg_tests/fib_failed_due_to_hw_res_exhaust_test/fib_failed_due_to_hw_res_exhaust_test.go +++ b/feature/gribi/otg_tests/fib_failed_due_to_hw_res_exhaust_test/fib_failed_due_to_hw_res_exhaust_test.go @@ -110,7 +110,7 @@ var ( func configureBGP(dut *ondatra.DUTDevice) *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() @@ -260,7 +260,7 @@ func TestFibFailDueToHwResExhaust(t *testing.T) { t.Log("Configure/update Network Instance") fptest.ConfigureDefaultNetworkInstance(t, 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)) t.Run("configureBGP", func(t *testing.T) { dutConf := configureBGP(dut) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) @@ -413,7 +413,7 @@ func verifyBgpTelemetry(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() var nbrIP = []string{atePort1.IPv6} t.Logf("Verifying BGP state.") - 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() time.Sleep(30 * time.Second) for _, nbr := range nbrIP { nbrPath := bgpPath.Neighbor(nbr) diff --git a/feature/gribi/otg_tests/gribi_route_test/gribi_route_test.go b/feature/gribi/otg_tests/gribi_route_test/gribi_route_test.go index fe9312e8ab7..3f1a8747fe2 100644 --- a/feature/gribi/otg_tests/gribi_route_test/gribi_route_test.go +++ b/feature/gribi/otg_tests/gribi_route_test/gribi_route_test.go @@ -279,7 +279,7 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice) { fptest.AssignToNetworkInstance(t, dut, p3.Name(), deviations.DefaultNetworkInstance(dut), 0) } configNonDefaultNetworkInstance(t, 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)) gnmi.Delete(t, dut, dutConfPath.Config()) dutConf := bgpCreateNbr(asn, dut) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) @@ -288,7 +288,7 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice) { func bgpCreateNbr(localAs uint32, dut *ondatra.DUTDevice) *oc.NetworkInstance_Protocol { dutOcRoot := &oc.Root{} ni1 := dutOcRoot.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() @@ -603,7 +603,7 @@ func sendTraffic(t *testing.T, args *testArgs, top gosnappi.Config, ate *ondatra func verifyBgpTelemetry(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() t.Logf("Verifying BGP state.") - 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() nbrPath := bgpPath.Neighbor(bgpNbr3.ateIPv4) // Get BGP adjacency state. diff --git a/feature/gribi/otg_tests/gribi_to_bgp_redistribution/gribi_to_bgp_redistribution_test.go b/feature/gribi/otg_tests/gribi_to_bgp_redistribution/gribi_to_bgp_redistribution_test.go index 4586ff80612..ffc271dca3c 100644 --- a/feature/gribi/otg_tests/gribi_to_bgp_redistribution/gribi_to_bgp_redistribution_test.go +++ b/feature/gribi/otg_tests/gribi_to_bgp_redistribution/gribi_to_bgp_redistribution_test.go @@ -244,10 +244,10 @@ func configureRoutingPolicies(t *testing.T, dut *ondatra.DUTDevice) { // ---------------------------- // ATTACH EXPORT POLICY TO BGP // ---------------------------- - policy := root.GetOrCreateNetworkInstance(vrfName).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").GetOrCreateBgp().GetOrCreateNeighbor(atePort2.IPv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() + policy := root.GetOrCreateNetworkInstance(vrfName).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(atePort2.IPv4).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateApplyPolicy() policy.SetExportPolicy([]string{bgpExportPol}) policy.SetDefaultExportPolicy(oc.RoutingPolicy_DefaultPolicyType_REJECT_ROUTE) - path := gnmi.OC().NetworkInstance(vrfName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Neighbor(atePort2.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() + path := gnmi.OC().NetworkInstance(vrfName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort2.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() gnmi.BatchReplace(batch, path.Config(), policy) @@ -313,7 +313,7 @@ func configureDrainPolicy(t *testing.T, dut *ondatra.DUTDevice) { // appendDrainPolicyToExport appends the drain policy to the BGP export policy list applied to the neighbor connected to ATE port2. func appendDrainPolicyToExport(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() - nbrPath := gnmi.OC().NetworkInstance(vrfName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Neighbor(atePort2.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() + nbrPath := gnmi.OC().NetworkInstance(vrfName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort2.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() exportPolicies := []string{drainPolicy, bgpExportPol} gnmi.Replace(t, dut, nbrPath.ExportPolicy().Config(), exportPolicies) } @@ -321,7 +321,7 @@ func appendDrainPolicyToExport(t *testing.T, dut *ondatra.DUTDevice) { // removeDrainPolicyFromExport removes the drain policy from the BGP export chain. func removeDrainPolicyFromExport(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() - ni := gnmi.OC().NetworkInstance(vrfName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + ni := gnmi.OC().NetworkInstance(vrfName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() nbr := ni.Neighbor(atePort2.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).ApplyPolicy() exportPolicies := []string{bgpExportPol} gnmi.Update(t, dut, nbr.ExportPolicy().Config(), exportPolicies) @@ -454,7 +454,7 @@ func checkOTGBGP4Prefix(t *testing.T, otg *otg.OTG, config gosnappi.Config, expe // verifyDUTBGPEstablished verifies on dut for BGP peer establishment. func verifyDUTBGPEstablished(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() - sp := gnmi.OC().NetworkInstance(vrfName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().NeighborAny().SessionState().State() + sp := gnmi.OC().NetworkInstance(vrfName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().NeighborAny().SessionState().State() watch := gnmi.WatchAll(t, dut, sp, 2*time.Minute, func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool { state, ok := val.Val() if !ok || state != oc.Bgp_Neighbor_SessionState_ESTABLISHED { @@ -548,7 +548,7 @@ func validateRoutingPolicyV4(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra. // disableBGPSession disables the BGP session between DUT and ATE Port2 by setting the neighbor "enabled" field to false using OpenConfig via gNMI. func disableBGPSession(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() - path := gnmi.OC().NetworkInstance(vrfName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Neighbor(atePort2.IPv4).Enabled() + path := gnmi.OC().NetworkInstance(vrfName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort2.IPv4).Enabled() gnmi.Replace(t, dut, path.Config(), false) verifyBGPSessionDown(t, dut) } @@ -556,7 +556,7 @@ func disableBGPSession(t *testing.T, dut *ondatra.DUTDevice) { // verifyBGPSessionDown verifies that the BGP session between the DUT and the specified neighbor is in the IDLE state, indicating that the session is administratively disabled or not established. func verifyBGPSessionDown(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() - statePath := gnmi.OC().NetworkInstance(vrfName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Neighbor(atePort2.IPv4).SessionState() + statePath := gnmi.OC().NetworkInstance(vrfName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort2.IPv4).SessionState() state := gnmi.Get(t, dut, statePath.State()) if state != oc.Bgp_Neighbor_SessionState_IDLE { @@ -569,7 +569,7 @@ func verifyBGPSessionDown(t *testing.T, dut *ondatra.DUTDevice) { // enableBGPSession enables the BGP session between DUT and ATE Port2 by setting the neighbor "enabled" field to true using OpenConfig via gNMI. func enableBGPSession(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() - path := gnmi.OC().NetworkInstance(vrfName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Neighbor(atePort2.IPv4).Enabled() + path := gnmi.OC().NetworkInstance(vrfName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort2.IPv4).Enabled() gnmi.Replace(t, dut, path.Config(), true) verifyBGPSessionUp(t, dut) } @@ -578,7 +578,7 @@ func enableBGPSession(t *testing.T, dut *ondatra.DUTDevice) { func verifyBGPSessionUp(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() - statePath := gnmi.OC().NetworkInstance(vrfName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Neighbor(atePort2.IPv4).SessionState() + statePath := gnmi.OC().NetworkInstance(vrfName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(atePort2.IPv4).SessionState() // Wait until BGP session becomes ESTABLISHED state, ok := gnmi.Await(t, dut, statePath.State(), 60*time.Second, oc.Bgp_Neighbor_SessionState_ESTABLISHED).Val() diff --git a/feature/gribi/otg_tests/vrf_policy_driven_te/vrf_policy_driven_te_test.go b/feature/gribi/otg_tests/vrf_policy_driven_te/vrf_policy_driven_te_test.go index 872971b2174..d978b7a2366 100644 --- a/feature/gribi/otg_tests/vrf_policy_driven_te/vrf_policy_driven_te_test.go +++ b/feature/gribi/otg_tests/vrf_policy_driven_te/vrf_policy_driven_te_test.go @@ -784,7 +784,7 @@ func configureISIS(t *testing.T, dut *ondatra.DUTDevice, intfList []string, dutA func bgpCreateNbr(localAs uint32, dut *ondatra.DUTDevice) *oc.NetworkInstance_Protocol { dutOcRoot := &oc.Root{} ni1 := dutOcRoot.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() @@ -885,7 +885,7 @@ func createFlow(flowValues *flowArgs) gosnappi.Flow { func verifyBgpTelemetry(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() t.Logf("Verifying BGP state") - 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() nbrPath := bgpPath.Neighbor(otgIsisPort8LoopV4) // Get BGP adjacency state. @@ -2487,7 +2487,7 @@ func TestGribiDecap(t *testing.T) { t.Log("Configure ISIS on DUT") configureISIS(t, dut, []string{dut.Port(t, "port8").Name(), loopbackIntfName}, dutAreaAddress, dutSysID) - 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)) gnmi.Delete(t, dut, dutConfPath.Config()) dutConf := bgpCreateNbr(dutAS, dut) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) diff --git a/feature/interface/aggregate/otg_tests/aggregate_all_not_viable_test/aggregate_all_not_forwarding_viable_test.go b/feature/interface/aggregate/otg_tests/aggregate_all_not_viable_test/aggregate_all_not_forwarding_viable_test.go index abfc80aa097..72fb759698e 100644 --- a/feature/interface/aggregate/otg_tests/aggregate_all_not_viable_test/aggregate_all_not_forwarding_viable_test.go +++ b/feature/interface/aggregate/otg_tests/aggregate_all_not_viable_test/aggregate_all_not_forwarding_viable_test.go @@ -198,7 +198,7 @@ func TestAggregateAllNotForwardingViable(t *testing.T) { ate.OTG().StartProtocols(t) for _, agg := range []*aggPortData{agg1, agg2, agg3} { - bgpPath := ocpath.Root().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + bgpPath := ocpath.Root().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() gnmi.Await(t, dut, bgpPath.Neighbor(agg.ateIPv4).SessionState().State(), time.Minute, oc.Bgp_Neighbor_SessionState_ESTABLISHED) } @@ -740,7 +740,7 @@ func configureDUTBGP(t *testing.T, dut *ondatra.DUTDevice, aggIDs []string) { d := &oc.Root{} ni := d.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)) - niProto := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + niProto := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) bgp := niProto.GetOrCreateBgp() global := bgp.GetOrCreateGlobal() @@ -796,7 +796,7 @@ func configureDUTBGP(t *testing.T, dut *ondatra.DUTDevice, aggIDs []string) { af6.Enabled = ygot.Bool(true) } - gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Config(), niProto) + gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config(), niProto) } // configureRoutingPolicy configure routing policy on DUT diff --git a/feature/mpls/otg_tests/static_bgp_nexthop/static_bgp_nexthop_test.go b/feature/mpls/otg_tests/static_bgp_nexthop/static_bgp_nexthop_test.go index 30d08553930..fddc6202cc4 100644 --- a/feature/mpls/otg_tests/static_bgp_nexthop/static_bgp_nexthop_test.go +++ b/feature/mpls/otg_tests/static_bgp_nexthop/static_bgp_nexthop_test.go @@ -212,7 +212,7 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice) []*oc.Interface { fptest.ConfigureDefaultNetworkInstance(t, dut) configureRoutePolicy(t, dut, rplName, rplType) - dutConfPath := d.NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + dutConfPath := d.NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) dutConf := createBGPNeighborPort2(dutAS, ateAS, dut, true, true) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) return interfaces @@ -379,7 +379,7 @@ func configureRoutePolicy(t *testing.T, dut *ondatra.DUTDevice, name string, pr func createBGPNeighborPort2(localAs, peerAs uint32, dut *ondatra.DUTDevice, v4shut, v6shut bool) *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() global := bgp.GetOrCreateGlobal() @@ -428,7 +428,7 @@ func createBGPNeighborPort2(localAs, peerAs uint32, dut *ondatra.DUTDevice, v4sh // Validate BGP neighbor established func checkBgpStatus(t *testing.T, dut *ondatra.DUTDevice) { t.Log("Verifying BGP state") - 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(atePort2.IPv4) nbrPathv6 := statePath.Neighbor(atePort2.IPv6) diff --git a/feature/networkinstance/local_aggregates/tests/policy_advertise_aggregate_test/policy_advertise_aggregate_test.go b/feature/networkinstance/local_aggregates/tests/policy_advertise_aggregate_test/policy_advertise_aggregate_test.go index be53ba3b2d9..5d9bf92539b 100644 --- a/feature/networkinstance/local_aggregates/tests/policy_advertise_aggregate_test/policy_advertise_aggregate_test.go +++ b/feature/networkinstance/local_aggregates/tests/policy_advertise_aggregate_test/policy_advertise_aggregate_test.go @@ -96,7 +96,7 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice) { gnmi.Replace(t, dut, dc.RoutingPolicy().Config(), routingPolicy) t.Log("Configuring BGP...") - bgpProtocol := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + bgpProtocol := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) bgp := bgpProtocol.GetOrCreateBgp() global := bgp.GetOrCreateGlobal() @@ -111,7 +111,7 @@ func configureDUT(t *testing.T, dut *ondatra.DUTDevice) { afiSafi.SetEnabled(true) afiSafi.GetOrCreateApplyPolicy().SetImportPolicy([]string{triggerRoutePolicyName}) - gnmi.Update(t, dut, dc.NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Config(), bgpProtocol) + gnmi.Update(t, dut, dc.NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config(), bgpProtocol) cfgplugins.RoutingPolicyBGPAdvertiseAggregate(t, dut, triggerRoutePolicyName, triggerRoute, generatedRoutePolicyName, defaultRoute, dutAS, localAggregateName) } @@ -147,7 +147,7 @@ func configureATE(t *testing.T, ate *ondatra.ATEDevice) gosnappi.Config { func verifyBGPTelemetry(t *testing.T, dut *ondatra.DUTDevice) { t.Log("Verifying BGP session state...") dni := deviations.DefaultNetworkInstance(dut) - bgpPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + bgpPath := gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() neighborPath := bgpPath.Neighbor(atePort1.IPv4) verifySessionState := func(v *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool { diff --git a/feature/p4rt/otg_tests/traceroute_packetin_with_vrf_selection_test/traceroute_packetin_with_vrf_selection_test.go b/feature/p4rt/otg_tests/traceroute_packetin_with_vrf_selection_test/traceroute_packetin_with_vrf_selection_test.go index 624d8f6313c..a2389f19d21 100644 --- a/feature/p4rt/otg_tests/traceroute_packetin_with_vrf_selection_test/traceroute_packetin_with_vrf_selection_test.go +++ b/feature/p4rt/otg_tests/traceroute_packetin_with_vrf_selection_test/traceroute_packetin_with_vrf_selection_test.go @@ -782,7 +782,7 @@ func configureISIS(t *testing.T, dut *ondatra.DUTDevice, intfName, dutAreaAddres func bgpCreateNbr(localAs uint32, dut *ondatra.DUTDevice) *oc.NetworkInstance_Protocol { dutOcRoot := &oc.Root{} ni1 := dutOcRoot.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() @@ -835,7 +835,7 @@ func verifyISISTelemetry(t *testing.T, dut *ondatra.DUTDevice, dutIntf string) { func verifyBgpTelemetry(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() t.Logf("Verifying BGP state.") - 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() nbrPath := bgpPath.Neighbor(otgIsisPort8LoopV4) // Get BGP adjacency state. @@ -1199,7 +1199,7 @@ func TestTraceRoute(t *testing.T) { t.Log("Configure ISIS on DUT") configureISIS(t, dut, dut.Port(t, "port8").Name(), dutAreaAddress, dutSysID) - 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)) gnmi.Delete(t, dut, dutConfPath.Config()) dutConf := bgpCreateNbr(dutAS, dut) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) diff --git a/feature/platform/controllercard/tests/SetRequest_GetRequest_controller_card_switchover/SetRequest_GetRequest_controller_card_switchover_test.go b/feature/platform/controllercard/tests/SetRequest_GetRequest_controller_card_switchover/SetRequest_GetRequest_controller_card_switchover_test.go index 407e64dc0c3..a74a6551ebc 100644 --- a/feature/platform/controllercard/tests/SetRequest_GetRequest_controller_card_switchover/SetRequest_GetRequest_controller_card_switchover_test.go +++ b/feature/platform/controllercard/tests/SetRequest_GetRequest_controller_card_switchover/SetRequest_GetRequest_controller_card_switchover_test.go @@ -259,7 +259,7 @@ func buildConfigBatch(t *testing.T, dut *ondatra.DUTDevice) { gnmi.BatchReplace(configBatch, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_ISIS, isisInstance).Config(), isisProto) - bgpProto := networkInterface.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + bgpProto := networkInterface.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) bgp := bgpProto.GetOrCreateBgp() global := bgp.GetOrCreateGlobal() @@ -291,7 +291,7 @@ func buildConfigBatch(t *testing.T, dut *ondatra.DUTDevice) { af6 = bgpNbrV6.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST) af6.Enabled = ygot.Bool(true) } - gnmi.BatchReplace(configBatch, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Config(), bgpProto) + gnmi.BatchReplace(configBatch, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config(), bgpProto) ethIdx = 0 for lagIdx := 0; ethIdx < numPorts && lagIdx < len(aggIDs); lagIdx++ { @@ -363,7 +363,7 @@ func verifyConfiguredElements(t *testing.T, dut *ondatra.DUTDevice) { // Verify BGP Neighbors dni := deviations.DefaultNetworkInstance(dut) - bgpNeighbors := gnmi.GetAll(t, dut, gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().NeighborAny().NeighborAddress().Config()) + bgpNeighbors := gnmi.GetAll(t, dut, gnmi.OC().NetworkInstance(dni).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().NeighborAny().NeighborAddress().Config()) numBGPNeighbors := len(bgpNeighbors) if numBGPNeighbors != 2*params.NumBGPNeighbors { diff --git a/feature/platform/integrated_circuit/otg_tests/utilization_test/utilization_test.go b/feature/platform/integrated_circuit/otg_tests/utilization_test/utilization_test.go index 6091e90074f..a20fb224edb 100644 --- a/feature/platform/integrated_circuit/otg_tests/utilization_test/utilization_test.go +++ b/feature/platform/integrated_circuit/otg_tests/utilization_test/utilization_test.go @@ -414,7 +414,7 @@ func configureBGPDUT(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() 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() @@ -445,7 +445,7 @@ func configureBGPDUT(t *testing.T, dut *ondatra.DUTDevice) { bgpNbr.PeerGroup = ygot.String(bgpV6PeerGroup) af6 := bgpNbr.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST) af6.Enabled = ygot.Bool(true) - gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Config(), niProto) + gnmi.Replace(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config(), niProto) if deviations.BGPMissingOCMaxPrefixesConfiguration(dut) { cfgplugins.DeviationAristaBGPNeighborMaxPrefixes(t, dut, atePort1.IPv6, 0) } @@ -491,7 +491,7 @@ func verifyBgpTelemetry(t *testing.T, dut *ondatra.DUTDevice) { t.Helper() var nbrIP = []string{atePort1.IPv6} t.Logf("Verifying BGP state.") - 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() for _, nbr := range nbrIP { nbrPath := bgpPath.Neighbor(nbr) diff --git a/feature/policy_forwarding/decapsulation/otg_tests/ip_guev1_static_decap_subnet_range/ip_guev1_static_decap_subnet_range_test.go b/feature/policy_forwarding/decapsulation/otg_tests/ip_guev1_static_decap_subnet_range/ip_guev1_static_decap_subnet_range_test.go index eee2d96e722..c2958c96942 100644 --- a/feature/policy_forwarding/decapsulation/otg_tests/ip_guev1_static_decap_subnet_range/ip_guev1_static_decap_subnet_range_test.go +++ b/feature/policy_forwarding/decapsulation/otg_tests/ip_guev1_static_decap_subnet_range/ip_guev1_static_decap_subnet_range_test.go @@ -253,10 +253,10 @@ func configureBgp(t *testing.T, dut *ondatra.DUTDevice) { nbrList := []*bgpNeighbor{nbr1v4, nbr2v4, nbr1v6, nbr2v6} - 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)) 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() @@ -626,7 +626,7 @@ func verifyCaptureDscpTtlValue(t *testing.T, ate *ondatra.ATEDevice, port string // waitForBGPSession waits for BGP neighbors to reach the expected session state within a fixed timeout. It validates BGPv4 neighbor session state under the default network instance. 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() compare := func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool { state, ok := val.Val() diff --git a/feature/policy_forwarding/decapsulation/otg_tests/ipv4_guev1_decap_and_hashing_test/ipv4_guev1_decap_and_hashing_test.go b/feature/policy_forwarding/decapsulation/otg_tests/ipv4_guev1_decap_and_hashing_test/ipv4_guev1_decap_and_hashing_test.go index b7af0f44b77..86e9759d821 100644 --- a/feature/policy_forwarding/decapsulation/otg_tests/ipv4_guev1_decap_and_hashing_test/ipv4_guev1_decap_and_hashing_test.go +++ b/feature/policy_forwarding/decapsulation/otg_tests/ipv4_guev1_decap_and_hashing_test/ipv4_guev1_decap_and_hashing_test.go @@ -629,7 +629,7 @@ func checkBgpStatus(t *testing.T, dut *ondatra.DUTDevice, neighbors []Neighbor) t.Helper() t.Log("Verifying BGP neighbor sessions (IPv4 and IPv6)") - 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() for idx, nbr := range neighbors { t.Logf("Checking BGP IPv4 neighbor %s (Neighbor %d)", nbr.IPv4, idx+1) diff --git a/feature/policy_forwarding/encapsulation/otg_tests/staticgueencap_and_bgp_path_selection/staticgueencap_and_bgp_path_selection_test.go b/feature/policy_forwarding/encapsulation/otg_tests/staticgueencap_and_bgp_path_selection/staticgueencap_and_bgp_path_selection_test.go index bd1639d7157..7df7f4a7885 100644 --- a/feature/policy_forwarding/encapsulation/otg_tests/staticgueencap_and_bgp_path_selection/staticgueencap_and_bgp_path_selection_test.go +++ b/feature/policy_forwarding/encapsulation/otg_tests/staticgueencap_and_bgp_path_selection/staticgueencap_and_bgp_path_selection_test.go @@ -546,10 +546,10 @@ func configureISIS(t *testing.T, dut *ondatra.DUTDevice) { func bgpCreateNbr(t *testing.T, localAs uint32, dut *ondatra.DUTDevice, nbrs []*bgpNbr) { t.Helper() localAddressLeaf := "" - 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)) dutOcRoot := &oc.Root{} ni1 := dutOcRoot.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() @@ -831,7 +831,7 @@ func validatePrefixes(t *testing.T, dut *ondatra.DUTDevice, neighborIP string, i afiSafi = oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST } - 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() query := bgpPath.Neighbor(neighborIP).AfiSafi(afiSafi).Prefixes().Received().State() if _, ok := gnmi.Watch(t, dut, query, 30*time.Second, func(val *ygnmi.Value[uint32]) bool { v, present := val.Val() diff --git a/feature/policy_forwarding/ethomplsogre/otg_tests/encap_decap_gre/encap_decap_gre_test.go b/feature/policy_forwarding/ethomplsogre/otg_tests/encap_decap_gre/encap_decap_gre_test.go index 52ef2ad3558..465a3660c18 100644 --- a/feature/policy_forwarding/ethomplsogre/otg_tests/encap_decap_gre/encap_decap_gre_test.go +++ b/feature/policy_forwarding/ethomplsogre/otg_tests/encap_decap_gre/encap_decap_gre_test.go @@ -334,7 +334,7 @@ func configureDut(t *testing.T, dut *ondatra.DUTDevice, ocPFParams cfgplugins.Oc configureStaticRoute(t, dut) t.Log("Configuring BGP") - bgpProtocol := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + bgpProtocol := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) bgp := bgpProtocol.GetOrCreateBgp() g := bgp.GetOrCreateGlobal() g.SetAs(dutAS) @@ -354,7 +354,7 @@ func configureDut(t *testing.T, dut *ondatra.DUTDevice, ocPFParams cfgplugins.Oc ipv4Nbr.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).SetEnabled(true) } - gnmi.Update(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Config(), bgpProtocol) + gnmi.Update(t, dut, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config(), bgpProtocol) } func configureStaticRoute(t *testing.T, dut *ondatra.DUTDevice) { diff --git a/feature/policy_forwarding/otg_tests/match_dscp_indirect_next_hop/match_dscp_indirect_next_hop_test.go b/feature/policy_forwarding/otg_tests/match_dscp_indirect_next_hop/match_dscp_indirect_next_hop_test.go index 2482f24816e..a97f301d0e0 100644 --- a/feature/policy_forwarding/otg_tests/match_dscp_indirect_next_hop/match_dscp_indirect_next_hop_test.go +++ b/feature/policy_forwarding/otg_tests/match_dscp_indirect_next_hop/match_dscp_indirect_next_hop_test.go @@ -159,7 +159,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 := createBGPNeighbor(dutAS, ateAS, dut) gnmi.Replace(t, dut, dutConfPath.Config(), dutConf) @@ -335,7 +335,7 @@ func createBGPNeighbor(localAs, peerAs uint32, dut *ondatra.DUTDevice) *oc.Netwo 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() @@ -399,7 +399,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 { @@ -435,7 +435,7 @@ func waitForBGPSession(t *testing.T, dut *ondatra.DUTDevice, wantEstablished boo func verifyPrefixesTelemetryV4(t *testing.T, dut *ondatra.DUTDevice, wantInstalled uint32) { t.Helper() - 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() prefixesv4 := statePath.Neighbor(ateP2.IPv4).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Prefixes() if gotInstalled, ok := gnmi.Watch(t, dut, prefixesv4.Installed().State(), time.Minute, func(v *ygnmi.Value[uint32]) bool { diff --git a/feature/policy_forwarding/vrf_selection/otg_tests/multiple_vrfs_and_gue_decap/multiple_vrfs_and_gue_decap_test.go b/feature/policy_forwarding/vrf_selection/otg_tests/multiple_vrfs_and_gue_decap/multiple_vrfs_and_gue_decap_test.go index 468fa1d0657..88241b1844d 100644 --- a/feature/policy_forwarding/vrf_selection/otg_tests/multiple_vrfs_and_gue_decap/multiple_vrfs_and_gue_decap_test.go +++ b/feature/policy_forwarding/vrf_selection/otg_tests/multiple_vrfs_and_gue_decap/multiple_vrfs_and_gue_decap_test.go @@ -565,7 +565,7 @@ func configureRouteLeakingFromOC(t *testing.T, dut *ondatra.DUTDevice) { // waitForBGPSession - verify BGP session is Established 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() compare := func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool { state, ok := val.Val() diff --git a/feature/policy_forwarding/vrf_selection/otg_tests/vrf_selection/policy_based_vrf_selection_for_ipv4_ipv6_test.go b/feature/policy_forwarding/vrf_selection/otg_tests/vrf_selection/policy_based_vrf_selection_for_ipv4_ipv6_test.go index 61f2d893fba..4f36d7205cb 100644 --- a/feature/policy_forwarding/vrf_selection/otg_tests/vrf_selection/policy_based_vrf_selection_for_ipv4_ipv6_test.go +++ b/feature/policy_forwarding/vrf_selection/otg_tests/vrf_selection/policy_based_vrf_selection_for_ipv4_ipv6_test.go @@ -359,7 +359,7 @@ func configureDUTPort(t *testing.T, dut *ondatra.DUTDevice, attrs *attrs.Attribu } func verifyBGP(t *testing.T, dut *ondatra.DUTDevice, otgPort attrs.Attributes, vrfName string) { - bgpPath := gnmi.OC().NetworkInstance(vrfName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + bgpPath := gnmi.OC().NetworkInstance(vrfName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() t.Logf("Waiting for BGP session to be ESTABLISHED in %s", vrfName) status, ok := gnmi.Watch(t, dut, bgpPath.Neighbor(otgPort.IPv4).SessionState().State(), bgpWaitTime, func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool { diff --git a/feature/qos/otg_tests/egress_traffic_classification_and_rewrite_test/egress_traffic_classification_and_rewrite_test.go b/feature/qos/otg_tests/egress_traffic_classification_and_rewrite_test/egress_traffic_classification_and_rewrite_test.go index 6b5091f7afc..60cdf968ff0 100644 --- a/feature/qos/otg_tests/egress_traffic_classification_and_rewrite_test/egress_traffic_classification_and_rewrite_test.go +++ b/feature/qos/otg_tests/egress_traffic_classification_and_rewrite_test/egress_traffic_classification_and_rewrite_test.go @@ -250,10 +250,10 @@ func ConfigureBgp(t *testing.T, dut *ondatra.DUTDevice) { nbrList := []*bgpNeighbor{nbr1v4, nbr2v4, nbr1v6, nbr2v6} - 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)) 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() @@ -976,7 +976,7 @@ func GetDefaultOcPolicyForwardingParams(t *testing.T, dut *ondatra.DUTDevice, gu // waitForBGPSession wait untill BGP sessions ESTABLISHED 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() compare := func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool { state, ok := val.Val() diff --git a/feature/system/logging/otg_tests/remote_syslog/remote_syslog_test.go b/feature/system/logging/otg_tests/remote_syslog/remote_syslog_test.go index 9e2cbee0198..955c4ce6a2f 100644 --- a/feature/system/logging/otg_tests/remote_syslog/remote_syslog_test.go +++ b/feature/system/logging/otg_tests/remote_syslog/remote_syslog_test.go @@ -139,8 +139,8 @@ func TestRemoteSyslog(t *testing.T) { t.Cleanup(func() { gnmi.Delete(t, dut, gnmi.OC().System().Logging().Config()) - gnmi.Delete(t, dut, gnmi.OC().NetworkInstance(tc.vrf).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_STATIC, "DEFAULT").Static(v4Route+"/30").Config()) - gnmi.Delete(t, dut, gnmi.OC().NetworkInstance(tc.vrf).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_STATIC, "DEFAULT").Static(v6Route+"/126").Config()) + gnmi.Delete(t, dut, gnmi.OC().NetworkInstance(tc.vrf).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_STATIC, deviations.NwInstStaticProtoName(dut)).Static(v4Route+"/30").Config()) + gnmi.Delete(t, dut, gnmi.OC().NetworkInstance(tc.vrf).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_STATIC, deviations.NwInstStaticProtoName(dut)).Static(v6Route+"/126").Config()) if tc.vrf != deviations.DefaultNetworkInstance(dut) { cleanupBatch := &gnmi.SetBatch{} gnmi.BatchDelete(cleanupBatch, gnmi.OC().NetworkInstance(tc.vrf).Config()) diff --git a/feature/system/management/otg_tests/management_ha_test/management_ha_test.go b/feature/system/management/otg_tests/management_ha_test/management_ha_test.go index f0e09d93186..6e8a35f5ac0 100644 --- a/feature/system/management/otg_tests/management_ha_test/management_ha_test.go +++ b/feature/system/management/otg_tests/management_ha_test/management_ha_test.go @@ -99,16 +99,16 @@ func TestManagementHA1(t *testing.T) { true, ) if deviations.BgpAfiSafiInDefaultNiBeforeOtherNi(dut) { - g := bs.DUTConf.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)).GetOrCreateProtocol(cfgplugins.PTBGP, "BGP").GetOrCreateBgp().GetOrCreateGlobal() + g := bs.DUTConf.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)).GetOrCreateProtocol(cfgplugins.PTBGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateGlobal() g.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_L3VPN_IPV6_UNICAST).Enabled = ygot.Bool(true) } - bgp := bs.DUTConf.GetOrCreateNetworkInstance(mgmtVRFName).GetOrCreateProtocol(cfgplugins.PTBGP, "BGP").GetOrCreateBgp() + bgp := bs.DUTConf.GetOrCreateNetworkInstance(mgmtVRFName).GetOrCreateProtocol(cfgplugins.PTBGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp() bgp.GetOrCreateGlobal().GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Enabled = ygot.Bool(true) bgp.GetOrCreateGlobal().GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateUseMultiplePaths().GetOrCreateEbgp() if deviations.SetNoPeerGroup(dut) || deviations.PeerGroupDefEbgpVrfUnsupported(dut) { - bs.DUTConf.GetOrCreateNetworkInstance(mgmtVRFName).GetOrCreateProtocol(cfgplugins.PTBGP, "BGP").GetOrCreateBgp().PeerGroup = nil - neighbors := bs.DUTConf.GetOrCreateNetworkInstance(mgmtVRFName).GetOrCreateProtocol(cfgplugins.PTBGP, "BGP").GetOrCreateBgp().Neighbor + bs.DUTConf.GetOrCreateNetworkInstance(mgmtVRFName).GetOrCreateProtocol(cfgplugins.PTBGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().PeerGroup = nil + neighbors := bs.DUTConf.GetOrCreateNetworkInstance(mgmtVRFName).GetOrCreateProtocol(cfgplugins.PTBGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().Neighbor for _, neighbor := range neighbors { neighbor.PeerGroup = nil } @@ -117,7 +117,7 @@ func TestManagementHA1(t *testing.T) { configureEmulatedNetworks(bs) if deviations.ExplicitEnableBGPOnDefaultVRF(dut) { - bs.DUTConf.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)).GetOrCreateProtocol(cfgplugins.PTBGP, "BGP").GetOrCreateBgp().GetOrCreateGlobal().SetAs(cfgplugins.DutAS) + bs.DUTConf.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)).GetOrCreateProtocol(cfgplugins.PTBGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateGlobal().SetAs(cfgplugins.DutAS) } if dut.Vendor() != ondatra.NOKIA && dut.Vendor() != ondatra.JUNIPER { bs.DUTConf.GetOrCreateNetworkInstance(mgmtVRFName).SetRouteDistinguisher(fmt.Sprintf("%d:%d", cfgplugins.DutAS, 100)) @@ -347,7 +347,7 @@ func createAndAddInterfacesToVRF(t *testing.T, dut *ondatra.DUTDevice, vrfname s } func verifyDUTBGPEstablished(t *testing.T, dut *ondatra.DUTDevice, ni string) bool { - nSessionState := gnmi.OC().NetworkInstance(ni).Protocol(cfgplugins.PTBGP, "BGP").Bgp().NeighborAny().SessionState().State() + nSessionState := gnmi.OC().NetworkInstance(ni).Protocol(cfgplugins.PTBGP, deviations.NwInstBgpProtoName(dut)).Bgp().NeighborAny().SessionState().State() watch := gnmi.WatchAll(t, dut, nSessionState, 2*time.Minute, func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool { state, ok := val.Val() if !ok || state != oc.Bgp_Neighbor_SessionState_ESTABLISHED { @@ -391,14 +391,14 @@ func advertiseDUTLoopbackToATE(t *testing.T, dut *ondatra.DUTDevice, bs *cfgplug if err != nil { t.Fatalf("Failed to create CLI ygnmi query: %v", err) } - cliCfg := getCiscoCLIRedisConfig("BGP", cfgplugins.DutAS, mgmtVRFName) + cliCfg := getCiscoCLIRedisConfig(deviations.NwInstBgpProtoName(dut), cfgplugins.DutAS, mgmtVRFName) gnmi.BatchUpdate(batchSet, cliPath, cliCfg) } else { stmt.GetOrCreateConditions().SetInstallProtocolEq(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_DIRECTLY_CONNECTED) stmt.GetOrCreateActions().PolicyResult = oc.RoutingPolicy_PolicyResultType_ACCEPT_ROUTE for _, neighbor := range []string{bs.ATEPorts[0].IPv6, bs.ATEPorts[1].IPv6} { - pathV6 := gnmi.OC().NetworkInstance(mgmtVRFName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Neighbor(neighbor).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() - policyV6 := root.GetOrCreateNetworkInstance(mgmtVRFName).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").GetOrCreateBgp().GetOrCreateNeighbor(neighbor).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() + pathV6 := gnmi.OC().NetworkInstance(mgmtVRFName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(neighbor).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() + policyV6 := root.GetOrCreateNetworkInstance(mgmtVRFName).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(neighbor).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() policyV6.SetExportPolicy([]string{"rp"}) gnmi.BatchUpdate(batchSet, pathV6.Config(), policyV6) } @@ -460,8 +460,8 @@ func configureImportExportBGPPolicy(t *testing.T, bs *cfgplugins.BGPSession, dut gnmi.BatchUpdate(batchSet, gnmi.OC().RoutingPolicy().Config(), rp) for _, neighbor := range []string{bs.ATEPorts[0].IPv6, bs.ATEPorts[1].IPv6} { - pathV6 := gnmi.OC().NetworkInstance(mgmtVRFName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Neighbor(neighbor).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() - policyV6 := root.GetOrCreateNetworkInstance(mgmtVRFName).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").GetOrCreateBgp().GetOrCreateNeighbor(neighbor).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() + pathV6 := gnmi.OC().NetworkInstance(mgmtVRFName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(neighbor).AfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).ApplyPolicy() + policyV6 := root.GetOrCreateNetworkInstance(mgmtVRFName).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp().GetOrCreateNeighbor(neighbor).GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).GetOrCreateApplyPolicy() policyV6.SetImportPolicy([]string{"importRoutePolicy"}) policyV6.SetExportPolicy([]string{"exportRoutePolicy"}) gnmi.BatchUpdate(batchSet, pathV6.Config(), policyV6) diff --git a/internal/aft_prefix_filtering/aft_prefix_filtering_service.go b/internal/aft_prefix_filtering/aft_prefix_filtering_service.go index f6d6c481977..27b2b95b41a 100644 --- a/internal/aft_prefix_filtering/aft_prefix_filtering_service.go +++ b/internal/aft_prefix_filtering/aft_prefix_filtering_service.go @@ -287,11 +287,11 @@ func ConfigureATE(t *testing.T, ate *ondatra.ATEDevice) (gosnappi.Config, []stri // (1.5M IPv4 and 500k IPv6). func ConfigureBGP(t *testing.T, dut *ondatra.DUTDevice, batch *gnmi.SetBatch, ni *oc.NetworkInstance) { t.Helper() - configureBGPInstance(t, ni, DUTPort1.IPv4, []bgpNeighborSpec{ + configureBGPInstance(t, dut, ni, DUTPort1.IPv4, []bgpNeighborSpec{ {address: ATEPort1.IPv4, peerGroup: bgpV4PeerGroup, v4: true}, {address: ATEPort2.IPv6, peerGroup: bgpV6PeerGroup, v4: false}, }) - gnmi.BatchUpdate(batch, gnmi.OC().NetworkInstance(ni.GetName()).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Config(), ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")) + gnmi.BatchUpdate(batch, gnmi.OC().NetworkInstance(ni.GetName()).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config(), ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut))) } type BGPPrefixParams struct { @@ -327,7 +327,7 @@ func ConfigureScaleBGP(t *testing.T, dut *ondatra.DUTDevice, cfg BGPParams) { t.Helper() v4PeerGroup := fmt.Sprintf("%s-%s", bgpV4PeerGroup, cfg.NetworkInstance.GetName()) v6PeerGroup := fmt.Sprintf("%s-%s", bgpV6PeerGroup, cfg.NetworkInstance.GetName()) - configureBGPInstance(t, cfg.NetworkInstance, cfg.RouterID, []bgpNeighborSpec{ + configureBGPInstance(t, dut, cfg.NetworkInstance, cfg.RouterID, []bgpNeighborSpec{ {address: cfg.V4Neighbor, peerGroup: v4PeerGroup, v4: true}, {address: cfg.V6Neighbor, peerGroup: v6PeerGroup, v4: false}, }) @@ -347,12 +347,12 @@ type bgpNeighborSpec struct { // configureBGPInstance configures a complete eBGP protocol instance in the given network instance. // It applies the supplied router ID and single-AFI neighbors with the accept-all import/export policy. -func configureBGPInstance(t *testing.T, ni *oc.NetworkInstance, routerID string, neighbors []bgpNeighborSpec) { +func configureBGPInstance(t *testing.T, dut *ondatra.DUTDevice, ni *oc.NetworkInstance, routerID string, neighbors []bgpNeighborSpec) { t.Helper() if ni == nil { t.Fatalf("Network Instance is not configured") } - niProto := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + niProto := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) niProto.Enabled = ygot.Bool(true) bgp := niProto.GetOrCreateBgp() g := bgp.GetOrCreateGlobal() @@ -494,7 +494,7 @@ func AwaitScaleBGPConvergence(t *testing.T, dut *ondatra.DUTDevice, cfg BGPConve // awaitBGPEstablished waits for a BGP neighbor session to reach ESTABLISHED, returning an error on timeout. func awaitBGPEstablished(t *testing.T, dut *ondatra.DUTDevice, niName, neighbor string) error { t.Helper() - path := gnmi.OC().NetworkInstance(niName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Neighbor(neighbor).SessionState().State() + path := gnmi.OC().NetworkInstance(niName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(neighbor).SessionState().State() val, ok := gnmi.Watch(t, dut, path, bgpSessionTimeout, func(v *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool { state, present := v.Val() return present && state == oc.Bgp_Neighbor_SessionState_ESTABLISHED @@ -512,7 +512,7 @@ func awaitBGPEstablished(t *testing.T, dut *ondatra.DUTDevice, niName, neighbor // times out. func awaitBGPPrefixCount(t *testing.T, dut *ondatra.DUTDevice, niName, neighbor string, afiSafi oc.E_BgpTypes_AFI_SAFI_TYPE, wantCount uint32) error { t.Helper() - path := gnmi.OC().NetworkInstance(niName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Neighbor(neighbor).AfiSafi(afiSafi).Prefixes().Installed().State() + path := gnmi.OC().NetworkInstance(niName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Neighbor(neighbor).AfiSafi(afiSafi).Prefixes().Installed().State() val, ok := gnmi.Watch(t, dut, path, bgpConvergenceWait, func(v *ygnmi.Value[uint32]) bool { got, present := v.Val() return present && got >= wantCount diff --git a/internal/cfgplugins/bgp.go b/internal/cfgplugins/bgp.go index 337f6465c67..838f0510f0d 100644 --- a/internal/cfgplugins/bgp.go +++ b/internal/cfgplugins/bgp.go @@ -139,8 +139,6 @@ var ( IPv6Len: plenIPv6, } - bgpName = "BGP" - // PortCount1 use this for topology of 1 ports PortCount1 PortCount = 1 // PortCount2 use this for topology of 2 ports @@ -335,7 +333,7 @@ func (bs *BGPSession) WithEBGP(t *testing.T, afiTypes []oc.E_BgpTypes_AFI_SAFI_T } } - niProtocol := bs.DUTConf.GetOrCreateNetworkInstance(bs.networkInstance).GetOrCreateProtocol(PTBGP, bgpName) + niProtocol := bs.DUTConf.GetOrCreateNetworkInstance(bs.networkInstance).GetOrCreateProtocol(PTBGP, deviations.NwInstBgpProtoName(bs.DUT)) neighborConfig := bs.buildNeigborConfig(isSamePG, isSameAS, bgpPorts) niProtocol.Bgp = BuildBGPOCConfig(t, bs.DUT, dutPort1.IPv4, afiTypes, neighborConfig) @@ -423,7 +421,7 @@ func VerifyDUTBGPEstablished(t *testing.T, dut *ondatra.DUTDevice, opts ...Verif dni = opts[0].NetworkInstance } } - nSessionState := gnmi.OC().NetworkInstance(dni).Protocol(PTBGP, bgpName).Bgp().NeighborAny().SessionState().State() + nSessionState := gnmi.OC().NetworkInstance(dni).Protocol(PTBGP, deviations.NwInstBgpProtoName(dut)).Bgp().NeighborAny().SessionState().State() watch := gnmi.WatchAll(t, dut, nSessionState, timeout, func(val *ygnmi.Value[oc.E_Bgp_Neighbor_SessionState]) bool { state, ok := val.Val() if !ok || state != oc.Bgp_Neighbor_SessionState_ESTABLISHED { @@ -619,7 +617,7 @@ func containsValue[T comparable](slice []T, value T) bool { // 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()) + gnmi.BatchDelete(resetBatch, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config()) if deviations.NetworkInstanceTableDeletionRequired(dut) { tablePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).TableAny() @@ -637,7 +635,7 @@ func BGPClearConfig(t *testing.T, dut *ondatra.DUTDevice) { // 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() + statePath := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() for _, nbr := range nbrs { nbrPath := statePath.Neighbor(nbr.Neighborip) @@ -682,7 +680,7 @@ func DeviationAristaBGPNeighborMaxPrefixes(t *testing.T, dut *ondatra.DUTDevice, {Name: "network-instances"}, {Name: "network-instance", Key: map[string]string{"name": deviations.DefaultNetworkInstance(dut)}}, {Name: "protocols"}, - {Name: "protocol", Key: map[string]string{"name": "BGP", "identifier": "BGP"}}, + {Name: "protocol", Key: map[string]string{"name": deviations.NwInstBgpProtoName(dut), "identifier": "BGP"}}, {Name: "bgp"}, {Name: "neighbors"}, {Name: "neighbor", Key: map[string]string{"neighbor-address": neighborIP}}, @@ -758,7 +756,7 @@ func sameAS(nbrs []*BgpNeighbor) bool { // necessary configuration. func handleMultipathDeviation(t *testing.T, dut *ondatra.DUTDevice, root *oc.Root, cfg BGPNeighborsConfig) error { t.Helper() - bgp := root.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").GetOrCreateBgp() + bgp := root.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)).GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp() // Handle MultipathUnderAfiSafi deviation and Configure Multipath for Cisco if deviations.EnableMultipathUnderAfiSafi(dut) { switch dut.Vendor() { @@ -831,7 +829,7 @@ func CreateBGPNeighbors(t *testing.T, dut *ondatra.DUTDevice, sb *gnmi.SetBatch, root := &oc.Root{} ni := root.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)) - protocol := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + protocol := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) bgp := protocol.GetOrCreateBgp() global := bgp.GetOrCreateGlobal() @@ -884,7 +882,7 @@ func CreateBGPNeighbors(t *testing.T, dut *ondatra.DUTDevice, sb *gnmi.SetBatch, if err := handleMaxPrefixesDeviation(t, dut, sb, cfg); err != nil { return err } - gnmi.BatchUpdate(sb, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Config(), root.GetNetworkInstance(deviations.DefaultNetworkInstance(dut)).GetProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP")) + gnmi.BatchUpdate(sb, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config(), root.GetNetworkInstance(deviations.DefaultNetworkInstance(dut)).GetProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut))) return nil } @@ -893,7 +891,7 @@ func ConfigureBGPNeighbor(t *testing.T, dut *ondatra.DUTDevice, ni *oc.NetworkIn if ni == nil { t.Fatalf("Network Instance is not configured") } - proto := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + proto := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) bgp := proto.GetOrCreateBgp() global := bgp.GetOrCreateGlobal() global.As = ygot.Uint32(routerAS) @@ -936,9 +934,9 @@ func ConfigureDUTBGP(t *testing.T, dut *ondatra.DUTDevice, batch *gnmi.SetBatch, t.Helper() d := gnmi.OC() - dutBgpConfPath := d.NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP") + dutBgpConfPath := d.NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)) // Create BGP config - dutBgpConf := &oc.NetworkInstance_Protocol{Identifier: oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, Name: ygot.String("BGP"), Bgp: &oc.NetworkInstance_Protocol_Bgp{}} + dutBgpConf := &oc.NetworkInstance_Protocol{Identifier: oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, Name: ygot.String(deviations.NwInstBgpProtoName(dut)), Bgp: &oc.NetworkInstance_Protocol_Bgp{}} bgp := dutBgpConf.Bgp global := bgp.GetOrCreateGlobal() global.As = ygot.Uint32(cfg.DutAS) @@ -1065,7 +1063,7 @@ func AppendBGPNeighbor(t *testing.T, dut *ondatra.DUTDevice, batch *gnmi.SetBatc nv4.GetOrCreateEbgpMultihop().SetMultihopTtl(5) nv6.GetOrCreateEbgpMultihop().SetMultihopTtl(5) } - gnmi.BatchUpdate(batch, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp().Config(), bgp) + gnmi.BatchUpdate(batch, gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp().Config(), bgp) return bgp } @@ -1417,7 +1415,7 @@ func addBGPNeighborTCPMSSOps(t *testing.T, b *gnmi.SetBatch, dut *ondatra.DUTDev } ni := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(dut)) - bgpPath := ni.Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + bgpPath := ni.Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() for _, nbr := range nbrList { tcpMssPath := bgpPath.Neighbor(nbr).Transport().TcpMss().Config() @@ -1550,7 +1548,7 @@ func ConfigureEBgpPeersScale(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra. var nbrList []*BgpNeighborScale 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() for _, c := range cfg { @@ -1619,7 +1617,7 @@ func IncrementIP(ipStr string, num int) (string, string) { // VerifyDUTVrfBGPState verify BGP neighbor status with configured DUT VRF configuration. func VerifyDUTVrfBGPState(t *testing.T, dut *ondatra.DUTDevice, cfg VrfBGPState) { t.Helper() - statePath := gnmi.OC().NetworkInstance(cfg.NetworkInstanceName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Bgp() + statePath := gnmi.OC().NetworkInstance(cfg.NetworkInstanceName).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Bgp() for _, nbrIp := range cfg.NeighborIPs { nbrPath := statePath.Neighbor(nbrIp) t.Logf("Waiting for BGP neighbor to establish...") diff --git a/internal/cfgplugins/bgp_policy.go b/internal/cfgplugins/bgp_policy.go index b6a06006954..fae0a8cbaa0 100644 --- a/internal/cfgplugins/bgp_policy.go +++ b/internal/cfgplugins/bgp_policy.go @@ -393,6 +393,7 @@ func RoutingPolicyBGPAdvertiseAggregate(t *testing.T, dut *ondatra.DUTDevice, tr // t.Log("Configuring local aggregate for 0.0.0.0/0...") ni := root.GetOrCreateNetworkInstance(dni) + localAggregateName = deviations.NwInstLocalAggProtoName(dut, localAggregateName) aggProto := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_LOCAL_AGGREGATE, localAggregateName) aggProto.SetIdentifier(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_LOCAL_AGGREGATE) aggProto.SetName(localAggregateName) diff --git a/internal/cfgplugins/isis.go b/internal/cfgplugins/isis.go index 40a8631b0d5..6e0e5b22d17 100644 --- a/internal/cfgplugins/isis.go +++ b/internal/cfgplugins/isis.go @@ -269,6 +269,7 @@ func GenerateDynamicRouteWithISIS(t *testing.T, dut *ondatra.DUTDevice, sb *gnmi dni := deviations.DefaultNetworkInstance(dut) ni := root.GetOrCreateNetworkInstance(dni) + localAggregateName = deviations.NwInstLocalAggProtoName(dut, localAggregateName) aggProto := ni.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_LOCAL_AGGREGATE, localAggregateName) aggProto.SetIdentifier(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_LOCAL_AGGREGATE) aggProto.SetName(localAggregateName) diff --git a/internal/cfgplugins/networkinstance.go b/internal/cfgplugins/networkinstance.go index fc2e581adc8..79fa4ccaf48 100644 --- a/internal/cfgplugins/networkinstance.go +++ b/internal/cfgplugins/networkinstance.go @@ -49,7 +49,7 @@ func EnableDefaultNetworkInstanceBgp(t *testing.T, dut *ondatra.DUTDevice, dutAS d := gnmi.OC() bgp := &oc.NetworkInstance_Protocol{ Identifier: oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, - Name: ygot.String("BGP"), + Name: ygot.String(deviations.NwInstBgpProtoName(dut)), Enabled: ygot.Bool(true), Bgp: &oc.NetworkInstance_Protocol_Bgp{}, } @@ -58,7 +58,7 @@ func EnableDefaultNetworkInstanceBgp(t *testing.T, dut *ondatra.DUTDevice, dutAS As: ygot.Uint32(dutAS), } - gnmi.Replace(t, dut, d.NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").Config(), bgp) + gnmi.Replace(t, dut, d.NetworkInstance(deviations.DefaultNetworkInstance(dut)).Protocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).Config(), bgp) } // ConfigureNetworkInstance configures a new network instance on the DUT not using batch update diff --git a/internal/deviations/deviations.go b/internal/deviations/deviations.go index d46a5df0fa5..3f6b5259383 100644 --- a/internal/deviations/deviations.go +++ b/internal/deviations/deviations.go @@ -194,7 +194,12 @@ func BGPTrafficTolerance(dut *ondatra.DUTDevice) int32 { } // StaticProtocolName returns the name used for the static routing protocol. +// The nw_inst_static_proto_name deviation, when set, takes precedence over +// static_protocol_name; otherwise the default is "DEFAULT". func StaticProtocolName(dut *ondatra.DUTDevice) string { + if srn := lookupDUTDeviations(dut).GetNwInstStaticProtoName(); srn != "" { + return srn + } if spn := lookupDUTDeviations(dut).GetStaticProtocolName(); spn != "" { return spn } @@ -1248,14 +1253,50 @@ func TcSubscriptionUnsupported(dut *ondatra.DUTDevice) bool { return lookupDUTDeviations(dut).GetTcSubscriptionUnsupported() } -// DefaultBgpInstanceName returns bgp instance name as set in deviation to override default value "DEFAULT" +// DefaultBgpInstanceName returns bgp instance name as set in deviation to override default value "DEFAULT". +// The nw_inst_bgp_proto_name deviation, when set, takes precedence over default_bgp_instance_name. func DefaultBgpInstanceName(dut *ondatra.DUTDevice) string { + if nbpn := lookupDUTDeviations(dut).GetNwInstBgpProtoName(); nbpn != "" { + return nbpn + } if dbin := lookupDUTDeviations(dut).GetDefaultBgpInstanceName(); dbin != "" { return dbin } return "DEFAULT" } +// NwInstBgpProtoName returns the name of the BGP protocol instance in +// the network instance. It is the value of the nw_inst_bgp_proto_name +// deviation, or "BGP" if unset. +func NwInstBgpProtoName(dut *ondatra.DUTDevice) string { + if nbpn := lookupDUTDeviations(dut).GetNwInstBgpProtoName(); nbpn != "" { + return nbpn + } + return "BGP" +} + +// NwInstStaticProtoName returns the name of the static protocol +// instance in the network instance for tests that use "DEFAULT" regardless of +// static_protocol_name. It is the value of the +// nw_inst_static_proto_name deviation, or "DEFAULT" if unset. +func NwInstStaticProtoName(dut *ondatra.DUTDevice) string { + if srn := lookupDUTDeviations(dut).GetNwInstStaticProtoName(); srn != "" { + return srn + } + return "DEFAULT" +} + +// NwInstLocalAggProtoName returns the name of the LOCAL_AGGREGATE +// protocol instance in the network instance. It returns the value of the +// nw_inst_local_agg_proto_name deviation, or defaultName (the +// name the test would normally use) when the deviation is unset. +func NwInstLocalAggProtoName(dut *ondatra.DUTDevice, defaultName string) string { + if lan := lookupDUTDeviations(dut).GetNwInstLocalAggProtoName(); lan != "" { + return lan + } + return defaultName +} + // ChannelRateClassParametersUnsupported returns true if channel rate class parameters are unsupported func ChannelRateClassParametersUnsupported(dut *ondatra.DUTDevice) bool { return lookupDUTDeviations(dut).GetChannelAssignmentRateClassParametersUnsupported() diff --git a/internal/gnmi/setup/setup.go b/internal/gnmi/setup/setup.go index 61663736602..489e1e9f48b 100644 --- a/internal/gnmi/setup/setup.go +++ b/internal/gnmi/setup/setup.go @@ -119,7 +119,7 @@ func BuildBenchmarkingConfig(t *testing.T) *oc.Root { // Network instance and BGP configs. netInstance := d.GetOrCreateNetworkInstance(deviations.DefaultNetworkInstance(dut)) - bgp := netInstance.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, "BGP").GetOrCreateBgp() + bgp := netInstance.GetOrCreateProtocol(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, deviations.NwInstBgpProtoName(dut)).GetOrCreateBgp() global := bgp.GetOrCreateGlobal() global.As = ygot.Uint32(DUTAs) global.RouterId = ygot.String(dutStartIPAddr) @@ -426,7 +426,7 @@ func VerifyISISTelemetry(t *testing.T, dut *ondatra.DUTDevice) { // VerifyBgpTelemetry function is to verify BGP telemetry on DUT using // BGP OC telemetry path. func VerifyBgpTelemetry(t *testing.T, dut *ondatra.DUTDevice) { - 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() for _, peerAddr := range ATEIPList { nbrIP := peerAddr.String() nbrPath := statePath.Neighbor(nbrIP) diff --git a/proto/metadata.proto b/proto/metadata.proto index 75b4aab00d7..3f554f2be58 100644 --- a/proto/metadata.proto +++ b/proto/metadata.proto @@ -1622,6 +1622,18 @@ message Metadata { // for hold-timer-expiry to trigger GR helper mode (RFC 8538 Section 4). // https://issuetracker.google.com/581463773 bool bgp_gr_helper_hold_timer_expiry_requires_stale_policy = 489; + // Name of the LOCAL_AGGREGATE protocol instance in the network instance, + // instead of the test's default (e.g. "DEFAULT-AGG"). For devices that only + // accept a fixed name such as "bgp" (Cisco SONiC). + string nw_inst_local_agg_proto_name = 490; + // Name of the BGP protocol instance in the network instance, instead of + // "BGP". For devices that only accept a fixed name such as "bgp" (Cisco SONiC). + // When set it takes precedence over default_bgp_instance_name. + string nw_inst_bgp_proto_name = 491; + // Name of the static protocol instance in the network instance, instead of + // "DEFAULT" (Cisco SONiC). When set it takes precedence over + // static_protocol_name. + string nw_inst_static_proto_name = 492; // Reserved field numbers and identifiers. reserved 84, 9, 28, 20, 38, 43, 90, 97, 55, 89, 19, 36, 35, 40, 113, 131, 141, 173, 234, 254, 231, 300, 241, 49, 313, 319, 345; diff --git a/proto/metadata_go_proto/metadata.pb.go b/proto/metadata_go_proto/metadata.pb.go index 11826d612c2..53ac6d151f3 100644 --- a/proto/metadata_go_proto/metadata.pb.go +++ b/proto/metadata_go_proto/metadata.pb.go @@ -1683,8 +1683,20 @@ type Metadata_Deviations struct { // for hold-timer-expiry to trigger GR helper mode (RFC 8538 Section 4). // https://issuetracker.google.com/581463773 BgpGrHelperHoldTimerExpiryRequiresStalePolicy bool `protobuf:"varint,489,opt,name=bgp_gr_helper_hold_timer_expiry_requires_stale_policy,json=bgpGrHelperHoldTimerExpiryRequiresStalePolicy,proto3" json:"bgp_gr_helper_hold_timer_expiry_requires_stale_policy,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + // Name of the LOCAL_AGGREGATE protocol instance in the network instance, + // instead of the test's default (e.g. "DEFAULT-AGG"). For devices that only + // accept a fixed name such as "bgp" (Cisco SONiC). + NwInstLocalAggProtoName string `protobuf:"bytes,490,opt,name=nw_inst_local_agg_proto_name,json=nwInstLocalAggProtoName,proto3" json:"nw_inst_local_agg_proto_name,omitempty"` + // Name of the BGP protocol instance in the network instance, instead of + // "BGP". For devices that only accept a fixed name such as "bgp" (Cisco SONiC). + // When set it takes precedence over default_bgp_instance_name. + NwInstBgpProtoName string `protobuf:"bytes,491,opt,name=nw_inst_bgp_proto_name,json=nwInstBgpProtoName,proto3" json:"nw_inst_bgp_proto_name,omitempty"` + // Name of the static protocol instance in the network instance, instead of + // "DEFAULT" (Cisco SONiC). When set it takes precedence over + // static_protocol_name. + NwInstStaticProtoName string `protobuf:"bytes,492,opt,name=nw_inst_static_proto_name,json=nwInstStaticProtoName,proto3" json:"nw_inst_static_proto_name,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Metadata_Deviations) Reset() { @@ -4867,6 +4879,27 @@ func (x *Metadata_Deviations) GetBgpGrHelperHoldTimerExpiryRequiresStalePolicy() return false } +func (x *Metadata_Deviations) GetNwInstLocalAggProtoName() string { + if x != nil { + return x.NwInstLocalAggProtoName + } + return "" +} + +func (x *Metadata_Deviations) GetNwInstBgpProtoName() string { + if x != nil { + return x.NwInstBgpProtoName + } + return "" +} + +func (x *Metadata_Deviations) GetNwInstStaticProtoName() string { + if x != nil { + return x.NwInstStaticProtoName + } + return "" +} + type Metadata_PlatformExceptions struct { state protoimpl.MessageState `protogen:"open.v1"` Platform *Metadata_Platform `protobuf:"bytes,1,opt,name=platform,proto3" json:"platform,omitempty"` @@ -4927,7 +4960,7 @@ var file_metadata_proto_rawDesc = string([]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, 0xa8, 0x94, 0x02, 0x0a, 0x08, 0x4d, 0x65, 0x74, + 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd8, 0x95, 0x02, 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, @@ -4961,7 +4994,7 @@ var file_metadata_proto_rawDesc = string([]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, 0x90, 0x89, 0x02, 0x0a, 0x0a, 0x44, 0x65, 0x76, 0x69, + 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x1a, 0xc0, 0x8a, 0x02, 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, @@ -7070,7 +7103,18 @@ var file_metadata_proto_rawDesc = string([]byte{ 0x6c, 0x69, 0x63, 0x79, 0x18, 0xe9, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x2d, 0x62, 0x67, 0x70, 0x47, 0x72, 0x48, 0x65, 0x6c, 0x70, 0x65, 0x72, 0x48, 0x6f, 0x6c, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x72, 0x45, 0x78, 0x70, 0x69, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x73, 0x53, - 0x74, 0x61, 0x6c, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4a, 0x06, 0x08, 0x85, 0x02, 0x10, + 0x74, 0x61, 0x6c, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x3e, 0x0a, 0x1c, 0x6e, 0x77, + 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x61, 0x67, 0x67, 0x5f, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0xea, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x17, 0x6e, 0x77, 0x49, 0x6e, 0x73, 0x74, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x41, 0x67, + 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x33, 0x0a, 0x16, 0x6e, 0x77, + 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x5f, 0x62, 0x67, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5f, + 0x6e, 0x61, 0x6d, 0x65, 0x18, 0xeb, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x6e, 0x77, 0x49, + 0x6e, 0x73, 0x74, 0x42, 0x67, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x61, 0x6d, 0x65, 0x12, + 0x39, 0x0a, 0x19, 0x6e, 0x77, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x69, + 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0xec, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x15, 0x6e, 0x77, 0x49, 0x6e, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x69, + 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x4e, 0x61, 0x6d, 0x65, 0x4a, 0x06, 0x08, 0x85, 0x02, 0x10, 0x86, 0x02, 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, 0x26, 0x10, 0x27, 0x4a, 0x04, 0x08, 0x2b, 0x10, 0x2c, 0x4a, 0x04, 0x08, 0x5a, 0x10, 0x5b, 0x4a, 0x04, 0x08, 0x61,