Add datastore cluster support to datastore resources #439
Conversation
Adding the datastore_cluster_id attribute to the vsphere_nas_datastore resource, allowing the deployment of a datastore to a datastore cluster.
We are moving some resource helpers that are shared between NAS and VMFS datastore resources here, so a more general name is needed, as it's not just for summary anymore.
This adds the datastore_cluster_id attribute to the VMFS datastore resource, allowing one to add a VMFS datastore resource to a datastore cluster. In addition to this, a bit of refactoring was done to remove some unused error messages, and adding additional disks during creation was moved up in precedence so that the ID could be set earlier, removing the need for rollback on folder moves and ID/custom attribute modification.
| // resource schema) | ||
| // * Type (redundant attribute as the datastore type will be represented by | ||
| // the resource) | ||
| "accessible": &schema.Schema{ |
There was a problem hiding this comment.
Minor nitpick: the &schema.Schema here are extraneous since its defined above in map[string]*schema.Schema
| d.Set("uncommitted_space", structure.ByteToMB(obj.Uncommitted)) | ||
| d.Set("url", obj.Url) | ||
|
|
||
| // Set the name attribute off of the name here - since we do not track this |
vsphere/datastore_structure.go
Outdated
| path = fvalue.(string) | ||
| case cok: | ||
| var err error | ||
| path, err = resourceVSphereDatastoreStorageClusterPathNormalized(meta, cvalue.(string)) |
There was a problem hiding this comment.
Minor nitpick: Seems like we can just return resourceVSphereDatastoreStorageClusterPathNormalized(meta, cvalue.(string)) here
| ConflictsWith: []string{"datastore_cluster_id"}, | ||
| StateFunc: folder.NormalizePath, | ||
| }, | ||
| "datastore_cluster_id": &schema.Schema{ |
There was a problem hiding this comment.
Minor nitpick: extraneous &schema.Schema
| ConflictsWith: []string{"datastore_cluster_id"}, | ||
| StateFunc: folder.NormalizePath, | ||
| }, | ||
| "datastore_cluster_id": &schema.Schema{ |
There was a problem hiding this comment.
Minor nitpick: extraneous &schema.Schema
| @@ -199,8 +157,35 @@ func resourceVSphereVmfsDatastoreCreate(d *schema.ResourceData, meta interface{} | |||
| } | |||
| } | |||
|
|
|||
| // Set the ID here now as most other issues here can be applied on an update, | |||
|
Thanks @bflad! I've made the change mentioned in Merging now! |
ghost
locked and limited conversation to collaborators
This adds support for datastore clusters to both
vsphere_nas_datastoreandvsphere_vmfs_datastore. They share the same attribute and common behaviour,datastore_cluster_id, which stands in forfolderwhen used. As a result, the attribute conflicts with folder - as datastore clusters are containers in of themselves, placement in one or the other is mutually exclusive.Docs have been updated as well, tests have been added, and the
datastore_summary_structure.gofile has been renamed todatastore_structure.goso that it can hold shared functionality for determining what attribute betweenfolderanddatastore_cluster_idis in use at any particular time.