Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for issue #119 - timeout issue and categories reboot #120

Merged
merged 1 commit into from
May 15, 2020
Merged

fix for issue #119 - timeout issue and categories reboot #120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions nutanix/resource_nutanix_virtual_machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,7 @@ func resourceNutanixVirtualMachine() *schema.Resource {
func resourceNutanixVirtualMachineCreate(d *schema.ResourceData, meta interface{}) error {
// Get client connection
conn := meta.(*Client).API
setVMTimeout(meta)
// Prepare request
request := &v3.VMIntentInput{}
spec := &v3.VM{}
Expand Down Expand Up @@ -857,7 +858,7 @@ func resourceNutanixVirtualMachineCreate(d *schema.ResourceData, meta interface{
func resourceNutanixVirtualMachineRead(d *schema.ResourceData, meta interface{}) error {
// Get client connection
conn := meta.(*Client).API

setVMTimeout(meta)
// Make request to the API
resp, err := conn.V3.GetVM(d.Id())

Expand Down Expand Up @@ -1003,6 +1004,7 @@ func resourceNutanixVirtualMachineRead(d *schema.ResourceData, meta interface{})

func resourceNutanixVirtualMachineUpdate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*Client).API
setVMTimeout(meta)
var hotPlugChange = true

log.Printf("[Debug] Updating VM values %s", d.Id())
Expand Down Expand Up @@ -1037,7 +1039,6 @@ func resourceNutanixVirtualMachineUpdate(d *schema.ResourceData, meta interface{

if d.HasChange("categories") {
metadata.Categories = expandCategories(d.Get("categories"))
hotPlugChange = false
}
metadata.OwnerReference = response.Metadata.OwnerReference
if d.HasChange("owner_reference") {
Expand Down Expand Up @@ -1417,7 +1418,7 @@ func taskVMStateRefreshFunc(client *v3.Client, vmUUID string, powerState string)

func resourceNutanixVirtualMachineDelete(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*Client).API

setVMTimeout(meta)
log.Printf("[DEBUG] Deleting Virtual Machine: %s, %s", d.Get("name").(string), d.Id())
resp, err := conn.V3.DeleteVM(d.Id())
if err != nil {
Expand Down Expand Up @@ -1978,6 +1979,13 @@ func resourceVirtualMachineInstanceStateUpgradeV0(is map[string]interface{}, met
return resourceNutanixCategoriesMigrateState(is, meta)
}

func setVMTimeout(meta interface{}) {
client := meta.(*Client)
if client.WaitTimeout != 0 {
vmTimeout = time.Duration(client.WaitTimeout) * time.Minute
}
}

func resourceNutanixVirtualMachineInstanceResourceV0() *schema.Resource {
return &schema.Resource{
Schema: map[string]*schema.Schema{
Expand Down