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.

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

deviation for cisco 1.51 multipath only under global/afi/safi/ #3553

Merged
merged 2 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,11 @@ func TestBGPSetup(t *testing.T) {
t.Logf("Enable Multipath")
pgUseMulitplePaths.Enabled = ygot.Bool(true)
t.Logf("Enable Maximum Paths")
bgp.GetOrCreateGlobal().GetOrCreateUseMultiplePaths().GetOrCreateEbgp().MaximumPaths = ygot.Uint32(maxPaths)
if deviations.EnableMultipathUnderAfiSafi(bs.DUT) {
gEBGP.MaximumPaths = ygot.Uint32(maxPaths)
} else {
bgp.GetOrCreateGlobal().GetOrCreateUseMultiplePaths().GetOrCreateEbgp().MaximumPaths = ygot.Uint32(maxPaths)
}
}
if tc.enableMultiAS && !deviations.SkipSettingAllowMultipleAS(bs.DUT) && deviations.SkipAfiSafiPathForBgpMultipleAs(bs.DUT) {
t.Logf("Enable MultiAS ")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ platform_exceptions: {
ipv4_missing_enabled: true
skip_setting_allow_multiple_as: true
skip_afi_safi_path_for_bgp_multiple_as: true
enable_multipath_under_afi_safi: true
}
}
platform_exceptions: {
Expand Down Expand Up @@ -47,4 +48,4 @@ platform_exceptions: {
skip_setting_allow_multiple_as: true
}
}
tags: TAGS_DATACENTER_EDGE
tags: TAGS_DATACENTER_EDGE
5 changes: 5 additions & 0 deletions internal/deviations/deviations.go
Original file line number Diff line number Diff line change
Expand Up @@ -1196,3 +1196,8 @@ func OperationalModeUnsupported(dut *ondatra.DUTDevice) bool {
func BgpSessionStateIdleInPassiveMode(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetBgpSessionStateIdleInPassiveMode()
}

// EnableMultipathUnderAfiSafi returns true for devices that do not support multipath under /global path and instead support under global/afi/safi path.
func EnableMultipathUnderAfiSafi(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetEnableMultipathUnderAfiSafi()
}
4 changes: 4 additions & 0 deletions proto/metadata.proto
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,10 @@ message Metadata {
// Cisco: b/376021545
bool bgp_session_state_idle_in_passive_mode = 229;

// EnableMultipathUnderAfiSafi returns true for devices that do not support multipath under /global path and instead support under global/afi/safi path
// CISCO: b/376241033
// CISCO: b/340859662
bool enable_multipath_under_afi_safi = 230;
// Reserved field numbers and identifiers.
reserved 84, 9, 28, 20, 90, 97, 55, 89, 19, 36, 35, 40, 173;
}
Expand Down
98 changes: 57 additions & 41 deletions proto/metadata_go_proto/metadata.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading