Add update support for network block in vcd_vapp_vm, allow force guest customization

CHANGELOG.md

@@ -16,6 +16,8 @@ IMPROVEMENTS:
 * `resource/vcd_catalog_item`: CatalogItem state ID changed from colon separated list of catalog name and item name to vCD ID 
 * `resource/catalog_item` added catalog item metadata support [#298] 
 * `resource/catalog_media` added catalog media item metadata support [#298]
+* `resource/vcd_vapp_vm` supports update for `network` block [#310]
+* `resource/vcd_vapp_vm` allows to force guest customization [#310]
 * Upgrade Terraform SDK dependency to 0.12.6 [#302]
 
 BUG FIXES:

GNUmakefile

@@ -54,6 +54,10 @@ test: testunit
 testacc: testunit
 	@sh -c "'$(CURDIR)/scripts/runtest.sh' acceptance"
 
+# Runs full acceptance test sequentially (using "-parallel 1" flag for go test)
+seqtestacc: testunit
+	@sh -c "'$(CURDIR)/scripts/runtest.sh' sequential-acceptance"
+
 # Runs the acceptance test with tag 'multiple'
 testmulti: fmtcheck
 	@sh -c "'$(CURDIR)/scripts/runtest.sh' multiple"
@@ -141,5 +145,5 @@ ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
 endif
 	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
 
-.PHONY: build test testacc vet fmt fmtcheck errcheck vendor-check test-compile website website-test
+.PHONY: build test seqtestacc testacc vet fmt fmtcheck errcheck vendor-check test-compile website website-test
 

TESTING.md

@@ -6,6 +6,7 @@
 - [Running tests](#running-tests)
 - [Tests split by feature set](#tests-split-by-feature-set)
 - [Adding new tests](#adding-new-tests)
+  - [Parallelism considerations](#parallelism-considerations)
 - [Binary testing](#binary-testing)
 - [Custom terraform scripts](#custom-terraform-scripts)
 - [Environment variables](#environment-variables)
@@ -279,6 +280,17 @@ testacc: testunit
 	@sh -c "'$(CURDIR)/scripts/runtest.sh' acceptance"
 ```
 
+### Parallelism considerations
+
+When writing Terraform acceptance tests there are two ways to define tests. Either using
+`resource.Test` or `resource.ParallelTest`. The former runs tests sequentially one by one while the
+later runs all the tests (which are defined to be run in parallel) instantiated this way in
+parallel. This is useful because it can speed up total test execution time. However one must be sure
+that the tests defined for parallel run are not clashing with each other.
+
+By default `make testacc` runs acceptance tests with parallelism enabled (for the tests which are
+defined with `resource.ParallelTest`). If there is a need to troubleshoot or simply force the tests
+to run sequentially - `make seqtestacc` can be used to achieve it.
 
 ## Binary testing
 

go.mod

@@ -4,9 +4,5 @@ go 1.12
 
 require (
 	github.com/hashicorp/terraform v0.12.6
-	github.com/vmware/go-vcloud-director/v2 v2.4.0-alpha.3
+	github.com/vmware/go-vcloud-director/v2 v2.4.0-alpha.5
 )
-
-// replace github.com/vmware/go-vcloud-director/v2 => github.com/dataclouder/go-vcloud-director/v2 v2.4.0-alpha-4
-
-// replace github.com/vmware/go-vcloud-director/v2 => ../go-vcloud-director

go.sum

@@ -313,8 +313,8 @@ github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4A
 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.4.0-alpha.3 h1:W7EVVlITB8G0CMXPuoVxLNkznlMhL2+3fWhGWpf/BF8=
-github.com/vmware/go-vcloud-director/v2 v2.4.0-alpha.3/go.mod h1:+Hq7ryFfgZqsO6mXH29RQFnpIMSujCOMI57otHoXHhQ=
+github.com/vmware/go-vcloud-director/v2 v2.4.0-alpha.5 h1:bj07gO1M9wxx0GYxj+xgqR3AprvuzqZNLLvFpOJTULQ=
+github.com/vmware/go-vcloud-director/v2 v2.4.0-alpha.5/go.mod h1:+Hq7ryFfgZqsO6mXH29RQFnpIMSujCOMI57otHoXHhQ=
 github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
 github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=

scripts/runtest.sh

@@ -22,7 +22,7 @@ then
     VERBOSE=1
 fi
 
-accepted="[short acceptance multiple binary binary-prepare catalog gateway vapp vm network extnetwork multinetwork short-provider lb user]"
+accepted="[short acceptance sequential-acceptance multiple binary binary-prepare catalog gateway vapp vm network extnetwork multinetwork short-provider lb user]"
 if [ -z "$wanted" ]
 then
     echo "Syntax: test TYPE"
@@ -90,6 +90,7 @@ function short_test {
 
 function acceptance_test {
     tags="$1"
+    parallel="$2"
     if [ -z "$tags" ]
     then
         tags=functional
@@ -103,7 +104,7 @@ function acceptance_test {
     if [ -z "$DRY_RUN" ]
     then
         check_for_config_file
-        TF_ACC=1 go test -tags "$tags" -v -timeout $timeout .
+        TF_ACC=1 go test -tags "$tags" $parallel -v -timeout $timeout .
     fi
 }
 
@@ -201,6 +202,9 @@ case $wanted in
     acceptance)
         acceptance_test functional
         ;;
+    sequential-acceptance)
+        acceptance_test functional "--parallel=1"
+        ;;
     multinetwork)
         multiple_test TestAccVcdVappNetworkMulti
         ;;

vcd/provider_test.go

@@ -71,3 +71,14 @@ func createTemporaryVCDConnection() *VCDClient {
 	}
 	return conn
 }
+
+// minIfLess returns:
+// `min` if `value` is less than min
+// `value` if `value` > `min`
+func minIfLess(min, value int) int {
+	if value < min {
+		return min
+	}
+
+	return value
+}

vcd/resource_vcd_edgegateway_test.go

@@ -51,7 +51,7 @@ func TestAccVcdEdgeGatewayBasic(t *testing.T) {
 		return
 	}
 	debugPrintf("#[DEBUG] CONFIGURATION: %s", configText)
-	resource.Test(t, resource.TestCase{
+	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckVcdEdgeGatewayDestroyBasic,

vcd/resource_vcd_external_network.go

@@ -206,9 +206,7 @@ func resourceVcdExternalNetworkDelete(d *schema.ResourceData, meta interface{})
 // any cast operations or default values should be done here so that the create method is simple
 func getExternalNetworkInput(d *schema.ResourceData, vcdClient *VCDClient) (*types.ExternalNetwork, error) {
 	params := &types.ExternalNetwork{
-		Name:        d.Get("name").(string),
-		Xmlns:       types.XMLNamespaceExtension,
-		XmlnsVCloud: types.XMLNamespaceVCloud,
+		Name: d.Get("name").(string),
 		Configuration: &types.NetworkConfiguration{
 			Xmlns:                          types.XMLNamespaceVCloud,
 			RetainNetInfoAcrossDeployments: d.Get("retain_net_info_across_deployments").(bool),

vcd/resource_vcd_lb_app_profile_test.go

@@ -56,7 +56,7 @@ func TestAccVcdLBAppProfile(t *testing.T) {
 		return
 	}
 
-	resource.Test(t, resource.TestCase{
+	resource.ParallelTest(t, resource.TestCase{
 		Providers:    testAccProviders,
 		PreCheck:     func() { testAccPreCheck(t) },
 		CheckDestroy: testAccCheckVcdLBAppProfileDestroy(params["AppProfileName"].(string)),

vcd/resource_vcd_lb_app_rule_test.go

@@ -63,7 +63,7 @@ acl other_page2 url_beg / other2 redirect location https://www.other2.com/ ifoth
 		return
 	}
 
-	resource.Test(t, resource.TestCase{
+	resource.ParallelTest(t, resource.TestCase{
 		Providers:    testAccProviders,
 		PreCheck:     func() { testAccPreCheck(t) },
 		CheckDestroy: testAccCheckVcdLBAppRuleDestroy(params["AppRuleName"].(string)),

vcd/resource_vcd_lb_server_pool_test.go

@@ -43,7 +43,7 @@ func TestAccVcdLbServerPool(t *testing.T) {
 		return
 	}
 
-	resource.Test(t, resource.TestCase{
+	resource.ParallelTest(t, resource.TestCase{
 		Providers:    testAccProviders,
 		PreCheck:     func() { testAccPreCheck(t) },
 		CheckDestroy: testAccCheckVcdLbServerPoolDestroy(params["ServerPoolName"].(string)),

vcd/resource_vcd_lb_service_monitor_test.go

@@ -47,7 +47,7 @@ func TestAccVcdLbServiceMonitor(t *testing.T) {
 		t.Skip(t.Name() + "requires advanced edge gateway to work")
 	}
 
-	resource.Test(t, resource.TestCase{
+	resource.ParallelTest(t, resource.TestCase{
 		Providers:    testAccProviders,
 		PreCheck:     func() { testAccPreCheck(t) },
 		CheckDestroy: testAccCheckVcdLbServiceMonitorDestroy(params["ServiceMonitorName"].(string)),

vcd/resource_vcd_lb_virtual_server_test.go

@@ -38,7 +38,7 @@ func TestAccVcdLbVirtualServer(t *testing.T) {
 		return
 	}
 
-	resource.Test(t, resource.TestCase{
+	resource.ParallelTest(t, resource.TestCase{
 		Providers:    testAccProviders,
 		PreCheck:     func() { testAccPreCheck(t) },
 		CheckDestroy: testAccCheckVcdLbVirtualServerDestroy(params["VirtualServerName"].(string)),