shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

B #4734: Fix driver breaking change (#4789)

Browse Source 
Signed-off-by: Carlos Herrera <cherrera@opennebula.io>
This commit is contained in:
Carlos J. Herrera 2020-05-22 04:29:02 -04:00 committed by GitHub
parent 783ec5c1bd
commit ab82b287e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 96 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/docker_machine/src/docker_machine/opennebula.go
View File

@ -519,7 +519,20 @@ func (d *Driver) GetURL() (string, error) {
func (d *Driver) GetIP() (string, error) {
controller := d.getController()
vm, err := controller.VM(d.MachineId).Info(false)
var err2 error
var vm_id int
if d.MachineId == 0 {
vm_id, err2 = controller.VMs().ByName(d.MachineName)
if err2 != nil {
return "", err2
}
d.MachineId = vm_id
} else {
vm_id = d.MachineId
}
vm, err := controller.VM(vm_id).Info(false)
if err != nil {
return "", err
}
@ -542,7 +555,20 @@ func (d *Driver) GetIP() (string, error) {
func (d *Driver) GetState() (state.State, error) {
controller := d.getController()
vm, err := controller.VM(d.MachineId).Info(false)
var err2 error
var vm_id int
if d.MachineId == 0 {
vm_id, err2 = controller.VMs().ByName(d.MachineName)
if err2 != nil {
return state.None, err2
}
d.MachineId = vm_id
} else {
vm_id = d.MachineId
}
vm, err := controller.VM(vm_id).Info(false)
if err != nil {
return state.None, err
}
@ -653,8 +679,19 @@ func (d *Driver) Start() error {
controller := d.getController()
var err error
var vm_id int
vm := controller.VM(d.MachineId)
if d.MachineId == 0 {
vm_id, err = controller.VMs().ByName(d.MachineName)
if err != nil {
return err
}
d.MachineId = vm_id
} else {
vm_id = d.MachineId
}
vm := controller.VM(vm_id)
vm.Resume()
s := state.None
@ -688,7 +725,20 @@ func (d *Driver) Start() error {
func (d *Driver) Stop() error {
controller := d.getController()
vm := controller.VM(d.MachineId)
var err2 error
var vm_id int
if d.MachineId == 0 {
vm_id, err2 = controller.VMs().ByName(d.MachineName)
if err2 != nil {
return err2
}
d.MachineId = vm_id
} else {
vm_id = d.MachineId
}
vm := controller.VM(vm_id)
err := vm.Poweroff()
if err != nil {
return err
@ -700,7 +750,20 @@ func (d *Driver) Stop() error {
func (d *Driver) Remove() error {
controller := d.getController()
vm := controller.VM(d.MachineId)
var err2 error
var vm_id int
if d.MachineId == 0 {
vm_id, err2 = controller.VMs().ByName(d.MachineName)
if err2 != nil {
return err2
}
d.MachineId = vm_id
} else {
vm_id = d.MachineId
}
vm := controller.VM(vm_id)
err := vm.TerminateHard()
if err != nil {
return err
@ -712,7 +775,20 @@ func (d *Driver) Remove() error {
func (d *Driver) Restart() error {
controller := d.getController()
vm := controller.VM(d.MachineId)
var err2 error
var vm_id int
if d.MachineId == 0 {
vm_id, err2 = controller.VMs().ByName(d.MachineName)
if err2 != nil {
return err2
}
d.MachineId = vm_id
} else {
vm_id = d.MachineId
}
vm := controller.VM(vm_id)
err := vm.Reboot()
if err != nil {
return err
@ -724,7 +800,20 @@ func (d *Driver) Restart() error {
func (d *Driver) Kill() error {
controller := d.getController()
vm := controller.VM(d.MachineId)
var err2 error
var vm_id int
if d.MachineId == 0 {
vm_id, err2 = controller.VMs().ByName(d.MachineName)
if err2 != nil {
return err2
}
d.MachineId = vm_id
} else {
vm_id = d.MachineId
}
vm := controller.VM(vm_id)
err := vm.PoweroffHard()
if err != nil {
return err