Add support for network_dhcp_wait_seconds invcd_vapp_vm

CHANGELOG.md

@@ -6,6 +6,8 @@ FEATURES:
 * `vcd_vapp_vm` Internal disks in VM template allows to be edited by `override_template_disk` field
   [GH-412]
 * `vcd_org_vdc` can be created with Flex allocation in vCD 9.7 and later. Also two new fields added for Flex - `elasticity`, `include_vm_memory_overhead` [GH-443]
+* `resource/vcd_vapp_vm` and `datasource/vcd_vapp_vm` get optional `network_dhcp_wait_seconds` field
+  to ensure `ip` is reported when `ip_allocation_mode=DHCP` is used [GH-436]
 
 IMPROVEMENTS:
 

go.mod

@@ -5,5 +5,5 @@ go 1.13
 require (
 	github.com/hashicorp/go-version v1.2.0
 	github.com/hashicorp/terraform-plugin-sdk v1.5.0
-	github.com/vmware/go-vcloud-director/v2 v2.6.0-alpha.4
+	github.com/vmware/go-vcloud-director/v2 v2.6.0-alpha.6
 )

go.sum

@@ -190,8 +190,8 @@ github.com/vmihailenco/msgpack v3.3.3+incompatible h1:wapg9xDUZDzGCNFlwc5SqI1rvc
 github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/vmihailenco/msgpack v4.0.1+incompatible h1:RMF1enSPeKTlXrXdOcqjFUElywVZjjC6pqse21bKbEU=
 github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
-github.com/vmware/go-vcloud-director/v2 v2.6.0-alpha.4 h1:fFpq9kNMzehNWuh4Q4LPurqZdhxVkgszuA0qJ21csyk=
-github.com/vmware/go-vcloud-director/v2 v2.6.0-alpha.4/go.mod h1:XY9Fmqp1JeHIU2nP87NykB6unNCsY6qV4Zdu5JI4aZU=
+github.com/vmware/go-vcloud-director/v2 v2.6.0-alpha.6 h1:FixFeoQ0+q8sMVXVfEeVegoJPwcOiVOtEHV4UAjrpSM=
+github.com/vmware/go-vcloud-director/v2 v2.6.0-alpha.6/go.mod h1:XY9Fmqp1JeHIU2nP87NykB6unNCsY6qV4Zdu5JI4aZU=
 github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
 github.com/zclconf/go-cty v1.1.0 h1:uJwc9HiBOCpoKIObTQaLR+tsEXx1HBHnOsOOpcdhZgw=
 github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=

vcd/datasource_vcd_vapp_vm.go

@@ -2,6 +2,7 @@ package vcd
 
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 )
 
 func datasourceVcdVAppVm() *schema.Resource {
@@ -71,6 +72,13 @@ func datasourceVcdVAppVm() *schema.Resource {
 				Computed:    true,
 				Description: "Storage profile used with the VM",
 			},
+			"network_dhcp_wait_seconds": {
+				Optional:     true,
+				Type:         schema.TypeInt,
+				ValidateFunc: validation.IntAtLeast(0),
+				Description: "Optional number of seconds to try and wait for DHCP IP (valid for " +
+					"'network' block only)",
+			},
 			"network": {
 				Computed:    true,
 				Type:        schema.TypeList,

vcd/helpers.go

@@ -0,0 +1,24 @@
+package vcd
+
+import (
+	"log"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+)
+
+// onlyHasChange is a schema helper which accepts Terraform schema definition and checks if field
+// with `fieldName` is the only one which has change (using d.HasChange)
+func onlyHasChange(fieldName string, schema map[string]*schema.Schema, d *schema.ResourceData) bool {
+	log.Printf("[DEBUG] [VM update] checking if only field '%s' has change during update", fieldName)
+	for schemaFieldName := range schema {
+		// Skip checking defined field
+		if schemaFieldName == fieldName {
+			continue
+		}
+		if d.HasChange(schemaFieldName) {
+			log.Printf("[DEBUG] [VM update] field '%s' has change", schemaFieldName)
+			return false
+		}
+	}
+	return true
+}

vcd/resource_vcd_edgegateway.go

@@ -175,7 +175,7 @@ func resourceVcdEdgeGateway() *schema.Resource {
 				Optional:      true,
 				Computed:      true,
 				ForceNew:      true,
-				Deprecated:    "Please use the more advanced 'external_network' block(s)",
+				Deprecated:    "Please use 'use_for_default_route' flag in the more advanced 'external_network' block(s)",
 				Description:   "External network to be used as default gateway. Its name must be included in 'external_networks'. An empty value will skip the default gateway",
 			},
 			"default_external_network_ip": &schema.Schema{