Merge pull request #307 from Telmate/fix-306

[fix] Fix Pool setting results in error 400
Telmate · Jan 31, 2024 · 58f6bb5 · 58f6bb5
2 parents 586199e + ff9f0c4
commit 58f6bb5
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 24 deletions.
diff --git a/proxmox/config_guest.go b/proxmox/config_guest.go
@@ -81,9 +81,6 @@ func (GuestResource) mapToStruct(params []interface{}) []GuestResource {
 		if _, isSet := tmpParams["node"]; isSet {
 			resources[i].Node = tmpParams["node"].(string)
 		}
-		if _, isSet := tmpParams["pool"]; isSet {
-			resources[i].Pool = tmpParams["pool"].(string)
-		}
 		if _, isSet := tmpParams["status"]; isSet {
 			resources[i].Status = tmpParams["status"].(string)
 		}

diff --git a/proxmox/config_guest_test.go b/proxmox/config_guest_test.go
@@ -68,10 +68,6 @@ func Test_GuestResource_mapToStruct(t *testing.T) {
 			input:  []interface{}{map[string]interface{}{"node": "pve1"}},
 			output: []GuestResource{{Node: "pve1"}},
 		},
-		{name: "Pool",
-			input:  []interface{}{map[string]interface{}{"pool": "Production"}},
-			output: []GuestResource{{Pool: "Production"}},
-		},
 		{name: "Status",
 			input:  []interface{}{map[string]interface{}{"status": "running"}},
 			output: []GuestResource{{Status: "running"}},
@@ -109,7 +105,6 @@ func Test_GuestResource_mapToStruct(t *testing.T) {
 					"netin":     float64(23884639),
 					"netout":    float64(1000123465987),
 					"node":      "pve1",
-					"pool":      "Production",
 					"status":    "running",
 					"tags":      "tag1;tag2;tag3",
 					"template":  float64(0),
@@ -131,7 +126,6 @@ func Test_GuestResource_mapToStruct(t *testing.T) {
 					"netin":     float64(2331323424),
 					"netout":    float64(88775378423476),
 					"node":      "pve2",
-					"pool":      "Development",
 					"status":    "running",
 					"tags":      "dev",
 					"template":  float64(0),
@@ -153,7 +147,6 @@ func Test_GuestResource_mapToStruct(t *testing.T) {
 					"netin":     float64(23884639),
 					"netout":    float64(1000123465987),
 					"node":      "node3",
-					"pool":      "Templates",
 					"status":    "stopped",
 					"tags":      "template",
 					"template":  float64(1),
@@ -177,7 +170,6 @@ func Test_GuestResource_mapToStruct(t *testing.T) {
 					NetworkIn:          23884639,
 					NetworkOut:         1000123465987,
 					Node:               "pve1",
-					Pool:               "Production",
 					Status:             "running",
 					Tags:               []string{"tag1", "tag2", "tag3"},
 					Template:           false,
@@ -199,7 +191,6 @@ func Test_GuestResource_mapToStruct(t *testing.T) {
 					NetworkIn:          2331323424,
 					NetworkOut:         88775378423476,
 					Node:               "pve2",
-					Pool:               "Development",
 					Status:             "running",
 					Tags:               []string{"dev"},
 					Template:           false,
@@ -221,7 +212,6 @@ func Test_GuestResource_mapToStruct(t *testing.T) {
 					NetworkIn:          23884639,
 					NetworkOut:         1000123465987,
 					Node:               "node3",
-					Pool:               "Templates",
 					Status:             "stopped",
 					Tags:               []string{"template"},
 					Template:           true,

diff --git a/proxmox/config_lxc.go b/proxmox/config_lxc.go
@@ -380,10 +380,6 @@ func (config ConfigLxc) CloneLxc(vmr *VmRef, client *Client) (err error) {
 		paramMap["hostname"] = config.Hostname
 	}
 
-	if config.Pool != "" {
-		paramMap["pool"] = config.Pool
-	}
-
 	if config.Snapname != "" {
 		paramMap["snapname"] = config.Snapname
 	}

diff --git a/proxmox/config_qemu.go b/proxmox/config_qemu.go
@@ -158,10 +158,6 @@ func (config ConfigQemu) CreateVm(vmr *VmRef, client *Client) (err error) {
 	if config.QemuVcpus >= 1 {
 		params["vcpus"] = config.QemuVcpus
 	}
-
-	if vmr.pool != "" {
-		params["pool"] = vmr.pool
-	}
 	if config.Boot != "" {
 		params["boot"] = config.Boot
 	}
@@ -366,9 +362,6 @@ func (config ConfigQemu) mapToApiValues(currentConfig ConfigQemu) (rebootRequire
 	if config.QemuOs != "" {
 		params["ostype"] = config.QemuOs
 	}
-	if config.Pool != "" {
-		params["pool"] = config.Pool
-	}
 	if config.Scsihw != "" {
 		params["scsihw"] = config.Scsihw
 	}