public/terraform-provider-proxmox
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-proxmox.git synced 2024-07-01 07:02:40 +00:00
Code Issues Projects Releases Wiki Activity

reuse device mapping functionality

Browse Source
This commit is contained in:
Andreas Gruhler 2019-06-05 20:32:29 +02:00
parent cde2db1bf8
commit 9276217198
2 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
proxmox/resource_lxc.go
View File

@ -71,6 +71,11 @@ func resourceLxc() *schema.Resource {
Type: schema.TypeString,
Optional: true,
},
"force": {
Type: schema.TypeBool,
Optional: true,
Default: false,
},
},
}
}
@ -81,16 +86,15 @@ func resourceLxcCreate(d *schema.ResourceData, meta interface{}) error {
client := pconf.Client
vmName := d.Get("hostname").(string)
networks := d.Get("networks").(*schema.Set)
lxcNetworks := lxcDevicesSetToMap(networks)
lxcNetworks := DevicesSetToMap(networks)
config := pxapi.ConfigLxc{
Ostemplate: d.Get("ostemplate").(string),
Storage: d.Get("storage").(string),
Pool: d.Get("pool").(string),
Password: d.Get("password").(string),
Hostname: vmName,
Networks: lxcNetworks,
}
config := pxapi.NewConfigLxc()
config.Ostemplate = d.Get("ostemplate").(string)
config.Hostname = vmName
config.Networks = lxcNetworks
config.Password = d.Get("password").(string)
config.Pool = d.Get("pool").(string)
config.Storage = d.Get("storage").(string)
targetNode := d.Get("target_node").(string)
//vmr, _ := client.GetVmRefByName(vmName)
@ -126,17 +130,3 @@ func resourceLxcRead(d *schema.ResourceData, meta interface{}) error {
func resourceLxcDelete(d *schema.ResourceData, meta interface{}) error {
return nil
}
func lxcDevicesSetToMap(devicesSet *schema.Set) pxapi.LxcDevices {
devicesMap := pxapi.LxcDevices{}
for _, set := range devicesSet.List() {
setMap, isMap := set.(map[string]interface{})
if isMap {
setID := setMap["id"].(int)
devicesMap[setID] = setMap
}
}
return devicesMap
}

12
proxmox/resource_vm_qemu.go
View File

@ -354,9 +354,9 @@ func resourceVmQemuCreate(d *schema.ResourceData, meta interface{}) error {
client := pconf.Client
vmName := d.Get("name").(string)
networks := d.Get("network").(*schema.Set)
qemuNetworks := devicesSetToMap(networks)
qemuNetworks := DevicesSetToMap(networks)
disks := d.Get("disk").(*schema.Set)
qemuDisks := devicesSetToMap(disks)
qemuDisks := DevicesSetToMap(disks)
config := pxapi.ConfigQemu{
Name: vmName,
@ -504,9 +504,9 @@ func resourceVmQemuUpdate(d *schema.ResourceData, meta interface{}) error {
return err
}
configDisksSet := d.Get("disk").(*schema.Set)
qemuDisks := devicesSetToMap(configDisksSet)
qemuDisks := DevicesSetToMap(configDisksSet)
configNetworksSet := d.Get("network").(*schema.Set)
qemuNetworks := devicesSetToMap(configNetworksSet)
qemuNetworks := DevicesSetToMap(configNetworksSet)
config := pxapi.ConfigQemu{
Name: d.Get("name").(string),
@ -706,7 +706,7 @@ func diskSizeGB(dcSize interface{}) float64 {
// Converting from schema.TypeSet to map of id and conf for each device,
// which will be sent to Proxmox API.
func devicesSetToMap(devicesSet *schema.Set) pxapi.QemuDevices {
func DevicesSetToMap(devicesSet *schema.Set) pxapi.QemuDevices {
devicesMap := pxapi.QemuDevices{}
@ -727,7 +727,7 @@ func updateDevicesSet(
devicesMap pxapi.QemuDevices,
) *schema.Set {
configDevicesMap := devicesSetToMap(devicesSet)
configDevicesMap := DevicesSetToMap(devicesSet)
activeDevicesMap := updateDevicesDefaults(devicesMap, configDevicesMap)
for _, setConf := range devicesSet.List() {