Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/cisco_logical_channels' into cis…
Browse files Browse the repository at this point in the history
…co_logical_channels

# Conflicts:
#	internal/deviations/deviations.go
#	proto/metadata_go_proto/metadata.pb.go
  • Loading branch information
karthikeya-remilla committed Nov 11, 2024
2 parents 84f06c7 + d14b0ba commit e9374b7
Show file tree
Hide file tree
Showing 2 changed files with 332 additions and 199 deletions.
2 changes: 1 addition & 1 deletion internal/deviations/deviations.go
Original file line number Diff line number Diff line change
Expand Up @@ -1206,4 +1206,4 @@ func EnableMultipathUnderAfiSafi(dut *ondatra.DUTDevice) bool {
// OTNChannelAssignmentCiscoNumbering returns true if OTN channel assignment index starts from 1 instead of 0
func OTNChannelAssignmentCiscoNumbering(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetOtnChannelAssignmentCiscoNumbering()
}
}
Loading

0 comments on commit e9374b7

Please sign in to comment.