Merge pull request #478 from Juniper/476-test-failure-testgetsetsyste…

…magentmanagerconfiguration Introduce `compatibility.HasDeviceOsImageDownloadTimeout`
Juniper · Dec 27, 2024 · 7024096 · 7024096
2 parents 280ed3f + d0ef7e5
commit 7024096
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/apstra/api_system_agent.go b/apstra/api_system_agent.go
@@ -12,6 +12,7 @@ import (
 const apiUrlSystemAgentManagerConfig = "/api/system-agent/manager-config"
 
 type SystemAgentManagerConfig struct {
+	DeviceOsImageDownloadTimeout    *int `json:"device_os_image_download_timeout,omitempty"` // introduced in and required by 5.1.0 (1-2700)
 	SkipRevertToPristineOnUninstall bool `json:"skip_revert_to_pristine_on_uninstall"`
 	SkipPristineValidation          bool `json:"skip_pristine_validation"`
 	SkipInterfaceShutdownOnUpgrade  bool `json:"skip_interface_shutdown_on_upgrade"`

diff --git a/apstra/api_system_agent_test.go b/apstra/api_system_agent_test.go
@@ -10,6 +10,7 @@ package apstra
 import (
 	"context"
 	"log"
+	"math/rand/v2"
 	"testing"
 
 	"github.com/Juniper/apstra-go-sdk/apstra/compatibility"
@@ -35,6 +36,9 @@ func TestGetSetSystemAgentManagerConfiguration(t *testing.T) {
 				SkipPristineValidation:          !mgrCfg.SkipPristineValidation,
 				SkipInterfaceShutdownOnUpgrade:  !mgrCfg.SkipInterfaceShutdownOnUpgrade,
 			}
+			if compatibility.HasDeviceOsImageDownloadTimeout.Check(client.client.apiVersion) {
+				testCfg.DeviceOsImageDownloadTimeout = toPtr(rand.IntN(2700) + 1)
+			}
 
 			// set new config
 			log.Printf("testing SetSystemAgentManagerConfig() against %s %s (%s)", client.clientType, clientName, client.client.ApiVersion())

diff --git a/apstra/client.go b/apstra/client.go
@@ -1674,6 +1674,9 @@ func (o *Client) GetSystemAgentManagerConfig(ctx context.Context) (*SystemAgentM
 // SetSystemAgentManagerConfig uses a *SystemAgentManagerConfig object to configure the Advanced Settings
 // found on the Managed Devices page of the Web UI.
 func (o *Client) SetSystemAgentManagerConfig(ctx context.Context, cfg *SystemAgentManagerConfig) error {
+	if compatibility.HasDeviceOsImageDownloadTimeout.Check(o.apiVersion) != (cfg.DeviceOsImageDownloadTimeout != nil) {
+		return fmt.Errorf("DeviceOsImageDownloadTimeout is required with apstra %s, and must not be used with other versions", compatibility.HasDeviceOsImageDownloadTimeout)
+	}
 	if !compatibility.SystemManagerHasSkipInterfaceShutdownOnUpgrade.Check(o.apiVersion) && cfg.SkipInterfaceShutdownOnUpgrade {
 		return fmt.Errorf("SkipInterfaceShutdownOnUpgrade may only be used with apstra %s", compatibility.SystemManagerHasSkipInterfaceShutdownOnUpgrade)
 	}

diff --git a/apstra/compatibility/compatibility.go b/apstra/compatibility/compatibility.go
@@ -15,6 +15,7 @@ const (
 	apstra422  = "4.2.2"
 	apstra500  = "5.0.0"
 	apstra501  = "5.0.1"
+	apstra510  = "5.1.0"
 )
 
 var (

diff --git a/apstra/compatibility/constraints.go b/apstra/compatibility/constraints.go
@@ -17,11 +17,14 @@ var (
 	BpHasVirtualNetworkPolicyNode = Constraint{
 		constraints: version.MustConstraints(version.NewConstraint("<=" + apstra420)),
 	}
+	EmptyVnBindingsOk = Constraint{
+		constraints: version.MustConstraints(version.NewConstraint(">=" + apstra500)),
+	}
 	FabricSettingsApiOk = Constraint{
 		constraints: version.MustConstraints(version.NewConstraint(">=" + apstra421)),
 	}
-	EmptyVnBindingsOk = Constraint{
-		constraints: version.MustConstraints(version.NewConstraint(">=" + apstra500)),
+	HasDeviceOsImageDownloadTimeout = Constraint{
+		constraints: version.MustConstraints(version.NewConstraint(">=" + apstra510)),
 	}
 	IbaDashboardSupported = Constraint{
 		constraints: version.MustConstraints(version.NewConstraint(">=" + apstra500)),