Allow to configure timeout for ip allocation

In IP address allocation resource, allow to configure timeout for IP realization. Signed-off-by: Anna Khmelnitsky <[email protected]>
vmware · Jan 4, 2024 · f30c283 · f30c283
1 parent a52afcd
commit f30c283
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/nsxt/policy_utils.go b/nsxt/policy_utils.go
@@ -305,7 +305,7 @@ func commaSeparatedStringToStringList(commaString string) []string {
 	return strList
 }
 
-func nsxtPolicyWaitForRealizationStateConf(connector client.Connector, d *schema.ResourceData, realizedEntityPath string) *resource.StateChangeConf {
+func nsxtPolicyWaitForRealizationStateConf(connector client.Connector, d *schema.ResourceData, realizedEntityPath string, timeout int) *resource.StateChangeConf {
 	client := realized_state.NewRealizedEntitiesClient(connector)
 	pendingStates := []string{"UNKNOWN", "UNREALIZED"}
 	targetStates := []string{"REALIZED", "ERROR"}
@@ -327,7 +327,7 @@ func nsxtPolicyWaitForRealizationStateConf(connector client.Connector, d *schema
 			}
 			return nil, "", realizationError
 		},
-		Timeout:    d.Timeout(schema.TimeoutCreate),
+		Timeout:    time.Duration(timeout) * time.Second,
 		MinTimeout: 1 * time.Second,
 		Delay:      1 * time.Second,
 	}

diff --git a/nsxt/resource_nsxt_policy_ip_address_allocation.go b/nsxt/resource_nsxt_policy_ip_address_allocation.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/vmware/vsphere-automation-sdk-go/runtime/protocol/client"
 	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
 
@@ -19,6 +20,8 @@ import (
 	utl "github.com/vmware/terraform-provider-nsxt/api/utl"
 )
 
+var addressRealizationTimeoutDefaut = int(1200)
+
 func resourceNsxtPolicyIPAddressAllocation() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceNsxtPolicyIPAddressAllocationCreate,
@@ -46,6 +49,13 @@ func resourceNsxtPolicyIPAddressAllocation() *schema.Resource {
 				Computed:     true,
 				ForceNew:     true,
 			},
+			"timeout": {
+				Type:         schema.TypeInt,
+				Description:  "Realization timeout in seconds",
+				Optional:     true,
+				Default:      addressRealizationTimeoutDefaut,
+				ValidateFunc: validation.IntAtLeast(1),
+			},
 		},
 	}
 }
@@ -149,9 +159,10 @@ func resourceNsxtPolicyIPAddressAllocationRead(d *schema.ResourceData, m interfa
 	d.Set("allocation_ip", obj.AllocationIp)
 
 	if d.Get("allocation_ip").(string) == "" {
+		timeout := d.Get("timeout").(int)
 		log.Printf("[DEBUG] Waiting for realization of IP Address for IP Allocation with ID %s", id)
 
-		stateConf := nsxtPolicyWaitForRealizationStateConf(connector, d, d.Get("path").(string))
+		stateConf := nsxtPolicyWaitForRealizationStateConf(connector, d, d.Get("path").(string), timeout)
 		entity, err := stateConf.WaitForState()
 		if err != nil {
 			return err
@@ -228,6 +239,9 @@ func resourceNsxtPolicyIPAddressAllocationDelete(d *schema.ResourceData, m inter
 func resourceNsxtPolicyIPAddressAllocationImport(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
 	importID := d.Id()
 	s := strings.Split(importID, "/")
+
+	d.Set("timeout", addressRealizationTimeoutDefaut)
+
 	rd, err := nsxtPolicyPathResourceImporterHelper(d, m)
 	if err == nil {
 		poolPath, err := getParameterFromPolicyPath("", "/ip-allocations/", importID)
@@ -253,7 +267,6 @@ func resourceNsxtPolicyIPAddressAllocationImport(d *schema.ResourceData, m inter
 		return nil, err
 	}
 	d.Set("pool_path", pool.Path)
-
 	d.SetId(s[1])
 
 	return []*schema.ResourceData{d}, nil