ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed vcd_vapp resource to make better use of Update function

This commit is contained in:
Brett Mack 2015-11-10 23:35:25 +00:00
parent a05ff89a7d
commit dc8924b537
1 changed files with 19 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
builtin/providers/vcd/resource_vcd_vapp.go
View File

@ -152,30 +152,6 @@ func resourceVcdVAppCreate(d *schema.ResourceData, meta interface{}) error {
vapp, err := vcd_client.OrgVdc.FindVAppByName(d.Get("name").(string)) vapp, err := vcd_client.OrgVdc.FindVAppByName(d.Get("name").(string))
err = retryCall(4, func() error {
task, err := vapp.ChangeMemorySize(d.Get("memory").(int))
if err != nil {
return fmt.Errorf("Error changing memory size: %#v", err)
}
return task.WaitTaskCompletion()
})
if err != nil {
return err
}
err = retryCall(4, func() error {
task, err := vapp.ChangeCPUcount(d.Get("cpus").(int))
if err != nil {
return fmt.Errorf("Error changing cpu count: %#v", err)
}
return task.WaitTaskCompletion()
})
if err != nil {
return fmt.Errorf("Error completing task: %#v", err)
}
err = retryCall(4, func() error { err = retryCall(4, func() error {
task, err := vapp.ChangeVMName(d.Get("name").(string)) task, err := vapp.ChangeVMName(d.Get("name").(string))
if err != nil { if err != nil {
@ -199,24 +175,6 @@ func resourceVcdVAppCreate(d *schema.ResourceData, meta interface{}) error {
return fmt.Errorf("Error changing network: %#v", err) return fmt.Errorf("Error changing network: %#v", err)
} }
err = retryCall(4, func() error {
metadata := d.Get("metadata").(map[string]interface{})
for k, v := range metadata {
task, err := vapp.AddMetadata(k, v.(string))
if err != nil {
return fmt.Errorf("Error adding metadata: %#v", err)
}
err = task.WaitTaskCompletion()
if err != nil {
return fmt.Errorf("Error completing tasks: %#v", err)
}
}
return nil
})
if err != nil {
return fmt.Errorf("Error adding metadata: %#v", err)
}
if initscript, ok := d.GetOk("initscript"); ok { if initscript, ok := d.GetOk("initscript"); ok {
err = retryCall(4, func() error { err = retryCall(4, func() error {
task, err := vapp.RunCustomizationScript(d.Get("name").(string), initscript.(string)) task, err := vapp.RunCustomizationScript(d.Get("name").(string), initscript.(string))
@ -230,23 +188,9 @@ func resourceVcdVAppCreate(d *schema.ResourceData, meta interface{}) error {
} }
} }
if d.Get("power_on").(bool) {
err = retryCall(4, func() error {
task, err := vapp.PowerOn()
if err != nil {
return fmt.Errorf("Error Powering Up: %#v", err)
}
return task.WaitTaskCompletion()
})
if err != nil {
return fmt.Errorf("Error completing tasks: %#v", err)
}
}
d.SetId(d.Get("name").(string)) d.SetId(d.Get("name").(string))
return resourceVcdVAppRead(d, meta) return resourceVcdVAppUpdate(d, meta)
//return nil
} }
func resourceVcdVAppUpdate(d *schema.ResourceData, meta interface{}) error { func resourceVcdVAppUpdate(d *schema.ResourceData, meta interface{}) error {
@ -302,19 +246,31 @@ func resourceVcdVAppUpdate(d *schema.ResourceData, meta interface{}) error {
} }
if d.HasChange("memory") { if d.HasChange("memory") {
err = retryCall(4, func() error {
task, err := vapp.ChangeMemorySize(d.Get("memory").(int)) task, err := vapp.ChangeMemorySize(d.Get("memory").(int))
err = task.WaitTaskCompletion()
if err != nil { if err != nil {
return fmt.Errorf("Error changing memory size: %#v", err) return fmt.Errorf("Error changing memory size: %#v", err)
} }
return task.WaitTaskCompletion()
})
if err != nil {
return err
}
} }
if d.HasChange("cpus") { if d.HasChange("cpus") {
err = retryCall(4, func() error {
task, err := vapp.ChangeCPUcount(d.Get("cpus").(int)) task, err := vapp.ChangeCPUcount(d.Get("cpus").(int))
err = task.WaitTaskCompletion()
if err != nil { if err != nil {
return fmt.Errorf("Error changing cpu count: %#v", err) return fmt.Errorf("Error changing cpu count: %#v", err)
} }
return task.WaitTaskCompletion()
})
if err != nil {
return fmt.Errorf("Error completing task: %#v", err)
}
} }
if d.Get("power_on").(bool) { if d.Get("power_on").(bool) {