Vm disk feature

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## 2.7.0 (Unreleased)
 
+FEATURES:
+
+* **New Resource:** `vcd_vm_internal_disk` VM internal disk configuration
+* `vcd_vapp_vm` Internal disks in VM template allows to be edited by `override_template_disk` field 
+
 NOTES:
 * Drop support for vCD 9.0
 

PREVIOUS_VERSION

@@ -1 +1 @@
-v2.5.0
+v2.6.0

VERSION

@@ -1 +1 @@
-v2.6.0
+v2.7.0

go.mod

@@ -5,5 +5,5 @@ go 1.13
 require (
 	github.com/hashicorp/go-version v1.2.0
 	github.com/hashicorp/terraform-plugin-sdk v1.3.0
-	github.com/vmware/go-vcloud-director/v2 v2.5.1
+	github.com/vmware/go-vcloud-director/v2 v2.6.0-alpha.1
 )

go.sum

@@ -201,8 +201,8 @@ github.com/vmihailenco/msgpack v3.3.3+incompatible h1:wapg9xDUZDzGCNFlwc5SqI1rvc
 github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/vmihailenco/msgpack v4.0.1+incompatible h1:RMF1enSPeKTlXrXdOcqjFUElywVZjjC6pqse21bKbEU=
 github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
-github.com/vmware/go-vcloud-director/v2 v2.5.1 h1:VYZyhkLDbUNwDpSFp+b+6rCZ9/1Om2IORP01ExCHspU=
-github.com/vmware/go-vcloud-director/v2 v2.5.1/go.mod h1:zjondbeyTfZlzhwxOzyF4K2sWWYgMEv5H91dp5dPbU8=
+github.com/vmware/go-vcloud-director/v2 v2.6.0-alpha.1 h1:tplMa0oMs/qBviLsvrxszpQb0v5j7QO86wkOML5VqjQ=
+github.com/vmware/go-vcloud-director/v2 v2.6.0-alpha.1/go.mod h1:zjondbeyTfZlzhwxOzyF4K2sWWYgMEv5H91dp5dPbU8=
 github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
 github.com/zclconf/go-cty v1.1.0 h1:uJwc9HiBOCpoKIObTQaLR+tsEXx1HBHnOsOOpcdhZgw=
 github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=

vcd/config.go

@@ -165,6 +165,34 @@ func (cli *VCDClient) unLockParentVapp(d *schema.ResourceData) {
 	vcdMutexKV.Unlock(key)
 }
 
+// lockParentVm locks using vapp_name and vm_name names existing in resource parameters.
+// Parent means the resource belongs to the VM being locked
+func (cli *VCDClient) lockParentVm(d *schema.ResourceData) {
+	vappName := d.Get("vapp_name").(string)
+	if vappName == "" {
+		panic("vApp name not found")
+	}
+	vmName := d.Get("vm_name").(string)
+	if vmName == "" {
+		panic("vmName name not found")
+	}
+	key := fmt.Sprintf("org:%s|vdc:%s|vapp:%s|vm:%s", cli.getOrgName(d), cli.getVdcName(d), vappName, vmName)
+	vcdMutexKV.Lock(key)
+}
+
+func (cli *VCDClient) unLockParentVm(d *schema.ResourceData) {
+	vappName := d.Get("vapp_name").(string)
+	if vappName == "" {
+		panic("vApp name not found")
+	}
+	vmName := d.Get("vm_name").(string)
+	if vmName == "" {
+		panic("vmName name not found")
+	}
+	key := fmt.Sprintf("org:%s|vdc:%s|vapp:%s|vm:%s", cli.getOrgName(d), cli.getVdcName(d), vappName, vmName)
+	vcdMutexKV.Unlock(key)
+}
+
 // function lockParentEdgeGtw locks using edge_gateway name existing in resource parameters.
 // Parent means the resource belongs to the edge gateway being locked
 func (cli *VCDClient) lockParentEdgeGtw(d *schema.ResourceData) {

vcd/config_test.go

@@ -813,3 +813,21 @@ func importStateIdEdgeGatewayObject(vcd TestConfig, edgeGatewayName, objectName
 			objectName, nil
 	}
 }
+
+// Used by all entities that depend on Org + VDC + vApp VM (such as VM internal disks)
+func importStateIdVmObject(orgName, vdcName, vappName, vmName, objectIdentifier string) resource.ImportStateIdFunc {
+	return func(*terraform.State) (string, error) {
+		if orgName == "" || vdcName == "" || vappName == "" || vmName == "" || objectIdentifier == "" {
+			return "", fmt.Errorf("missing information to generate import path")
+		}
+		return orgName +
+			ImportSeparator +
+			vdcName +
+			ImportSeparator +
+			vappName +
+			ImportSeparator +
+			vmName +
+			ImportSeparator +
+			objectIdentifier, nil
+	}
+}

vcd/datasource_vcd_vapp_vm.go

@@ -122,6 +122,53 @@ func datasourceVcdVAppVm() *schema.Resource {
 				Computed: true,
 				Set:      resourceVcdVmIndependentDiskHash,
 			},
+			"internal_disk": {
+				Type:        schema.TypeList,
+				Computed:    true,
+				Description: "A block will show internal disk details",
+				Elem: &schema.Resource{Schema: map[string]*schema.Schema{
+					"disk_id": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "The disk ID.",
+					},
+					"bus_type": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "The type of disk controller. Possible values: ide, parallel( LSI Logic Parallel SCSI), sas(LSI Logic SAS (SCSI)), paravirtual(Paravirtual (SCSI)), sata",
+					},
+					"size_in_mb": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "The size of the disk in MB.",
+					},
+					"bus_number": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "The number of the SCSI or IDE controller itself.",
+					},
+					"unit_number": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "The device number on the SCSI or IDE controller of the disk.",
+					},
+					"thin_provisioned": {
+						Type:        schema.TypeBool,
+						Computed:    true,
+						Description: "Specifies whether the disk storage is pre-allocated or allocated on demand.",
+					},
+					"iops": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Specifies the IOPS for the disk. Default - 0.",
+					},
+					"storage_profile": &schema.Schema{
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Storage profile to override the VM default one",
+					},
+				}},
+			},
 			"expose_hardware_virtualization": &schema.Schema{
 				Type:        schema.TypeBool,
 				Computed:    true,

vcd/provider.go

@@ -130,6 +130,7 @@ func Provider() terraform.ResourceProvider {
 			"vcd_nsxv_firewall_rule": resourceVcdNsxvFirewallRule(), // 2.5
 			"vcd_nsxv_dhcp_relay":    resourceVcdNsxvDhcpRelay(),    // 2.6
 			"vcd_nsxv_ip_set":        resourceVcdIpSet(),            // 2.6
+			"vcd_vm_internal_disk":   resourceVmInternalDisk(),      // 2.7
 		},
 
 		DataSourcesMap: map[string]*schema.Resource{

vcd/resource_vcd_edgegateway.go

@@ -304,7 +304,7 @@ func resourceVcdEdgeGatewayCreate(d *schema.ResourceData, meta interface{}) erro
 	}
 
 	// In version 9.7+ the advanced property is true by default
-	if vcdClient.APIVCDMaxVersionIs(">= 32.0") {
+	if vcdClient.Client.APIVCDMaxVersionIs(">= 32.0") {
 		if !d.Get("advanced").(bool) {
 			return fmt.Errorf("'advanced' property for vCD 9.7+ must be set to 'true'")
 		}
@@ -352,7 +352,7 @@ func resourceVcdEdgeGatewayCreate(d *schema.ResourceData, meta interface{}) erro
 	// vCD 9.0 does not support FIPS Mode and fails if XML tag <FipsModeEnabled> is sent therefore
 	// field value must be sent only if user specified its value
 	if fipsModeEnabled, ok := d.GetOkExists("fips_mode_enabled"); ok {
-		if vcdClient.APIVCDMaxVersionIs("<= 29.0") { // vCD 9.0 or less
+		if vcdClient.Client.APIVCDMaxVersionIs("<= 29.0") { // vCD 9.0 or less
 			return fmt.Errorf("ERROR! FIPS mode is only supported starting" +
 				" with vCD 9.1. Please do not set this field when using with vCD 9.0")
 		}
@@ -790,7 +790,8 @@ func getExternalNetworkData(vcdClient *VCDClient, d *schema.ResourceData, gatewa
 			// we check what the user has set in the config and passing through the same value.
 			// Note. If it wasn't "TypeSet" with more values - it would be possible to simply omit
 			// setting the field.
-			if vcdClient.APIVCDMaxVersionIs("<= 29") && origin == "resource" {
+			// "<= 29" -> if vCD older or 9.0
+			if vcdClient.Client.APIVCDMaxVersionIs("<= 29") && origin == "resource" {
 				log.Printf("[TRACE] edge gateway - skipping read of external networks on vCD 9.0 "+
 					"because for network %s it does not return these values", extNetwork.Network.Name)
 				stateGatewayInterfaces, _ := getGatewayInterfacesType(vcdClient, d.Get("external_network").(*schema.Set))

vcd/resource_vcd_independent_disk_test.go

@@ -38,9 +38,6 @@ func TestAccVcdIndependentDiskBasic(t *testing.T) {
 
 	params["FuncName"] = t.Name() + "-Compatibility"
 	configTextForCompatibility := templateFill(testAccCheckVcdIndependentDiskForCompatibility, params)
-	/*	params["FuncName"] = t.Name()
-		configText := templateFill(testAccCheckVcdIndependentDiskBasic, params)
-	*/
 	params["FuncName"] = t.Name() + "-WithoutOptionals"
 	configTextWithoutOptionals := templateFill(testAccCheckVcdIndependentDiskWithoutOptionals, params)
 
@@ -60,7 +57,6 @@ func TestAccVcdIndependentDiskBasic(t *testing.T) {
 				Config: configTextForCompatibility,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckDiskCreated("vcd_independent_disk."+resourceName),
-					//resource.TestCheckResourceAttr("vcd_independent_disk."+resourceName, "size_in_bytes", "5242880000"),
 					resource.TestMatchResourceAttr("vcd_independent_disk."+resourceName, "owner_name", regexp.MustCompile(`^\S+`)),
 					resource.TestMatchResourceAttr("vcd_independent_disk."+resourceName, "datastore_name", regexp.MustCompile(`^\S+`)),
 					resource.TestMatchResourceAttr("vcd_independent_disk."+resourceName, "iops", regexp.MustCompile(`^\d+$`)),
@@ -74,17 +70,6 @@ func TestAccVcdIndependentDiskBasic(t *testing.T) {
 				ImportStateIdFunc:       importStateIdByDisk("vcd_independent_disk." + resourceName),
 				ImportStateVerifyIgnore: []string{"org", "vdc", "size"},
 			},
-			/*			resource.TestStep{
-						Config: configText,
-						Check: resource.ComposeTestCheckFunc(
-							testAccCheckDiskCreated("vcd_independent_disk."+resourceName+"second"),
-							resource.TestCheckResourceAttr("vcd_independent_disk."+resourceName+"second", "size_in_bytes", "5242880000"),
-							resource.TestMatchResourceAttr("vcd_independent_disk."+resourceName+"second", "owner_name", regexp.MustCompile(`^\S+`)),
-							resource.TestMatchResourceAttr("vcd_independent_disk."+resourceName+"second", "datastore_name", regexp.MustCompile(`^\S+`)),
-							resource.TestMatchResourceAttr("vcd_independent_disk."+resourceName+"second", "iops", regexp.MustCompile(`^\d+$`)),
-							resource.TestCheckResourceAttr("vcd_independent_disk."+resourceName+"second", "is_attached", "false"),
-						),
-					},*/
 			resource.TestStep{
 				Config: configTextWithoutOptionals,
 				Check: resource.ComposeTestCheckFunc(
@@ -192,16 +177,3 @@ resource "vcd_independent_disk" "{{.secondResourceName}}" {
   size            = "{{.size}}"
 }
 `
-
-/*const testAccCheckVcdIndependentDiskBasic = `
-resource "vcd_independent_disk" "{{.secondResourceName}}" {
-  org             = "{{.Org}}"
-  vdc             = "{{.Vdc}}"
-  name            = "{{.secondName}}"
-  size_in_bytes   = "{{.sizeInBytes}}"
-  bus_type        = "{{.busType}}"
-  bus_sub_type    = "{{.busSubType}}"
-  storage_profile = "{{.storageProfileName}}"
-}
-`
-*/

vcd/resource_vcd_nsxv_firewall_rule.go

@@ -301,7 +301,8 @@ func resourceVcdNsxvFirewallRuleUpdate(d *schema.ResourceData, meta interface{})
 	// IP set IDs (ipset-454 insted of a0c3c92a-a180-48fb-96ec-91c610c7c254:ipset-460) for update
 	// operations only. Otherwise update operation fails with exception.
 	var shortIds bool
-	if vcdClient.APIVCDMaxVersionIs("<= 29") {
+	// if vCD older or 9.0
+	if vcdClient.Client.APIVCDMaxVersionIs("<= 29") {
 		log.Println("[DEBUG] vcd_nsxv_firewall_rule update - using short IDs for update operations because vCD is <= 9.0 ")
 		shortIds = true
 	}

vcd/resource_vcd_nsxv_firewall_rule_test.go

@@ -1057,7 +1057,8 @@ func TestAccVcdNsxvEdgeFirewallRuleVms(t *testing.T) {
 	if err != nil {
 		t.Skip("unable to validate vCD version - skipping test")
 	}
-	if vcdClient.APIVCDMaxVersionIs("= 29.0") {
+	// if vCD older or 9.0
+	if vcdClient.Client.APIVCDMaxVersionIs("= 29.0") {
 		t.Skip("Skipping this test for vCD 9.0 because of a known issue: " +
 			"https://github.com/terraform-providers/terraform-provider-vcd/issues/420")
 	}