Merge pull request #3 from Tinyblargon/backport-BugFix-Qemu-Pool

Bug fix: ConfigQemu. `Node`, `Pool`, `VmID`
Tinyblargon · Nov 27, 2023 · 21595de · 21595de
2 parents 3f4f21f + 796c3d7
commit 21595de
Show file tree

Hide file tree

Showing 2 changed files with 2,112 additions and 2,047 deletions.
diff --git a/proxmox/config_qemu.go b/proxmox/config_qemu.go
@@ -457,7 +457,7 @@ func (config ConfigQemu) mapToApiValues(currentConfig ConfigQemu) (rebootRequire
 	return
 }
 
-func (ConfigQemu) mapToStruct(params map[string]interface{}) (*ConfigQemu, error) {
+func (ConfigQemu) mapToStruct(vmr *VmRef, params map[string]interface{}) (*ConfigQemu, error) {
 	// vmConfig Sample: map[ cpu:host
 	// net0:virtio=62:DF:XX:XX:XX:XX,bridge=vmbr0
 	// ide2:local:iso/xxx-xx.iso,media=cdrom memory:2048
@@ -469,6 +469,12 @@ func (ConfigQemu) mapToStruct(params map[string]interface{}) (*ConfigQemu, error
 
 	config := ConfigQemu{}
 
+	if vmr != nil {
+		config.Node = vmr.node
+		config.Pool = vmr.pool
+		config.VmID = vmr.vmId
+	}
+
 	if _, isSet := params["agent"]; isSet {
 		switch params["agent"].(type) {
 		case float64:
@@ -1204,7 +1210,7 @@ func NewConfigQemuFromApi(vmr *VmRef, client *Client) (config *ConfigQemu, err e
 	if vmConfig["lock"] != nil {
 		return nil, fmt.Errorf("vm locked, could not obtain config")
 	}
-	config, err = ConfigQemu{}.mapToStruct(vmConfig)
+	config, err = ConfigQemu{}.mapToStruct(vmr, vmConfig)
 	if err != nil {
 		return
 	}