fix(region): cloudpods vm migrate (#21746)

This commit is contained in:
屈轩
2024-12-05 14:39:18 +08:00
committed by GitHub
parent b373e74560
commit 667e3a4f7c
3 changed files with 2 additions and 18 deletions
+2 -2
View File
@@ -421,11 +421,11 @@ func (drv *SBaseGuestDriver) IsSupportLiveMigrate() bool {
}
func (drv *SBaseGuestDriver) CheckMigrate(ctx context.Context, guest *models.SGuest, userCred mcclient.TokenCredential, input api.GuestMigrateInput) error {
return httperrors.NewNotAcceptableError("Not allow for hypervisor %s", guest.GetHypervisor())
return nil
}
func (drv *SBaseGuestDriver) CheckLiveMigrate(ctx context.Context, guest *models.SGuest, userCred mcclient.TokenCredential, input api.GuestLiveMigrateInput) error {
return httperrors.NewNotAcceptableError("Not allow for hypervisor %s", guest.GetHypervisor())
return nil
}
func (drv *SBaseGuestDriver) RequestMigrate(ctx context.Context, guest *models.SGuest, userCred mcclient.TokenCredential, input api.GuestMigrateInput, task taskman.ITask) error {
-8
View File
@@ -601,14 +601,6 @@ func (self *SESXiGuestDriver) IsSupportLiveMigrate() bool {
return true
}
func (self *SESXiGuestDriver) CheckMigrate(ctx context.Context, guest *models.SGuest, userCred mcclient.TokenCredential, input api.GuestMigrateInput) error {
return nil
}
func (self *SESXiGuestDriver) CheckLiveMigrate(ctx context.Context, guest *models.SGuest, userCred mcclient.TokenCredential, input api.GuestLiveMigrateInput) error {
return nil
}
func (self *SESXiGuestDriver) RequestMigrate(ctx context.Context, guest *models.SGuest, userCred mcclient.TokenCredential, input api.GuestMigrateInput, task taskman.ITask) error {
return self.RequestLiveMigrate(ctx, guest, userCred, api.GuestLiveMigrateInput{PreferHostId: input.PreferHostId}, task)
}
-8
View File
@@ -388,14 +388,6 @@ func (self *SOpenStackGuestDriver) IsSupportLiveMigrate() bool {
return true
}
func (self *SOpenStackGuestDriver) CheckMigrate(ctx context.Context, guest *models.SGuest, userCred mcclient.TokenCredential, input api.GuestMigrateInput) error {
return nil
}
func (self *SOpenStackGuestDriver) CheckLiveMigrate(ctx context.Context, guest *models.SGuest, userCred mcclient.TokenCredential, input api.GuestLiveMigrateInput) error {
return nil
}
func (self *SOpenStackGuestDriver) RequestMigrate(ctx context.Context, guest *models.SGuest, userCred mcclient.TokenCredential, input api.GuestMigrateInput, task taskman.ITask) error {
taskman.LocalTaskRun(task, func() (jsonutils.JSONObject, error) {
iVM, err := guest.GetIVM(ctx)