fix: baremetal driver did not implement StartGuestRestartTask

This commit is contained in:
Qiu Jian
2019-02-12 15:21:29 +08:00
parent b22ec29c0c
commit a57733bae8
3 changed files with 12 additions and 12 deletions
+8 -1
View File
@@ -158,7 +158,14 @@ func (self *SBaseGuestDriver) StartGuestResetTask(guest *models.SGuest, ctx cont
}
func (self *SBaseGuestDriver) StartGuestRestartTask(guest *models.SGuest, ctx context.Context, userCred mcclient.TokenCredential, isForce bool, parentTaskId string) error {
return fmt.Errorf("Not Implement")
data := jsonutils.NewDict()
data.Set("is_force", jsonutils.NewBool(isForce))
task, err := taskman.TaskManager.NewTask(ctx, "GuestRestartTask", guest, userCred, nil, parentTaskId, "", nil)
if err != nil {
return err
}
task.ScheduleRun(nil)
return nil
}
func (self *SBaseGuestDriver) RequestSoftReset(ctx context.Context, guest *models.SGuest, task taskman.ITask) error {
+4
View File
@@ -170,3 +170,7 @@ func (self *SContainerDriver) RequestRebuildRootDisk(ctx context.Context, guest
func (self *SContainerDriver) GetRandomNetworkTypes() []string {
return []string{models.SERVER_TYPE_CONTAINER, models.SERVER_TYPE_GUEST}
}
func (self *SContainerDriver) StartGuestRestartTask(guest *models.SGuest, ctx context.Context, userCred mcclient.TokenCredential, isForce bool, parentTaskId string) error {
return fmt.Errorf("Not Implement")
}
@@ -132,17 +132,6 @@ func (self *SVirtualizedGuestDriver) StartGuestResetTask(guest *models.SGuest, c
return nil
}
func (self *SVirtualizedGuestDriver) StartGuestRestartTask(guest *models.SGuest, ctx context.Context, userCred mcclient.TokenCredential, isForce bool, parentTaskId string) error {
data := jsonutils.NewDict()
data.Set("is_force", jsonutils.NewBool(isForce))
task, err := taskman.TaskManager.NewTask(ctx, "GuestRestartTask", guest, userCred, nil, parentTaskId, "", nil)
if err != nil {
return err
}
task.ScheduleRun(nil)
return nil
}
func (self *SVirtualizedGuestDriver) RequestDeleteDetachedDisk(ctx context.Context, disk *models.SDisk, task taskman.ITask, isPurge bool) error {
return disk.StartDiskDeleteTask(ctx, task.GetUserCred(), task.GetTaskId(), isPurge,
jsonutils.QueryBoolean(task.GetParams(), "override_pending_delete", false))