fix(region): be compatible with 3.8

cmd/climc/shell/compute/backup.go

@@ -16,7 +16,7 @@ package compute
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 

pkg/compute/models/instance_backup.go

@@ -258,8 +258,8 @@ func (manager *SInstanceBackupManager) fillInstanceBackup(ctx context.Context, u
 		instanceBackup.KeypairId = guest.KeypairId
 	}
 	serverMetadata := jsonutils.NewDict()
-	if loginAccount := guest.GetMetadata(ctx, "login_account", nil); len(loginAccount) > 0 {
-		loginKey := guest.GetMetadata(ctx, "login_key", nil)
+	if loginAccount := guest.GetMetadata("login_account", nil); len(loginAccount) > 0 {
+		loginKey := guest.GetMetadata("login_key", nil)
 		if len(guest.KeypairId) == 0 && len(loginKey) > 0 {
 			passwd, e := utils.DescryptAESBase64(guest.Id, loginKey)
 			if e == nil {
@@ -271,16 +271,16 @@ func (manager *SInstanceBackupManager) fillInstanceBackup(ctx context.Context, u
 			serverMetadata.Set("login_account", jsonutils.NewString(loginAccount))
 		}
 	}
-	if osArch := guest.GetMetadata(ctx, "os_arch", nil); len(osArch) > 0 {
+	if osArch := guest.GetMetadata("os_arch", nil); len(osArch) > 0 {
 		serverMetadata.Set("os_arch", jsonutils.NewString(osArch))
 	}
-	if osDist := guest.GetMetadata(ctx, "os_distribution", nil); len(osDist) > 0 {
+	if osDist := guest.GetMetadata("os_distribution", nil); len(osDist) > 0 {
 		serverMetadata.Set("os_distribution", jsonutils.NewString(osDist))
 	}
-	if osName := guest.GetMetadata(ctx, "os_name", nil); len(osName) > 0 {
+	if osName := guest.GetMetadata("os_name", nil); len(osName) > 0 {
 		serverMetadata.Set("os_name", jsonutils.NewString(osName))
 	}
-	if osVersion := guest.GetMetadata(ctx, "os_version", nil); len(osVersion) > 0 {
+	if osVersion := guest.GetMetadata("os_version", nil); len(osVersion) > 0 {
 		serverMetadata.Set("os_version", jsonutils.NewString(osVersion))
 	}
 	secs, _ := guest.GetSecgroups()

pkg/compute/tasks/disk_backup_recovery_task.go

@@ -13,7 +13,7 @@ import (
 	"yunion.io/x/onecloud/pkg/compute/models"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/auth"
-	compute_modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/util/logclient"
 )
 
@@ -59,7 +59,7 @@ func (self *DiskBackupRecoveryTask) OnInit(ctx context.Context, obj db.IStandalo
 	log.Infof("task_notify_url: %s\ntask_id: %s\n", taskHeader.Get(mcclient.TASK_NOTIFY_URL), taskHeader.Get(mcclient.TASK_ID))
 	session.Header.Set(mcclient.TASK_NOTIFY_URL, taskHeader.Get(mcclient.TASK_NOTIFY_URL))
 	session.Header.Set(mcclient.TASK_ID, taskHeader.Get(mcclient.TASK_ID))
-	diskData, err := compute_modules.Disks.Create(session, jsonutils.Marshal(input))
+	diskData, err := modules.Disks.Create(session, jsonutils.Marshal(input))
 	if err != nil {
 		self.taskFaild(ctx, backup, jsonutils.NewString(err.Error()))
 		return

pkg/compute/tasks/instance_backup_recovery_task.go

@@ -26,7 +26,7 @@ import (
 	"yunion.io/x/onecloud/pkg/compute/models"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/auth"
-	compute_modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/util/logclient"
 )
 
@@ -67,7 +67,7 @@ func (self *InstanceBackupRecoveryTask) OnInit(ctx context.Context, obj db.IStan
 	session := auth.GetSession(ctx, self.UserCred, "", "")
 	session.Header.Set(mcclient.TASK_NOTIFY_URL, taskHeader.Get(mcclient.TASK_NOTIFY_URL))
 	session.Header.Set(mcclient.TASK_ID, taskHeader.Get(mcclient.TASK_ID))
-	serverData, err := compute_modules.Servers.Create(session, jsonutils.Marshal(sourceInput))
+	serverData, err := modules.Servers.Create(session, jsonutils.Marshal(sourceInput))
 	if err != nil {
 		self.taskFailed(ctx, ib, jsonutils.NewString(err.Error()))
 		return

pkg/hostman/options/options.go

@@ -159,7 +159,8 @@ type SHostOptions struct {
 
 	EnableVmUuid bool `help:"enable vm UUID" default:"true" json:"enable_vm_uuid"`
 
-	EnableVirtioRngDevice bool `help:"enable qemu virtio-rng device" default:"true"`
+	EnableVirtioRngDevice        bool `help:"enable qemu virtio-rng device" default:"true"`
+	RestrictQemuImgConvertWorker bool `help:"restrict qemu-img convert worker" default:"false"`
 }
 
 var (

pkg/mcclient/modules/mod_backup.go

@@ -12,11 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package compute
+package modules
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 type DiskBackupManager struct {
@@ -38,27 +37,27 @@ var (
 )
 
 func init() {
-	DiskBackups = DiskBackupManager{modules.NewComputeManager(
+	DiskBackups = DiskBackupManager{NewComputeManager(
 		"diskbackup",
 		"diskbackups",
 		[]string{},
 		[]string{},
 	)}
-	modules.RegisterCompute(&DiskBackups)
+	registerCompute(&DiskBackups)
 
-	BackupStorages = BackupStorageManager{modules.NewComputeManager(
+	BackupStorages = BackupStorageManager{NewComputeManager(
 		"backupstorage",
 		"backupstorages",
 		[]string{},
 		[]string{},
 	)}
-	modules.RegisterCompute(&BackupStorages)
+	registerCompute(&BackupStorages)
 
-	InstanceBackups = InstanceBackupManager{modules.NewComputeManager(
+	InstanceBackups = InstanceBackupManager{NewComputeManager(
 		"instancebackup",
 		"instancebackups",
 		[]string{},
 		[]string{},
 	)}
-	modules.RegisterCompute(&InstanceBackups)
+	registerCompute(&InstanceBackups)
 }