addressing PR #242 com

ments

Author: pritispa

internal/provider/inventory_devices_resource.go

@@ -33,6 +33,11 @@ import (
 	"github.com/tidwall/gjson"
 )
 
+const (
+	configSaveMaxRetries       = 5
+	configSaveRetryWaitTimeout = 60
+)
+
 var _ resource.Resource = &InventoryDevicesResource{}
 var _ resource.ResourceWithImportState = &InventoryDevicesResource{}
 
@@ -254,7 +259,7 @@ func (r *InventoryDevicesResource) Create(ctx context.Context, req resource.Crea
 		deleteDevicesFromInventory(ctx, r.client, &resp.Diagnostics, &stateData)
 		return
 	}
-	deployAndSaveWithRetry(ctx, r.client, &resp.Diagnostics, &planData, 5, 60)
+	deployAndSaveWithRetry(ctx, r.client, &resp.Diagnostics, &planData)
 	if resp.Diagnostics.HasError() {
 		tflog.Debug(ctx, "Save and Deploy failed, deleting devices from inventory")
 		deleteDevicesFromInventory(ctx, r.client, &resp.Diagnostics, &planData)
@@ -1089,23 +1094,16 @@ func deployAndSave(ctx context.Context, client *ndfc.NDFC, diags *diag.Diagnosti
 	tflog.Debug(ctx, fmt.Sprintf("End of %s deployAndSave", loggingInventoryDevices))
 }
 
-func deployAndSaveWithRetry(
-	ctx context.Context,
-	client *ndfc.NDFC,
-	diags *diag.Diagnostics,
-	data *InventoryDevicesModel,
-	maxRetries int64,
-	retryWaitTimeout int64,
-) {
+func deployAndSaveWithRetry(ctx context.Context, client *ndfc.NDFC, diags *diag.Diagnostics, data *InventoryDevicesModel) {
 	tflog.Debug(ctx, fmt.Sprintf("Start of %s deployAndSaveWithRetry", loggingInventoryDevices))
-	// This retry mechanism is a fix for unexpected NDFC 12.2.2/ND4.1 behaviour where sometimes, recalculate (config-save) fails even if devices are reachable.
-	for attempt := int64(0); attempt < maxRetries; attempt++ {
-		tflog.Debug(ctx, fmt.Sprintf("This is attempt number: %d", attempt+1))
+	// This retry mechanism is a fix for unexpected NDFC 12.2.2/ND4.1 behaviour.
+	// Where sometimes, recalculate (config-save) fails even if the devices are reachable.
+	for attempt := 0; attempt < configSaveMaxRetries; attempt++ {
 		deployAndSave(ctx, client, diags, data)
 		if diags.HasError() {
-			tflog.Debug(ctx, fmt.Sprintf("Waiting for %v seconds before retrying config-save", retryWaitTimeout))
-			time.Sleep(time.Duration(retryWaitTimeout) * time.Second)
-			if attempt < maxRetries-1 {
+			tflog.Debug(ctx, fmt.Sprintf("Waiting for %v seconds before retrying config-save", configSaveRetryWaitTimeout))
+			time.Sleep(time.Duration(configSaveRetryWaitTimeout) * time.Second)
+			if attempt < configSaveMaxRetries-1 {
 				*diags = diag.Diagnostics{}
 			}
 			continue