Add Provider VDC and VM Group data sources, VM Placement policies resource+data source and support for VM Placement policies in VDCs

.changes/v3.8.0/904-deprecations.md

@@ -0,0 +1,3 @@
+* Deprecated `default_vm_sizing_policy_id` field in `vcd_org_vdc` resource and data source. This field is misleading as it
+  can contain not only VM Sizing Policies but also VM Placement Policies or vGPU Policies.
+  Its replacement is the `default_compute_policy_id` attribute [GH-904]

.changes/v3.8.0/904-features.md

@@ -0,0 +1,4 @@
+* **New Resource:** `vcd_vm_placement_policy` that allows creating VM Placement Policies [GH-904]
+* **New Data Source:** `vcd_vm_placement_policy` that allows fetching existing VM Placement Policies [GH-904]
+* **New Data Source:** `vcd_provider_vdc` that allows fetching existing Provider VDCs [GH-904]
+* **New Data Source:** `vcd_vm_group` that allows fetching existing VM Groups, to be able to create VM Placement Policies [GH-904]

.changes/v3.8.0/904-improvements.md

@@ -0,0 +1,4 @@
+* Added `vm_placement_policy_ids` attribute to `vcd_org_vdc` resource and data source to assign existing
+  VM Placement Policies to VDCs [GH-904]
+* Added `default_compute_policy_id` attribute to `vcd_org_vdc` resource and data source to specify a default
+  VM Sizing Policy, VM Placement Policy or vGPU Policy for the VDC [GH-904]

go.mod

@@ -58,3 +58,5 @@ require (
 	google.golang.org/grpc v1.46.0 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 )
+
+replace github.com/vmware/go-vcloud-director/v2 => github.com/adambarreiro/go-vcloud-director/v2 v2.17.0-alpha.1.0.20220906102404-20ad03790c56

go.sum

@@ -8,6 +8,8 @@ github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 h1:YoJbenK9C6
 github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
 github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk=
 github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
+github.com/adambarreiro/go-vcloud-director/v2 v2.17.0-alpha.1.0.20220906102404-20ad03790c56 h1:nDzQm8TXnuZ+GMUiSjiJ/tjOtivrxdr2CwhuqVhFIlc=
+github.com/adambarreiro/go-vcloud-director/v2 v2.17.0-alpha.1.0.20220906102404-20ad03790c56/go.mod h1:VRA1ZLDf6CtL1atU1ceMj6/3h9HJg+zjBLaMNODF1qQ=
 github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
 github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE=
 github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
@@ -203,8 +205,6 @@ github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvC
 github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4=
 github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37wVyIuWY=
 github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
-github.com/vmware/go-vcloud-director/v2 v2.17.0-alpha.2 h1:dKUeUdDimwPU78NIxeFAN+YRfBZ6q9tXeSPFKmyEGvk=
-github.com/vmware/go-vcloud-director/v2 v2.17.0-alpha.2/go.mod h1:VRA1ZLDf6CtL1atU1ceMj6/3h9HJg+zjBLaMNODF1qQ=
 github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
 github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
 github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=

vcd/config_test.go

@@ -98,10 +98,11 @@ type TestConfig struct {
 			StorageProfile2 string `json:"storageProfile2"`
 		} `json:"providerVdc"`
 		NsxtProviderVdc struct {
-			Name            string `json:"name"`
-			StorageProfile  string `json:"storageProfile"`
-			StorageProfile2 string `json:"storageProfile2"`
-			NetworkPool     string `json:"networkPool"`
+			Name                   string `json:"name"`
+			StorageProfile         string `json:"storageProfile"`
+			StorageProfile2        string `json:"storageProfile2"`
+			NetworkPool            string `json:"networkPool"`
+			PlacementPolicyVmGroup string `json:"placementPolicyVmGroup"` // Name of the VM group to create VM Placement Policies
 		} `json:"nsxtProviderVdc"`
 		Catalog struct {
 			Name                    string `json:"name,omitempty"`

vcd/datasource_not_found_test.go

@@ -207,6 +207,8 @@ func addMandatoryParams(dataSourceName string, mandatoryFields []string, t *test
 			// Invalid fields which are required for some resources for search (usually they are used instead of `name`)
 		case "vdc_group_id":
 			templateFields = templateFields + `vdc_group_id = "urn:vcloud:vdcGroup:c19ec5b1-3403-4d00-b414-9da50066dc1e"` + "\n"
+		case "provider_vdc_id":
+			templateFields = templateFields + `provider_vdc_id = "urn:vcloud:providervdc:8453a2e2-1432-4e67-a312-8e713495eabc"` + "\n"
 		case "rule_id":
 			templateFields = templateFields + `rule_id = "347928347234"` + "\n"
 		case "name":

vcd/datasource_vcd_org_vdc.go

@@ -192,15 +192,29 @@ func datasourceVcdOrgVdc() *schema.Resource {
 			"vm_sizing_policy_ids": {
 				Type:        schema.TypeSet,
 				Computed:    true,
-				Description: "Set of VM sizing policy IDs",
+				Description: "Set of VM Sizing policy IDs",
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+			"vm_placement_policy_ids": {
+				Type:        schema.TypeSet,
+				Computed:    true,
+				Description: "Set of VM Placement policy IDs",
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
 				},
 			},
 			"default_vm_sizing_policy_id": {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: "ID of default VM sizing policy ID",
+				Deprecated:  "Use `default_compute_policy_id` attribute instead, which can support VM Sizing Policies, VM Placement Policies and vGPU Policies",
+				Description: "ID of default VM Compute policy, which can be a VM Sizing Policy, VM Placement Policy or vGPU Policy",
+			},
+			"default_compute_policy_id": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "ID of default Compute policy for this VDC, which can be a VM Sizing Policy, VM Placement Policy or vGPU Policy",
 			},
 		},
 	}

vcd/datasource_vcd_org_vdc_test.go

@@ -118,7 +118,11 @@ func validateResourceAndDataSource(t *testing.T, configText string, datasourceVd
 					resource.TestMatchResourceAttr(
 						"data."+datasourceVdc, "compute_capacity.0.memory.0.used", regexp.MustCompile(`^\d+$`)),
 					resource.TestMatchResourceAttr(
-						"data."+datasourceVdc, "storage_profile.0.storage_used_in_mb", regexp.MustCompile(`^\d+$`))),
+						"data."+datasourceVdc, "storage_profile.0.storage_used_in_mb", regexp.MustCompile(`^\d+$`)),
+					resource.TestMatchResourceAttr(
+						"data."+datasourceVdc, "default_compute_policy_id", regexp.MustCompile(`urn:vcloud:vdcComputePolicy:[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$`)),
+					resource.TestMatchResourceAttr(
+						"data."+datasourceVdc, "vm_sizing_policy_ids.#", regexp.MustCompile(`[1-9]`))), // At least 1 sizing policy (the System default)
 			},
 		},
 	})
@@ -149,7 +153,9 @@ func validateDataSource(t *testing.T, configText string, datasourceVdc string) {
 					resource.TestMatchResourceAttr("data."+datasourceVdc, "compute_capacity.0.memory.0.limit", regexp.MustCompile(`^\d+$`)),
 					resource.TestMatchResourceAttr("data."+datasourceVdc, "compute_capacity.0.memory.0.allocated", regexp.MustCompile(`^\d+$`)),
 					resource.TestMatchResourceAttr("data."+datasourceVdc, "compute_capacity.0.memory.0.reserved", regexp.MustCompile(`^\d+$`)),
-					resource.TestMatchResourceAttr("data."+datasourceVdc, "storage_profile.0.storage_used_in_mb", regexp.MustCompile(`^\d+$`))),
+					resource.TestMatchResourceAttr("data."+datasourceVdc, "storage_profile.0.storage_used_in_mb", regexp.MustCompile(`^\d+$`)),
+					resource.TestMatchResourceAttr("data."+datasourceVdc, "default_compute_policy_id", regexp.MustCompile(`urn:vcloud:vdcComputePolicy:[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$`)),
+					resource.TestMatchResourceAttr("data."+datasourceVdc, "vm_sizing_policy_ids.#", regexp.MustCompile(`[1-9]`))), // At least 1 sizing policy (the System default)
 			},
 		},
 	})