opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
屈轩
2018-09-15 14:11:49 +08:00
parent c60ca1d6eb
commit 2e1d40f70a
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/guestdrivers/aliyun.go
+21 -21
View File
@@ -586,30 +586,30 @@ func (self *SAliyunGuestDriver) RequestChangeVmConfig(ctx context.Context, guest
return nil
}
// func (self *SAliyunGuestDriver) RequestStartOnHost(ctx context.Context, guest *models.SGuest, host *models.SHost, userCred mcclient.TokenCredential, task taskman.ITask) (jsonutils.JSONObject, error) {
// ihost, e := host.GetIHost()
// if e != nil {
// return nil, e
// }
/*func (self *SAliyunGuestDriver) RequestStartOnHost(ctx context.Context, guest *models.SGuest, host *models.SHost, userCred mcclient.TokenCredential, task taskman.ITask) (jsonutils.JSONObject, error) {
ihost, e := host.GetIHost()
if e != nil {
return nil, e
}
// ivm, e := ihost.GetIVMById(guest.GetExternalId())
// if e != nil {
// return nil, e
// }
ivm, e := ihost.GetIVMById(guest.GetExternalId())
if e != nil {
return nil, e
}
// result := jsonutils.NewDict()
// if ivm.GetStatus() != models.VM_RUNNING {
// if err := ivm.StartVM(); err != nil {
// return nil, e
// } else {
// task.ScheduleRun(result)
// }
// } else {
// result.Add(jsonutils.NewBool(true), "is_running")
// }
result := jsonutils.NewDict()
if ivm.GetStatus() != models.VM_RUNNING {
if err := ivm.StartVM(); err != nil {
return nil, e
} else {
task.ScheduleRun(result)
}
} else {
result.Add(jsonutils.NewBool(true), "is_running")
}
// return result, e
// }
return result, e
}*/
/*func (self *SAliyunGuestDriver) RequestRebuildRootDisk(ctx context.Context, guest *models.SGuest, task taskman.ITask) error {
ihost, e := guest.GetHost().GetIHost()