Skip to content
This repository has been archived by the owner on Jun 3, 2023. It is now read-only.

Bug fix/resource vif #42

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bug fix/resource vif #42

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f78520f
bug-fix: add/deletion of inconsistent network_interface
thebinary Oct 4, 2018
377ffc2
bug-fix: device_order inaccurate
thebinary Oct 4, 2018
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
7 changes: 5 additions & 2 deletions xenserver/resource_vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ func resourceVMUpdate(d *schema.ResourceData, m interface{}) error {

var err error
var remove []*VIFDescriptor
if remove, err = readVIFsFromSchema(c, os.Difference(ns).List()); err == nil {
if remove, err = readVIFsFromSchema(c, os.Difference(ns).List()); err != nil {
return err
}

Expand Down Expand Up @@ -636,12 +636,15 @@ func resourceVMUpdate(d *schema.ResourceData, m interface{}) error {
if err := c.client.VIF.Destroy(c.session, vifToRemove.VIFRef); err != nil {
return err
}

// Decrement VIFCount after removal success
vm.VIFCount--
}
}
}

var create []*VIFDescriptor
if create, err = readVIFsFromSchema(c, ns.Difference(os).List()); err == nil {
if create, err = readVIFsFromSchema(c, ns.Difference(os).List()); err != nil {
return err
}

Expand Down