Vm disk feature #412

vbauzys · 2019-12-02T14:24:43Z

Ref: vmware/go-vcloud-director#250
Allows to create, update, delete and import VM internal disks.
Also override template disk details before first boot up.

new resource vcd_vm_internal_disk
vcd_vapp_vm has new structure override_template_disk
vcd_vapp_vm has new attribute structure internal_disk

Signed-off-by: Vaidotas Bauzys <[email protected]>

…vider-vcd

…roviders/terraform-provider-vcd

…vider-vcd

Merge branch 'master' of github.com:terraform-providers/terraform-provider-vcd

…roviders/terraform-provider-vcd

…vider-vcd

…roviders/terraform-provider-vcd

…vider-vcd

…roviders/terraform-provider-vcd

Merge branch 'master' of github.com:terraform-providers/terraform-provider-vcd

…roviders/terraform-provider-vcd

…vider-vcd

…roviders/terraform-provider-vcd

Merge branch 'master' of github.com:terraform-providers/terraform-provider-vcd

…roviders/terraform-provider-vcd

website/docs/r/vm_internal_disk.html.markdown

Signed-off-by: Vaidotas Bauzys <[email protected]>

Didainius · 2020-01-10T14:01:41Z

website/docs/r/vapp_vm.html.markdown

@@ -191,6 +216,21 @@ example for usage details. **Deprecates**: `network_name`, `ip`, `vapp_network_n

  * `ip_allocation_mode=NONE` - **`ip`** field can be omitted or set to an empty string "". Empty string may be useful when doing HCL variable interpolation.

+<a id="override-template-disk"></a>
+## Override template disk
+Allows to update internal disk in template before first VM boot. Disk are matched by `bus_type`, `bus_number` and `unit_number`


"Disk is" or "disks are" ....

Suggested change

Allows to update internal disk in template before first VM boot. Disk are matched by `bus_type`, `bus_number` and `unit_number`

Allows to update internal disk in template before first VM boot. Disk is matched by `bus_type`, `bus_number` and `unit_number`

website/docs/r/vm_internal_disk.html.markdown

… state file Signed-off-by: Vaidotas Bauzys <[email protected]>

Signed-off-by: Vaidotas Bauzys <[email protected]>

vcd/resource_vcd_vapp_vm.go

Signed-off-by: Vaidotas Bauzys <[email protected]>

vcd/resource_vcd_vapp_vm.go

Signed-off-by: Vaidotas Bauzys <[email protected]>

vcd/resource_vcd_vapp_vm.go

Signed-off-by: Vaidotas Bauzys <[email protected]>

dataclouder

Some more changes are needed

dataclouder · 2020-01-13T07:27:44Z

vcd/resource_vcd_vm_internal_disk.go

+	}
+	vapp, err := vdc.GetVAppByName(d.Get("vapp_name").(string), false)
+	if err != nil {
+		return nil, nil, fmt.Errorf("[Error] failed to get vApp: %s", err)


Suggested change

return nil, nil, fmt.Errorf("[Error] failed to get vApp: %s", err)

return nil, nil, fmt.Errorf("[getVm] failed to get vApp: %s", err)

dataclouder · 2020-01-13T07:27:57Z

vcd/resource_vcd_vm_internal_disk.go

+	}
+	vm, err := vapp.GetVMByName(d.Get("vm_name").(string), false)
+	if err != nil {
+		return nil, nil, fmt.Errorf("[Error] failed to get VM: %s", err)


Suggested change

return nil, nil, fmt.Errorf("[Error] failed to get VM: %s", err)

return nil, nil, fmt.Errorf("[getVm] failed to get VM: %s", err)

dataclouder · 2020-01-13T07:28:25Z

vcd/resource_vcd_vm_internal_disk.go

+	if storageProfileName, ok := d.GetOk("storage_profile"); ok {
+		storageProfile, err := vdc.FindStorageProfileReference(storageProfileName.(string))
+		if err != nil {
+			return fmt.Errorf("[vm creation] error retrieving storage profile %s : %s", storageProfileName, err)


Suggested change

return fmt.Errorf("[vm creation] error retrieving storage profile %s : %s", storageProfileName, err)

return fmt.Errorf("[internal disk creation] error retrieving storage profile %s : %s", storageProfileName, err)

dataclouder · 2020-01-13T07:30:00Z

vcd/resource_vcd_vm_internal_disk.go

+
+	err = vm.DeleteInternalDisk(d.Id())
+	if err != nil {
+		return fmt.Errorf("[Error] failed to delete internal disk: %s", err)


Suggested change

return fmt.Errorf("[Error] failed to delete internal disk: %s", err)

return fmt.Errorf("[resourceVmInternalDiskDelete] failed to delete internal disk: %s", err)

dataclouder · 2020-01-13T08:01:47Z

vcd/resource_vcd_vapp_vm.go

@@ -535,6 +643,7 @@ func expandDisksProperties(v interface{}) ([]diskParams, error) {
 func getVmIndependentDisks(vm govcd.VM) []string {

 	var disks []string
+	// We use VirtualHardwareSection due in time of implementation we didn't have access to VmSpecSection which we used for internal disks.


Suggested change

// We use VirtualHardwareSection due in time of implementation we didn't have access to VmSpecSection which we used for internal disks.

// We use VirtualHardwareSection because in time of implementation we didn't have access to VmSpecSection which we used for internal disks.

dataclouder · 2020-01-13T08:30:17Z

vcd/resource_vcd_vapp_vm.go

+		return err
+	}
+
+	existingInternalDisks := vm.VM.VmSpecSection.DiskSection.DiskSettings


Please add a check for VmSpecSection and fail gracefully if it is nil.
If this section is not initialized, we'll get a panic error.

dataclouder · 2020-01-13T08:30:48Z

vcd/resource_vcd_vapp_vm.go

+		return fmt.Errorf(errorRetrievingOrgAndVdc, err)
+	}
+
+	diskSettings := vm.VM.VmSpecSection.DiskSection.DiskSettings


Please check if VmSpecSection is not nil

dataclouder · 2020-01-13T08:46:21Z

vcd/resource_vcd_vm_internal_disk.go

+	_ = d.Set("size_in_mb", diskSettings.SizeMb)
+	_ = d.Set("bus_number", diskSettings.BusNumber)
+	_ = d.Set("unit_number", diskSettings.UnitNumber)
+	_ = d.Set("thin_provisioned", *diskSettings.ThinProvisioned)


Please check that diskSettings.ThinProvisioned is not nil before using it in assignment

dataclouder · 2020-01-13T08:47:05Z

vcd/resource_vcd_vm_internal_disk.go

+
+	writer := tabwriter.NewWriter(getTerraformStdout(), 0, 8, 1, '\t', tabwriter.AlignRight)
+
+	fmt.Fprintln(writer, "No\tID\tBusType\tBusNumber\tUnitNumber\tSize\tStoragePofile\tIops\tThinProvisioned")


Suggested change

fmt.Fprintln(writer, "No\tID\tBusType\tBusNumber\tUnitNumber\tSize\tStoragePofile\tIops\tThinProvisioned")

fmt.Fprintln(writer, "No\tID\tBusType\tBusNumber\tUnitNumber\tSize\tStorageProfile\tIops\tThinProvisioned")

Signed-off-by: Vaidotas Bauzys <[email protected]>

lvirbalas

LGTM now, thank you!

Signed-off-by: Vaidotas Bauzys <[email protected]>

dataclouder

LGTM

vbauzys added 30 commits July 15, 2019 15:39

Add missing file

6585559

Signed-off-by: Vaidotas Bauzys <[email protected]>

Merge branch 'master' of github.com:terraform-providers/terraform-pro…

e247d25

…vider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

cf1e7c2

…roviders/terraform-provider-vcd

Merge branch 'master' of github.com:terraform-providers/terraform-pro…

be6790f

…vider-vcd

Merge branch 'master' of github.com:terraform-providers/terraform-pro…

6f4c5cb

…vider-vcd

Merge branch 'master' of github.com:terraform-providers/terraform-pro…

c73d402

…vider-vcd

git push origin master

261d142

Merge branch 'master' of github.com:terraform-providers/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

c431d43

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

414b3bf

…roviders/terraform-provider-vcd

Merge branch 'master' of github.com:terraform-providers/terraform-pro…

8b03ab8

…vider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

36c5487

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

db01eec

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

331e895

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

a85d555

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

e1996e3

…roviders/terraform-provider-vcd

Merge branch 'master' of github.com:terraform-providers/terraform-pro…

9c63eec

…vider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

5073f6c

…roviders/terraform-provider-vcd

git push origin master

f0bdef3

Merge branch 'master' of github.com:terraform-providers/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

24f169d

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

06b36d1

…roviders/terraform-provider-vcd

Merge branch 'master' of github.com:terraform-providers/terraform-pro…

30d6a79

…vider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

0ca001f

…roviders/terraform-provider-vcd

git push origin master

8c9c7c4

Merge branch 'master' of github.com:terraform-providers/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

4c8d081

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

206bc9f

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

48970bc

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

e7ef092

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

cb5659a

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

1e097fd

…roviders/terraform-provider-vcd

git push origin masterMerge branch 'master' of github.com:terraform-p…

ae2d955

…roviders/terraform-provider-vcd

Didainius reviewed Jan 10, 2020

View reviewed changes

website/docs/r/vm_internal_disk.html.markdown Outdated Show resolved Hide resolved

vbauzys added 5 commits January 10, 2020 13:12

Change bus type validation setting, always accept low case

55d6340

Signed-off-by: Vaidotas Bauzys <[email protected]>

Improve doc

5eb531b

Signed-off-by: Vaidotas Bauzys <[email protected]>

Improve doc

1c0d2d2

Signed-off-by: Vaidotas Bauzys <[email protected]>

Improve doc

757a03d

Signed-off-by: Vaidotas Bauzys <[email protected]>

Improve doc

30904da

Signed-off-by: Vaidotas Bauzys <[email protected]>

Didainius reviewed Jan 10, 2020

View reviewed changes

lvirbalas reviewed Jan 10, 2020

View reviewed changes

website/docs/r/vm_internal_disk.html.markdown Show resolved Hide resolved

vbauzys added 2 commits January 10, 2020 16:55

Add filtering out independent disk from internal disks in listing and…

8e54b3e

… state file Signed-off-by: Vaidotas Bauzys <[email protected]>

Improve docs

0aa3325

Signed-off-by: Vaidotas Bauzys <[email protected]>

lvirbalas reviewed Jan 10, 2020

View reviewed changes

vcd/resource_vcd_vapp_vm.go Show resolved Hide resolved

vbauzys added 2 commits January 10, 2020 17:34

Improve test

5615855

Signed-off-by: Vaidotas Bauzys <[email protected]>

Add comments

543bf7f

Signed-off-by: Vaidotas Bauzys <[email protected]>

Didainius reviewed Jan 11, 2020

View reviewed changes

vcd/resource_vcd_vapp_vm.go Show resolved Hide resolved

vbauzys added 2 commits January 13, 2020 07:26

Add missing element internal_disk to datasource

e7eaafe

Signed-off-by: Vaidotas Bauzys <[email protected]>

Add missing attach independent disk in test

584b615

Signed-off-by: Vaidotas Bauzys <[email protected]>

lvirbalas reviewed Jan 13, 2020

View reviewed changes

vcd/resource_vcd_vapp_vm.go Outdated Show resolved Hide resolved

vbauzys added 2 commits January 13, 2020 10:00

Improve comment

f5f4d82

Signed-off-by: Vaidotas Bauzys <[email protected]>

Removed not needed parts

624adf4

Signed-off-by: Vaidotas Bauzys <[email protected]>

dataclouder suggested changes Jan 13, 2020

View reviewed changes

vbauzys added 4 commits January 13, 2020 11:32

Improve docs

c238651

Signed-off-by: Vaidotas Bauzys <[email protected]>

Improvements

a669fdd

Signed-off-by: Vaidotas Bauzys <[email protected]>

Fix doc

36d7b90

Signed-off-by: Vaidotas Bauzys <[email protected]>

Improve doc

3b47d98

Signed-off-by: Vaidotas Bauzys <[email protected]>

lvirbalas approved these changes Jan 13, 2020

View reviewed changes

bump govcd

a0e4aa3

Signed-off-by: Vaidotas Bauzys <[email protected]>

dataclouder approved these changes Jan 13, 2020

View reviewed changes

vbauzys merged commit 7c9fdb7 into vmware:master Jan 13, 2020

vbauzys mentioned this pull request Jan 21, 2020

Add support for VM disk management in vcd_vapp_vm resource #311

Closed

jpbuecken mentioned this pull request Jan 30, 2020

Improve import for vcd_vapp and vcd_vapp_vm if ORG and VDC is set by environement #444

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Vm disk feature #412

Vm disk feature #412

vbauzys commented Dec 2, 2019 •

edited

Loading

Didainius Jan 10, 2020

vbauzys Jan 10, 2020

dataclouder left a comment

dataclouder Jan 13, 2020

vbauzys Jan 13, 2020

dataclouder Jan 13, 2020

vbauzys Jan 13, 2020

dataclouder Jan 13, 2020

vbauzys Jan 13, 2020

dataclouder Jan 13, 2020

vbauzys Jan 13, 2020

dataclouder Jan 13, 2020

vbauzys Jan 13, 2020

dataclouder Jan 13, 2020

vbauzys Jan 13, 2020

dataclouder Jan 13, 2020

vbauzys Jan 13, 2020

dataclouder Jan 13, 2020

vbauzys Jan 13, 2020

dataclouder Jan 13, 2020

vbauzys Jan 13, 2020

lvirbalas left a comment

dataclouder left a comment

	Allows to update internal disk in template before first VM boot. Disk are matched by `bus_type`, `bus_number` and `unit_number`
	Allows to update internal disk in template before first VM boot. Disk is matched by `bus_type`, `bus_number` and `unit_number`

	return nil, nil, fmt.Errorf("[Error] failed to get vApp: %s", err)
	return nil, nil, fmt.Errorf("[getVm] failed to get vApp: %s", err)

	return fmt.Errorf("[vm creation] error retrieving storage profile %s : %s", storageProfileName, err)
	return fmt.Errorf("[internal disk creation] error retrieving storage profile %s : %s", storageProfileName, err)

	return fmt.Errorf("[Error] failed to delete internal disk: %s", err)
	return fmt.Errorf("[resourceVmInternalDiskDelete] failed to delete internal disk: %s", err)

	// We use VirtualHardwareSection due in time of implementation we didn't have access to VmSpecSection which we used for internal disks.
	// We use VirtualHardwareSection because in time of implementation we didn't have access to VmSpecSection which we used for internal disks.


		writer := tabwriter.NewWriter(getTerraformStdout(), 0, 8, 1, '\t', tabwriter.AlignRight)

		fmt.Fprintln(writer, "No\tID\tBusType\tBusNumber\tUnitNumber\tSize\tStoragePofile\tIops\tThinProvisioned")

Vm disk feature #412

Vm disk feature #412

Conversation

vbauzys commented Dec 2, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dataclouder 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

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

Choose a reason for hiding this comment

lvirbalas left a comment

Choose a reason for hiding this comment

dataclouder left a comment

Choose a reason for hiding this comment

vbauzys commented Dec 2, 2019 •

edited

Loading