* Tune VDC configuration to avoid test errors TestAccVcdStandaloneVmWithVmSizing, TestAccVcdVAppVm_4types_sizing_max, TestAccVcdVAppVm_4types_sizing_cpu_only, TestAccVcdVAppVmWithVmSizing

* Tune boot retry delay settings in vcd_vapp_vm test  TestAccVcdVAppVmBootOptions

Signed-off-by: Dainius Serplis <dserplis@vmware.com>

Author: Didainius

vcd/resource_vcd_standalone_vm_with_vm_sizing_test.go

@@ -42,7 +42,7 @@ func TestAccVcdStandaloneVmWithVmSizing(t *testing.T) {
 		"ProviderVdc":               testConfig.VCD.NsxtProviderVdc.Name,
 		"NetworkPool":               testConfig.VCD.NsxtProviderVdc.NetworkPool,
 		"Allocated":                 "10240",
-		"Reserved":                  "0",
+		"Reserved":                  "10240",
 		"Limit":                     "10240",
 		"ProviderVdcStorageProfile": testConfig.VCD.NsxtProviderVdc.StorageProfile,
 		"FuncName":                  t.Name(),
@@ -287,15 +287,15 @@ resource "vcd_org_vdc" "{{.VdcName}}" {
   allocation_model  = "{{.AllocationModel}}"
   network_pool_name = "{{.NetworkPool}}"
   provider_vdc_name = "{{.ProviderVdc}}"
+  memory_guaranteed = 1
+  cpu_guaranteed    = 1
 
   compute_capacity {
     cpu {
-      allocated = "{{.Allocated}}"
       limit     = "{{.Limit}}"
     }
 
     memory {
-      allocated = "{{.Allocated}}"
       limit     = "{{.Limit}}"
     }
   }

vcd/resource_vcd_vapp_vm_4types_test.go

@@ -1497,15 +1497,15 @@ resource "vcd_org_vdc" "sizing-policy" {
   allocation_model  = "{{.AllocationModel}}"
   network_pool_name = "{{.NetworkPool}}"
   provider_vdc_name = "{{.ProviderVdc}}"
+  memory_guaranteed = 1
+  cpu_guaranteed    = 1
 
   compute_capacity {
     cpu {
-      allocated = "{{.Allocated}}"
       limit     = "{{.Limit}}"
     }
 
     memory {
-      allocated = "{{.Allocated}}"
       limit     = "{{.Limit}}"
     }
   }
@@ -1739,7 +1739,7 @@ func TestAccVcdVAppVm_4types_sizing_max(t *testing.T) {
 
 		"AllocationModel":           "Flex",
 		"Allocated":                 "40000",
-		"Reserved":                  "0",
+		"Reserved":                  "40000",
 		"Limit":                     "40000",
 		"ProviderVdcStorageProfile": testConfig.VCD.ProviderVdc.StorageProfile,
 		"FuncName":                  t.Name(),
@@ -2053,7 +2053,7 @@ func TestAccVcdVAppVm_4types_sizing_cpu_only(t *testing.T) {
 
 		"AllocationModel":           "Flex",
 		"Allocated":                 "30000",
-		"Reserved":                  "0",
+		"Reserved":                  "30000",
 		"Limit":                     "32000",
 		"ProviderVdcStorageProfile": testConfig.VCD.ProviderVdc.StorageProfile,
 		"FuncName":                  t.Name(),