Automatic merge from release/2.2.0 -> release/2.3.0

* commit '0b41ec34c91101f3afebe8beb001c93ff0844a8b':
  fix: region 批量创建 data 不正确

pkg/cloudcommon/db/db_dispatcher.go

@@ -952,7 +952,7 @@ func (dispatcher *DBModelDispatcher) BatchCreate(ctx context.Context, query json
 		results[i] = result
 	}
 	if len(models) > 0 {
-		dispatcher.modelManager.OnCreateComplete(ctx, models, userCred, query, data)
+		dispatcher.modelManager.OnCreateComplete(ctx, models, userCred, query, multiData[0])
 	}
 	return results, nil
 }

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())
 }

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())
 }