Address issues with affinity_host on update and mac_address on VIF cr…

…eation

(cherry picked from commit 07c7e10f3cba8f7a1fd12ecececd4c656dc9ae32)

client/vif.go

@@ -74,7 +74,9 @@ func (c *Client) CreateVIF(vm *Vm, vif *VIF) (*VIF, error) {
 	params := map[string]interface{}{
 		"network": vif.Network,
 		"vm":      vm.Id,
-		"mac":     vif.MacAddress,
+	}
+	if vif.MacAddress != "" {
+		params["mac"] = vif.MacAddress
 	}
 	err := c.Call("vm.createInterface", params, &id)
 

client/vm.go

@@ -321,7 +321,6 @@ func createVdiMap(disk Disk) map[string]interface{} {
 func (c *Client) UpdateVm(vmReq Vm) (*Vm, error) {
 	params := map[string]interface{}{
 		"id":                vmReq.Id,
-		"affinityHost":      vmReq.AffinityHost,
 		"name_label":        vmReq.NameLabel,
 		"name_description":  vmReq.NameDescription,
 		"auto_poweron":      vmReq.AutoPoweron,
@@ -343,6 +342,15 @@ func (c *Client) UpdateVm(vmReq Vm) (*Vm, error) {
 		// coresPerSocket is null or a number of cores per socket. Putting an invalid value doesn't seem to cause an error :(
 	}
 
+	affinityHost := vmReq.AffinityHost
+	if affinityHost != nil {
+		if *affinityHost == "" {
+			params["affinityHost"] = nil
+		} else {
+			params["affinityHost"] = *affinityHost
+		}
+	}
+
 	videoram := vmReq.Videoram.Value
 	if videoram != 0 {
 		params["videoram"] = videoram

xoa/resource_xenorchestra_vm.go

@@ -795,7 +795,7 @@ func resourceVmUpdate(d *schema.ResourceData, m interface{}) error {
 		},
 	}
 
-	if d.HasChange("affinity_host") && affinityHost != "" {
+	if d.HasChange("affinity_host") {
 		vmReq.AffinityHost = &affinityHost
 	}