Skip to content

Commit

Permalink
Partially fix lsp_lifetime test for Arista (#2040)
Browse files Browse the repository at this point in the history
  • Loading branch information
Ankur19 authored Aug 18, 2023
1 parent e6c71e1 commit d38beba
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,12 @@ func configureISIS(t *testing.T, dut *ondatra.DUTDevice, intfName string, dutAre
globalIsis.LevelCapability = oc.Isis_LevelType_LEVEL_2

globalIsis.GetOrCreateTimers().LspLifetimeInterval = ygot.Uint16(lspLifetime)
if deviations.ISISLspLifetimeIntervalRequiresLspRefreshInterval(dut) {
globalIsis.GetOrCreateTimers().LspRefreshInterval = ygot.Uint16(65535)
}
if deviations.ISISInstanceEnabledRequired(dut) {
globalIsis.Instance = ygot.String(isisInstance)
}

// Interface configs
intf := isis.GetOrCreateInterface(intfName)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ platform_exceptions: {
missing_value_for_defaults: true
interface_enabled: true
default_network_instance: "default"
isis_instance_enabled_required: true
isis_instance_enabled_required: true
isis_lsp_lifetime_interval_requires_lsp_refresh_interval: true
}
}
6 changes: 6 additions & 0 deletions internal/deviations/deviations.go
Original file line number Diff line number Diff line change
Expand Up @@ -539,3 +539,9 @@ func P4RTGdpRequiresDot1QSubinterface(dut *ondatra.DUTDevice) bool {
func ATEPortLinkStateOperationsUnsupported(ate *ondatra.ATEDevice) bool {
return lookupATEDeviations(ate).GetAtePortLinkStateOperationsUnsupported()
}

// ISISLspLifetimeIntervalRequiresLspRefreshInterval returns true for devices that require
// configuring lspRefreshInterval ISIS timer when lspLifetimeInterval is configured.
func ISISLspLifetimeIntervalRequiresLspRefreshInterval(dut *ondatra.DUTDevice) bool {
return lookupDUTDeviations(dut).GetIsisLspLifetimeIntervalRequiresLspRefreshInterval()
}
4 changes: 4 additions & 0 deletions proto/metadata.proto
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,10 @@ message Metadata {
bool ate_port_link_state_operations_unsupported = 94;
// Creates a user and assigns role/rbac to said user via native model.
bool set_native_user = 95;
// Devices require configuring lspRefreshInterval ISIS timer when
// lspLifetimeInterval is configured.
// Arista: partnerissuetracker.corp.google.com/293667850
bool isis_lsp_lifetime_interval_requires_lsp_refresh_interval = 96;

// Reserved field numbers and identifiers.
reserved 84, 9, 28;
Expand Down
86 changes: 52 additions & 34 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.

0 comments on commit d38beba

Please sign in to comment.