Computername fix

CHANGELOG.md

@@ -30,6 +30,7 @@ IMPROVEMENTS:
 * `vcd_org_vdc` Add import capability - [#324]
 * `vcd_org_vdc` Add full read capability - [#324]
 * Upgrade Terraform SDK dependency to 0.12.8 [#320]
+* `resource/vcd_vapp_vm` have new field `computer_name` [#334]
 
 BUG FIXES:
 * Change default value for `vcd_org.deployed_vm_quota` and `vcd_org.stored_vm_quota`. It was incorrectly set at `-1` instead of `0`.

vcd/resource_vcd_vapp_vm.go

@@ -33,6 +33,10 @@ func resourceVcdVAppVm() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+			"computer_name": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"org": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -88,6 +92,8 @@ func resourceVcdVAppVm() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
+				ValidateFunc: anyValueWarningValidator(true,
+					"With next version `name` as computer name won't be set together with `initscript`. Please use `computer_name`."),
 			},
 			"metadata": {
 				Type:     schema.TypeMap,
@@ -309,15 +315,32 @@ func resourceVcdVAppVmCreate(d *schema.ResourceData, meta interface{}) error {
 		}
 	}
 
+	// for back compatibility we allow to set computer name from `name` if computer_name isn't provided
+	var computerName string
+	if cName, ok := d.GetOk("computer_name"); ok {
+		computerName = cName.(string)
+	} else {
+		computerName = d.Get("name").(string)
+	}
+
 	if initScript, ok := d.GetOk("initscript"); ok {
-		task, err := vm.RunCustomizationScript(d.Get("name").(string), initScript.(string))
+		task, err := vm.RunCustomizationScript(computerName, initScript.(string))
 		if err != nil {
 			return fmt.Errorf("error with init script setting: %#v", err)
 		}
 		err = task.WaitTaskCompletion()
 		if err != nil {
 			return fmt.Errorf(errorCompletingTask, err)
 		}
+	} else {
+		task, err := vm.Customize(computerName, "", false)
+		if err != nil {
+			return fmt.Errorf("error with applying computer name: %#v", err)
+		}
+		err = task.WaitTaskCompletion()
+		if err != nil {
+			return fmt.Errorf(errorCompletingTask, err)
+		}
 	}
 
 	if _, ok := d.GetOk("guest_properties"); ok {
@@ -554,11 +577,11 @@ func resourceVcdVAppVmUpdateExecute(d *schema.ResourceData, meta interface{}) er
 	}
 
 	if d.HasChange("memory") || d.HasChange("cpus") || d.HasChange("cpu_cores") || d.HasChange("power_on") || d.HasChange("disk") ||
-		d.HasChange("expose_hardware_virtualization") || d.HasChange("network") {
+		d.HasChange("expose_hardware_virtualization") || d.HasChange("network") || d.HasChange("computer_name") {
 
-		log.Printf("[TRACE] VM %s has changes: memory(%t), cpus(%t), cpu_cores(%t), power_on(%t), disk(%t), expose_hardware_virtualization(%t), network(%t)",
+		log.Printf("[TRACE] VM %s has changes: memory(%t), cpus(%t), cpu_cores(%t), power_on(%t), disk(%t), expose_hardware_virtualization(%t), network(%t), computer_name(%t)",
 			vm.VM.Name, d.HasChange("memory"), d.HasChange("cpus"), d.HasChange("cpu_cores"), d.HasChange("power_on"), d.HasChange("disk"),
-			d.HasChange("expose_hardware_virtualization"), d.HasChange("network"))
+			d.HasChange("expose_hardware_virtualization"), d.HasChange("network"), d.HasChange("computer_name"))
 
 		// If customization is not requested then a simple shutdown is enough
 		if vmStatusBeforeUpdate != "POWERED_OFF" && !customizationNeeded {
@@ -657,6 +680,18 @@ func resourceVcdVAppVmUpdateExecute(d *schema.ResourceData, meta interface{}) er
 			}
 		}
 
+		// we pass init script, to not override with empty one
+		if d.HasChange("computer_name") {
+			task, err := vm.Customize(d.Get("computer_name").(string), d.Get("initscript").(string), false)
+			if err != nil {
+				return fmt.Errorf("error with udpating computer name: %#v", err)
+			}
+			err = task.WaitTaskCompletion()
+			if err != nil {
+				return fmt.Errorf(errorCompletingTask, err)
+			}
+		}
+
 	}
 
 	// If the VM was powered off during update but it has to be powered off
@@ -803,7 +838,7 @@ func resourceVcdVAppVmRead(d *schema.ResourceData, meta interface{}) error {
 		return fmt.Errorf("error getting VM : %#v", err)
 	}
 
-	d.Set("name", vm.VM.Name)
+	_ = d.Set("name", vm.VM.Name)
 
 	// Read either new or deprecated networks configuration based on which are used
 	switch {

vcd/resource_vcd_vapp_vm_test.go

@@ -27,6 +27,7 @@ func TestAccVcdVAppVm_Basic(t *testing.T) {
 		"CatalogItem":        testSuiteCatalogOVAItem,
 		"VappName":           vappName2,
 		"VmName":             vmName,
+		"ComputerName":       vmName + "-unique",
 		"diskName":           diskName,
 		"size":               "5",
 		"busType":            "SCSI",
@@ -54,6 +55,8 @@ func TestAccVcdVAppVm_Basic(t *testing.T) {
 					testAccCheckVcdVAppVmExists(vappName2, vmName, "vcd_vapp_vm."+vmName, &vapp, &vm),
 					resource.TestCheckResourceAttr(
 						"vcd_vapp_vm."+vmName, "name", vmName),
+					resource.TestCheckResourceAttr(
+						"vcd_vapp_vm."+vmName, "computer_name", vmName+"-unique"),
 					resource.TestCheckResourceAttr(
 						"vcd_vapp_vm."+vmName, "ip", "10.10.102.161"),
 					resource.TestCheckResourceAttr(
@@ -108,6 +111,7 @@ resource "vcd_vapp_vm" "{{.VmName}}" {
   vapp_name     = "${vcd_vapp.{{.VappName}}.name}"
   network_name  = "${vcd_network_routed.{{.NetworkName}}.name}"
   name          = "{{.VmName}}"
+  computer_name = "{{.ComputerName}}"
   catalog_name  = "{{.Catalog}}"
   template_name = "{{.CatalogItem}}"
   memory        = 1024

vcd/suppressfuncs.go

@@ -30,6 +30,14 @@ func noopValueWarningValidator(fieldValue interface{}, warningText string) schem
 	}
 }
 
+// anyValueWarningValidator is a validator which only emits always warning string
+func anyValueWarningValidator(fieldValue interface{}, warningText string) schema.SchemaValidateFunc {
+	return func(i interface{}, k string) (warnings []string, errors []error) {
+		warnings = append(warnings, fmt.Sprintf("%s\n\n", warningText))
+		return
+	}
+}
+
 func checkEmptyOrSingleIP() schema.SchemaValidateFunc {
 	return func(i interface{}, k string) (s []string, es []error) {
 		v, ok := i.(string)

website/docs/r/vapp_vm.html.markdown

@@ -124,6 +124,7 @@ The following arguments are supported:
 * `vdc` - (Optional; *v2.0+*) The name of VDC to use, optional if defined at provider level
 * `vapp_name` - (Required) The vApp this VM should belong to.
 * `name` - (Required) A unique name for the VM
+* `computer_name` - (Optional; *v2.5+*) A unique name 
 * `catalog_name` - (Required) The catalog name in which to find the given vApp Template
 * `template_name` - (Required) The name of the vApp Template to use
 * `memory` - (Optional) The amount of RAM (in MB) to allocate to the VM
@@ -252,4 +253,4 @@ resource "vcd_vapp_vm" "web2" {
     force = false
   }
 }
-```
+```