Merge pull request #38 from jereksel/update_name

Fix VM name changing
This commit is contained in:
Grant Gongaware 2019-03-06 08:29:01 -08:00 committed by GitHub
commit 55b30e4e1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -471,19 +471,24 @@ func resourceVmQemuUpdate(d *schema.ResourceData, meta interface{}) error {
pconf := meta.(*providerConfiguration) pconf := meta.(*providerConfiguration)
pmParallelBegin(pconf) pmParallelBegin(pconf)
client := pconf.Client client := pconf.Client
vmr, err := client.GetVmRefByName(d.Get("name").(string)) _, _, vmID, err := parseResourceId(d.Id())
if err != nil {
pmParallelEnd(pconf)
return err
}
vmr := pxapi.NewVmRef(vmID)
_, err = client.GetVmInfo(vmr)
if err != nil { if err != nil {
pmParallelEnd(pconf) pmParallelEnd(pconf)
return err return err
} }
vmName := d.Get("name").(string)
configDisksSet := d.Get("disk").(*schema.Set) configDisksSet := d.Get("disk").(*schema.Set)
qemuDisks := devicesSetToMap(configDisksSet) qemuDisks := devicesSetToMap(configDisksSet)
configNetworksSet := d.Get("network").(*schema.Set) configNetworksSet := d.Get("network").(*schema.Set)
qemuNetworks := devicesSetToMap(configNetworksSet) qemuNetworks := devicesSetToMap(configNetworksSet)
config := pxapi.ConfigQemu{ config := pxapi.ConfigQemu{
Name: vmName, Name: d.Get("name").(string),
Description: d.Get("desc").(string), Description: d.Get("desc").(string),
Onboot: d.Get("onboot").(bool), Onboot: d.Get("onboot").(bool),
Memory: d.Get("memory").(int), Memory: d.Get("memory").(int),
@ -551,8 +556,15 @@ func resourceVmQemuRead(d *schema.ResourceData, meta interface{}) error {
pconf := meta.(*providerConfiguration) pconf := meta.(*providerConfiguration)
pmParallelBegin(pconf) pmParallelBegin(pconf)
client := pconf.Client client := pconf.Client
vmr, err := client.GetVmRefByName(d.Get("name").(string)) _, _, vmID, err := parseResourceId(d.Id())
if err != nil { if err != nil {
pmParallelEnd(pconf)
return err
}
vmr := pxapi.NewVmRef(vmID)
_, err = client.GetVmInfo(vmr)
if err != nil {
pmParallelEnd(pconf)
return err return err
} }
config, err := pxapi.NewConfigQemuFromApi(vmr, client) config, err := pxapi.NewConfigQemuFromApi(vmr, client)