diff --git a/pkg/compute/guestdrivers/aws.go b/pkg/compute/guestdrivers/aws.go index 36fa893b8f..e0bd2ef7bd 100644 --- a/pkg/compute/guestdrivers/aws.go +++ b/pkg/compute/guestdrivers/aws.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "time" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/onecloud/pkg/cloudcommon/db" @@ -43,6 +44,23 @@ func (self *SAwsGuestDriver) GetDetachDiskStatus() ([]string, error) { return []string{models.VM_READY, models.VM_RUNNING}, nil } +func (self *SAwsGuestDriver) GetAttachDiskStatus() ([]string, error) { + return []string{models.VM_READY, models.VM_RUNNING}, nil +} + +func (self *SAwsGuestDriver) GetRebuildRootStatus() ([]string, error) { + return []string{models.VM_READY, models.VM_RUNNING}, nil +} + +func (self *SAwsGuestDriver) GetChangeConfigStatus() ([]string, error) { + return []string{models.VM_READY}, nil +} + +//AWS不允许更改密码或替换密钥对 +func (self *SAwsGuestDriver) GetDeployStatus() ([]string, error) { + return []string{}, nil +} + func (self *SAwsGuestDriver) RequestDetachDisk(ctx context.Context, guest *models.SGuest, task taskman.ITask) error { return guest.StartSyncTask(ctx, task.GetUserCred(), false, task.GetTaskId()) } @@ -324,10 +342,6 @@ func (self *SAwsGuestDriver) RequestDiskSnapshot(ctx context.Context, guest *mod return nil } -func (self *SAwsGuestDriver) GetAttachDiskStatus() ([]string, error) { - return []string{models.VM_READY, models.VM_RUNNING}, nil -} - func init() { driver := SAwsGuestDriver{} models.RegisterGuestDriver(&driver) diff --git a/pkg/compute/guestdrivers/qcloud.go b/pkg/compute/guestdrivers/qcloud.go index 6a601f65c0..fae3f19f00 100644 --- a/pkg/compute/guestdrivers/qcloud.go +++ b/pkg/compute/guestdrivers/qcloud.go @@ -55,6 +55,18 @@ func (self *SQcloudGuestDriver) GetAttachDiskStatus() ([]string, error) { return []string{models.VM_READY, models.VM_RUNNING}, nil } +func (self *SQcloudGuestDriver) GetRebuildRootStatus() ([]string, error) { + return []string{models.VM_READY, models.VM_RUNNING}, nil +} + +func (self *SQcloudGuestDriver) GetChangeConfigStatus() ([]string, error) { + return []string{models.VM_READY, models.VM_RUNNING}, nil +} + +func (self *SQcloudGuestDriver) GetDeployStatus() ([]string, error) { + return []string{models.VM_READY, models.VM_RUNNING}, nil +} + func (self *SQcloudGuestDriver) RequestDetachDisk(ctx context.Context, guest *models.SGuest, task taskman.ITask) error { return guest.StartSyncTask(ctx, task.GetUserCred(), false, task.GetTaskId()) }