Skip to content

Commit

Permalink
resolving conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@cprabha
cprabha committed Aug 13, 2024
1 parent e041fa1 commit 304074a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 203 deletions.
2 changes: 1 addition & 1 deletion ...tions_med_localpref_prepend_flow_control/actions_MED_LocPref_prepend_flow_control_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ func deleteBGPImportExportPolicy(t *testing.T, dut *ondatra.DUTDevice, ipv4, ipv
gnmi.BatchDelete(batchConfig, nbrPolPathv6_2.ImportPolicy().Config())
gnmi.BatchDelete(batchConfig, nbrPolPathv6_2.ExportPolicy().Config())

gnmi.BatchDelete(batchConfig, nbrPolPathv4.ImportPolicy().Config())
gnmi.BatchDelete(batchConfig, nbrPolPathv4.ImportPolicy().Config())
gnmi.BatchDelete(batchConfig, nbrPolPathv4.ExportPolicy().Config())
gnmi.BatchDelete(batchConfig, nbrPolPathv6.ImportPolicy().Config())
gnmi.BatchDelete(batchConfig, nbrPolPathv6.ExportPolicy().Config())
Expand Down
202 changes: 0 additions & 202 deletions internal/deviations/deviations.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1129,205 +1129,3 @@ func BgpAfiSafiInDefaultNiBeforeOtherNi(dut *ondatra.DUTDevice) bool {
func BgpSetmedUnionTypeUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetBgpSetmedUnionTypeUnsupported()
}

// BgpActionsSetCommunityMethodUnsupported return true if BGP actions set-community method is unsupported
func BgpActionsSetCommunityMethodUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetBgpActionsSetCommunityMethodUnsupported()
}

// SetNoPeerGroup Ensure that no BGP configurations exists under PeerGroups.
func SetNoPeerGroup(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetSetNoPeerGroup()
}

// BgpCommunityMemberIsAString returns true if device community member is not a list
func BgpCommunityMemberIsAString(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetBgpCommunityMemberIsAString()
}

// IPv4StaticRouteWithIPv6NextHopUnsupported unsupported ipv4 with ipv6 nexthop
func IPv4StaticRouteWithIPv6NextHopUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetIpv4StaticRouteWithIpv6NhUnsupported()
}

// IPv6StaticRouteWithIPv4NextHopUnsupported unsported ipv6 with ipv4 nexthop
func IPv6StaticRouteWithIPv4NextHopUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetIpv6StaticRouteWithIpv4NhUnsupported()
}

// StaticRouteWithDropNhUnsupported unsuported drop nexthop
func StaticRouteWithDropNhUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetStaticRouteWithDropNh()
}

// StaticRouteWithExplicitMetric set explict metric
func StaticRouteWithExplicitMetric(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetStaticRouteWithExplicitMetric()
}

// BgpDefaultPolicyUnsupported return true if BGP default-import/export-policy is not supported.
func BgpDefaultPolicyUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetBgpDefaultPolicyUnsupported()
}

// ExplicitEnableBGPOnDefaultVRF return true if BGP needs to be explicity enabled on default VRF
func ExplicitEnableBGPOnDefaultVRF(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetExplicitEnableBgpOnDefaultVrf()
}

// RoutingPolicyTagSetEmbedded returns true if the implementation does not support tag-set(s) as a
// separate entity, but embeds it in the policy statement
func RoutingPolicyTagSetEmbedded(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetRoutingPolicyTagSetEmbedded()
}

// SkipAfiSafiPathForBgpMultipleAs return true if device do not support afi/safi path to enable allow multiple-as for eBGP
func SkipAfiSafiPathForBgpMultipleAs(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetSkipAfiSafiPathForBgpMultipleAs()
}

// CommunityMemberRegexUnsupported return true if device do not support community member regex
func CommunityMemberRegexUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetCommunityMemberRegexUnsupported()
}

// SamePolicyAttachedToAllAfis returns true if same import policy has to be applied for all AFIs
func SamePolicyAttachedToAllAfis(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetSamePolicyAttachedToAllAfis()
}

// SkipSettingStatementForPolicy return true if device do not support afi/safi path to enable allow multiple-as for eBGP
func SkipSettingStatementForPolicy(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetSkipSettingStatementForPolicy()
}

// SkipCheckingAttributeIndex return true if device do not return bgp attribute for the bgp session specifying the index
func SkipCheckingAttributeIndex(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetSkipCheckingAttributeIndex()
}

// FlattenPolicyWithMultipleStatements return true if devices does not support policy-chaining
func FlattenPolicyWithMultipleStatements(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetFlattenPolicyWithMultipleStatements()
}

// SlaacPrefixLength128 for Slaac generated IPv6 link local address
func SlaacPrefixLength128(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetSlaacPrefixLength128()
}

// DefaultRoutePolicyUnsupported returns true if default route policy is not supported
func DefaultRoutePolicyUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetDefaultRoutePolicyUnsupported()
}

// CommunityMatchWithRedistributionUnsupported is set to true for devices that do not support matching community at the redistribution attach point.
func CommunityMatchWithRedistributionUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetCommunityMatchWithRedistributionUnsupported()
}

// BgpMaxMultipathPathsUnsupported returns true if the device does not support
// bgp max multipaths.
func BgpMaxMultipathPathsUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetBgpMaxMultipathPathsUnsupported()
}

// MultipathUnsupportedNeighborOrAfisafi returns true if the device does not
// support multipath under neighbor or afisafi.
func MultipathUnsupportedNeighborOrAfisafi(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetMultipathUnsupportedNeighborOrAfisafi()
}

// ModelNameUnsupported returns true if /components/components/state/model-name
// is not supported for any component type.
func ModelNameUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetModelNameUnsupported()
}

// InstallPositionAndInstallComponentUnsupported returns true if install
// position and install component are not supported.
func InstallPositionAndInstallComponentUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetInstallPositionAndInstallComponentUnsupported()
}

// EncapTunnelShutBackupNhgZeroTraffic returns true when encap tunnel is shut then zero traffic flows to backup NHG
func EncapTunnelShutBackupNhgZeroTraffic(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetEncapTunnelShutBackupNhgZeroTraffic()
}

// MaxEcmpPaths supported for isis max ecmp path
func MaxEcmpPaths(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetMaxEcmpPaths()
}

// WecmpAutoUnsupported returns true if wecmp auto is not supported
func WecmpAutoUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetWecmpAutoUnsupported()
}

// RoutingPolicyChainingUnsupported returns true if policy chaining is unsupported
func RoutingPolicyChainingUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetRoutingPolicyChainingUnsupported()
}

// ISISLoopbackRequired returns true if isis loopback is required.
func ISISLoopbackRequired(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetIsisLoopbackRequired()
}

// WeightedEcmpFixedPacketVerification returns true if fixed packet is used in traffic flow
func WeightedEcmpFixedPacketVerification(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetWeightedEcmpFixedPacketVerification()
}

// OverrideDefaultNhScale returns true if default NextHop scale needs to be modified
// else returns false
func OverrideDefaultNhScale(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetOverrideDefaultNhScale()
}

// BgpExtendedCommunitySetUnsupported returns true if set bgp extended community is unsupported
func BgpExtendedCommunitySetUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetBgpExtendedCommunitySetUnsupported()
}

// BgpSetExtCommunitySetRefsUnsupported returns true if bgp set ext community refs is unsupported
func BgpSetExtCommunitySetRefsUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetBgpSetExtCommunitySetRefsUnsupported()
}

// BgpDeleteLinkBandwidthUnsupported returns true if bgp delete link bandwidth is unsupported
func BgpDeleteLinkBandwidthUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetBgpDeleteLinkBandwidthUnsupported()
}

// QOSInQueueDropCounterUnsupported returns true if /qos/interfaces/interface/input/queues/queue/state/dropped-pkts
// is not supported for any component type.
func QOSInQueueDropCounterUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetQosInqueueDropCounterUnsupported()
}

// BgpExplicitExtendedCommunityEnable returns true if explicit extended community enable is needed
func BgpExplicitExtendedCommunityEnable(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetBgpExplicitExtendedCommunityEnable()
}

// MatchTagSetConditionUnsupported returns true if match tag set condition is not supported
func MatchTagSetConditionUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetMatchTagSetConditionUnsupported()
}

// PeerGroupDefEbgpVrfUnsupported returns true if peer group definition under ebgp vrf is unsupported
func PeerGroupDefEbgpVrfUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetPeerGroupDefEbgpVrfUnsupported()
}

// RedisConnectedUnderEbgpVrfUnsupported returns true if redistribution of routes under ebgp vrf is unsupported
func RedisConnectedUnderEbgpVrfUnsupported(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetRedisConnectedUnderEbgpVrfUnsupported()
}

// BgpAfiSafiInDefaultNiBeforeOtherNi returns true if certain AFI SAFIs are configured in default network instance before other network instances
func BgpAfiSafiInDefaultNiBeforeOtherNi(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetBgpAfiSafiInDefaultNiBeforeOtherNi()
}

0 comments on commit 304074a

Please sign in to comment.