Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deviations 2 #3716

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove deviations 2 #3716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions feature/bgp/multipath/otg_tests/bgp_multipath_ecmp_test/metadata.textproto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ platform_exceptions: {
default_network_instance: "default"
missing_value_for_defaults: true
skip_setting_allow_multiple_as: true
enable_multipath_under_afi_safi: true
}
}
tags: TAGS_DATACENTER_EDGE
18 changes: 5 additions & 13 deletions ...gp/multipath/otg_tests/bgp_multipath_wecmp_lbw_community_test/bgp_multipath_wecmp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,21 +210,13 @@ func TestBGPSetup(t *testing.T) {
helpers.GnmiCLIConfig(t, bs.DUT, communitySetCLIConfig)
}
} else {
if deviations.SkipSettingAllowMultipleAS(bs.DUT) {
bgp.GetOrCreateGlobal().GetOrCreateUseMultiplePaths().GetOrCreateEbgp().MaximumPaths = ygot.Uint32(maxPaths)
bgp.GetOrCreateGlobal().GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateUseMultiplePaths().GetOrCreateEbgp().GetOrCreateLinkBandwidthExtCommunity().Enabled = ygot.Bool(true)
switch bs.DUT.Vendor() {
case ondatra.ARISTA:
helpers.GnmiCLIConfig(t, bs.DUT, "router bgp 65501\n ucmp mode 1\n")
default:
t.Fatalf("Unsupported vendor %s for deviation 'SkipSettingAllowMultipleAS'", bs.DUT.Vendor())
}
} else {
gEBGP := bgp.GetOrCreateGlobal().GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateUseMultiplePaths().GetOrCreateEbgp()
gEBGP := bgp.GetOrCreateGlobal().GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).GetOrCreateUseMultiplePaths().GetOrCreateEbgp()
if !deviations.SkipSettingAllowMultipleAS(bs.DUT) {
gEBGP.AllowMultipleAs = ygot.Bool(true)
gEBGP.MaximumPaths = ygot.Uint32(maxPaths)
gEBGP.GetOrCreateLinkBandwidthExtCommunity().Enabled = ygot.Bool(true)
}
gEBGP.MaximumPaths = ygot.Uint32(maxPaths)
gEBGP.GetOrCreateLinkBandwidthExtCommunity().Enabled = ygot.Bool(true)

}

configureOTG(t, bs)
Expand Down
1 change: 0 additions & 1 deletion feature/bgp/policybase/otg_tests/prefix_set_test/metadata.textproto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ platform_exceptions: {
interface_enabled: true
default_network_instance: "default"
missing_value_for_defaults: true
skip_set_rp_match_set_options: true
}
}
platform_exceptions: {
Expand Down
Loading