Add computed data to VDC storage profile data source #782

vbauzys · 2022-02-07T14:16:09Z

ref: #692, #605
dep: vmware/go-vcloud-director#435

Added additional information returned from API to be written to state.

Additional fields:

limit
used_storage
default
enabled
iops_allocated
units
iops_settings

IOPS settings details:

iops_limiting_enabled
maximum_disk_iops
default_disk_iops
disk_iops_per_gb_max
iops_limit

Signed-off-by: Vaidotas Bauzys <vbauzys@vmware.com>

.changes/v3.6.0/782-improvements.md

vcd/datasource_vcd_storage_profile.go

adambarreiro · 2022-02-15T10:24:21Z

vcd/resource_vcd_vapp_vm.go

@@ -653,6 +653,9 @@ func genericResourceVmCreate(d *schema.ResourceData, meta interface{}, vmType ty
 				vmComputePolicy = nil
 			}
 			vmTemplate := vmTemplatefromVappTemplate(d.Get("vm_name_in_template").(string), vappTemplate.VAppTemplate)
+			if vmTemplate == nil {
+				return fmt.Errorf("[VM creation] vm template isn't found. Please check vApp templat %s : %s", vmName, err)


Suggested change

return fmt.Errorf("[VM creation] vm template isn't found. Please check vApp templat %s : %s", vmName, err)

return fmt.Errorf("[VM creation] VM template isn't found. Please check vApp template %s : %s", vmName, err)

Signed-off-by: Vaidotas Bauzys <vbauzys@vmware.com>

vcd/datasource_vcd_storage_profile.go

website/docs/d/storage_profile.html.markdown

Didainius · 2022-02-18T13:39:40Z

website/docs/d/storage_profile.html.markdown

+* `limit` - Maximum number of storage bytes (scaled by Units) allocated for this profile. A value of 0 is understood to mean `maximum possible`
+* `used_storage` - Storage used, in Megabytes, by the storage profile
+* `default` - True if this is default storage profile for this vDC. The default storage profile is used when an object that can specify a storage profile is created with no storage profile specified
+* `enabled` - True if this storage profile is enabled for use in the vDC"


I think we use Org and VDC

Suggested change

* `enabled` - True if this storage profile is enabled for use in the vDC"

* `enabled` - True if this storage profile is enabled for use in the VDC"

Didainius · 2022-02-18T13:39:51Z

website/docs/d/storage_profile.html.markdown

+
+* `limit` - Maximum number of storage bytes (scaled by Units) allocated for this profile. A value of 0 is understood to mean `maximum possible`
+* `used_storage` - Storage used, in Megabytes, by the storage profile
+* `default` - True if this is default storage profile for this vDC. The default storage profile is used when an object that can specify a storage profile is created with no storage profile specified


Suggested change

* `default` - True if this is default storage profile for this vDC. The default storage profile is used when an object that can specify a storage profile is created with no storage profile specified

* `default` - True if this is default storage profile for this VDC. The default storage profile is used when an object that can specify a storage profile is created with no storage profile specified

Didainius · 2022-02-18T13:40:27Z

website/docs/d/storage_profile.html.markdown

+(Supported in provider *v3.6+*)
+
+* `limit` - Maximum number of storage bytes (scaled by Units) allocated for this profile. A value of 0 is understood to mean `maximum possible`
+* `used_storage` - Storage used, in Megabytes, by the storage profile


Maybe it is just me, but it sounds strange - could this be simpler.

Suggested change

* `used_storage` - Storage used, in Megabytes, by the storage profile

* `used_storage` - Storage used, by the storage profile (in Megabytes)

Didainius · 2022-02-18T13:40:58Z

website/docs/d/storage_profile.html.markdown

-This data source exports only `id` field.
+(Supported in provider *v3.6+*)
+
+* `limit` - Maximum number of storage bytes (scaled by Units) allocated for this profile. A value of 0 is understood to mean `maximum possible`


Suggested change

* `limit` - Maximum number of storage bytes (scaled by Units) allocated for this profile. A value of 0 is understood to mean `maximum possible`

* `limit` - Maximum number of storage bytes (scaled by 'units' field) allocated for this profile. A value of 0 is understood to mean `maximum possible`

Signed-off-by: Vaidotas Bauzys <vbauzys@vmware.com>

Didainius

A few more inconsistencies in docs, but the code itself worked in my manual testing

Didainius · 2022-02-18T18:53:40Z

website/docs/d/storage_profile.html.markdown

+(Supported in provider *v3.6+*)
+
+* `limit` - Maximum number of storage bytes (scaled by 'units' field) allocated for this profile. `0` means `maximum possible`
+* `used_storage` - Storage used, by the storage profile (in Megabytes)


* `used_storage` - Storage used by the storage profile (in Megabytes)

Didainius · 2022-02-18T18:57:19Z

website/docs/d/storage_profile.html.markdown

+* `default` - True if this is default storage profile for this VDC. The default storage profile is used when an object that can specify a storage profile is created with no storage profile specified
+* `enabled` - True if this storage profile is enabled for use in the VDC
+* `iops_allocated` - Total IOPS currently allocated to this storage profile
+* `units` - Scale used to define Limit


Suggested change

* `units` - Scale used to define Limit

* `units` - Scale used to define limit

Didainius · 2022-02-18T18:59:24Z

website/docs/d/storage_profile.html.markdown

+* `maximum_disk_iops` - The maximum IOPS value that this storage profile is permitted to deliver. Value of 0 means this max setting is disabled and there is no max disk IOPS restriction
+* `default_disk_iops` - Value of 0 for disk IOPS means that no IOPS would be reserved or provisioned for that virtual disk
+* `disk_iops_per_gb_max` - The maximum disk IOPs per GB value that this storage profile is permitted to deliver. A value of 0 means there is no per GB IOPS restriction
+* `iops_limit` - Maximum number of IOPs that can be allocated for this profile. `0` means `maximum possible`


Suggested change

* `iops_limit` - Maximum number of IOPs that can be allocated for this profile. `0` means `maximum possible`

* `iops_limit` - Maximum number of IOPS that can be allocated for this profile. `0` means `maximum possible`

Didainius · 2022-02-18T18:59:35Z

website/docs/d/storage_profile.html.markdown

+* `iops_limiting_enabled` - True if this storage profile is IOPS-based placement enabled
+* `maximum_disk_iops` - The maximum IOPS value that this storage profile is permitted to deliver. Value of 0 means this max setting is disabled and there is no max disk IOPS restriction
+* `default_disk_iops` - Value of 0 for disk IOPS means that no IOPS would be reserved or provisioned for that virtual disk
+* `disk_iops_per_gb_max` - The maximum disk IOPs per GB value that this storage profile is permitted to deliver. A value of 0 means there is no per GB IOPS restriction


Suggested change

* `disk_iops_per_gb_max` - The maximum disk IOPs per GB value that this storage profile is permitted to deliver. A value of 0 means there is no per GB IOPS restriction

* `disk_iops_per_gb_max` - The maximum disk IOPS per GB value that this storage profile is permitted to deliver. A value of 0 means there is no per GB IOPS restriction

Didainius · 2022-02-18T19:00:44Z

vcd/datasource_vcd_storage_profile.go

+						"iops_limit": &schema.Schema{
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Maximum number of IOPs that can be allocated for this profile. `0` means `maximum possible`",


Suggested change

Description: "Maximum number of IOPs that can be allocated for this profile. `0` means `maximum possible`",

Description: "Maximum number of IOPS that can be allocated for this profile. `0` means `maximum possible`",

Didainius · 2022-02-18T19:00:55Z

vcd/datasource_vcd_storage_profile.go

+			"units": &schema.Schema{
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Scale used to define Limit",


Suggested change

Description: "Scale used to define Limit",

Description: "Scale used to define limit",

Didainius · 2022-02-18T19:02:51Z

vcd/datasource_vcd_storage_profile.go

+			"used_storage": &schema.Schema{
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "Storage used, in Megabytes, by the storage profile",


Suggested change

Description: "Storage used, in Megabytes, by the storage profile",

Description: "Storage used, by the storage profile (in Megabytes)",

mikeletux

LGTM!

Signed-off-by: Vaidotas Bauzys <vbauzys@vmware.com>

vbauzys added 2 commits February 7, 2022 16:13

added missing error handling

bb31b86

Signed-off-by: Vaidotas Bauzys <vbauzys@vmware.com>

added compute fields returned from API

295e328

Signed-off-by: Vaidotas Bauzys <vbauzys@vmware.com>

vbauzys self-assigned this Feb 7, 2022

vbauzys added 2 commits February 8, 2022 10:15

bump govcd and add change log

7a869fd

Signed-off-by: Vaidotas Bauzys <vbauzys@vmware.com>

improve documentation

86d8cfa

Signed-off-by: Vaidotas Bauzys <vbauzys@vmware.com>

vbauzys requested review from lvirbalas, mikeletux, Didainius and adambarreiro February 8, 2022 08:18

vbauzys marked this pull request as ready for review February 8, 2022 08:18

vbauzys requested a review from dataclouder as a code owner February 8, 2022 08:18

cleanup

cc1d1b3

Signed-off-by: Vaidotas Bauzys <vbauzys@vmware.com>

vbauzys mentioned this pull request Feb 8, 2022

Fix GetStorageProfileByHref method vmware/go-vcloud-director#435

Merged

lvirbalas removed the request for review from dataclouder February 14, 2022 15:15

lvirbalas requested changes Feb 14, 2022

View reviewed changes

.changes/v3.6.0/782-improvements.md Outdated Show resolved Hide resolved

vcd/datasource_vcd_storage_profile.go Outdated Show resolved Hide resolved

adambarreiro reviewed Feb 15, 2022

View reviewed changes

adambarreiro approved these changes Feb 15, 2022

View reviewed changes

vbauzys added 3 commits February 15, 2022 14:55

add docs improvements

ea6c25f

Signed-off-by: Vaidotas Bauzys <vbauzys@vmware.com>

add docs improvements

e7b8cdd

Signed-off-by: Vaidotas Bauzys <vbauzys@vmware.com>

fix error message

ee90c3e

Signed-off-by: Vaidotas Bauzys <vbauzys@vmware.com>

Didainius reviewed Feb 18, 2022

View reviewed changes

vbauzys added 3 commits February 18, 2022 18:41

improve change log

c7f3bf4

Signed-off-by: Vaidotas Bauzys <vbauzys@vmware.com>

improved documentation

301f6a7

Signed-off-by: Vaidotas Bauzys <vbauzys@vmware.com>

improved documentation

2b2bee4

Signed-off-by: Vaidotas Bauzys <vbauzys@vmware.com>

Didainius approved these changes Feb 18, 2022

View reviewed changes

lvirbalas approved these changes Feb 22, 2022

View reviewed changes

mikeletux approved these changes Feb 22, 2022

View reviewed changes

vbauzys added 2 commits February 22, 2022 13:20

merge main

c803fe8

Signed-off-by: Vaidotas Bauzys <vbauzys@vmware.com>

bump govcd

8bde26e

Signed-off-by: Vaidotas Bauzys <vbauzys@vmware.com>

vbauzys merged commit b26b39d into vmware:main Feb 22, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add computed data to VDC storage profile data source #782

Add computed data to VDC storage profile data source #782

vbauzys commented Feb 7, 2022 •

edited

adambarreiro Feb 15, 2022

vbauzys Feb 15, 2022

Didainius Feb 18, 2022

vbauzys Feb 18, 2022

Didainius Feb 18, 2022

vbauzys Feb 18, 2022

Didainius Feb 18, 2022

vbauzys Feb 18, 2022

Didainius Feb 18, 2022

vbauzys Feb 18, 2022

Didainius left a comment

Didainius Feb 18, 2022

Didainius Feb 18, 2022

Didainius Feb 18, 2022

Didainius Feb 18, 2022

Didainius Feb 18, 2022

Didainius Feb 18, 2022

Didainius Feb 18, 2022

mikeletux left a comment

	return fmt.Errorf("[VM creation] vm template isn't found. Please check vApp templat %s : %s", vmName, err)
	return fmt.Errorf("[VM creation] VM template isn't found. Please check vApp template %s : %s", vmName, err)

	* `enabled` - True if this storage profile is enabled for use in the vDC"
	* `enabled` - True if this storage profile is enabled for use in the VDC"

	* `default` - True if this is default storage profile for this vDC. The default storage profile is used when an object that can specify a storage profile is created with no storage profile specified
	* `default` - True if this is default storage profile for this VDC. The default storage profile is used when an object that can specify a storage profile is created with no storage profile specified

	* `used_storage` - Storage used, in Megabytes, by the storage profile
	* `used_storage` - Storage used, by the storage profile (in Megabytes)

	* `limit` - Maximum number of storage bytes (scaled by Units) allocated for this profile. A value of 0 is understood to mean `maximum possible`
	* `limit` - Maximum number of storage bytes (scaled by 'units' field) allocated for this profile. A value of 0 is understood to mean `maximum possible`

	* `units` - Scale used to define Limit
	* `units` - Scale used to define limit

	* `iops_limit` - Maximum number of IOPs that can be allocated for this profile. `0` means `maximum possible`
	* `iops_limit` - Maximum number of IOPS that can be allocated for this profile. `0` means `maximum possible`

	* `disk_iops_per_gb_max` - The maximum disk IOPs per GB value that this storage profile is permitted to deliver. A value of 0 means there is no per GB IOPS restriction
	* `disk_iops_per_gb_max` - The maximum disk IOPS per GB value that this storage profile is permitted to deliver. A value of 0 means there is no per GB IOPS restriction

	Description: "Maximum number of IOPs that can be allocated for this profile. `0` means `maximum possible`",
	Description: "Maximum number of IOPS that can be allocated for this profile. `0` means `maximum possible`",

	Description: "Scale used to define Limit",
	Description: "Scale used to define limit",

	Description: "Storage used, in Megabytes, by the storage profile",
	Description: "Storage used, by the storage profile (in Megabytes)",

Add computed data to VDC storage profile data source #782

Add computed data to VDC storage profile data source #782

Conversation

vbauzys commented Feb 7, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Didainius left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mikeletux left a comment

Choose a reason for hiding this comment

vbauzys commented Feb 7, 2022 •

edited