Merge pull request #727 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-vmware-vcenter-test to release/2.4.0

* commit 'e7b978955c3a17712095964102afad558c68d2da':
  set cmtbound for storage & cpu & memory
  修正：由于datastore url信息不一致导致通过vcenter创建主机失败

pkg/compute/hostdrivers/esxi.go

@@ -7,6 +7,7 @@ import (
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 
+	"github.com/golang-plus/errors"
 	"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
 	"yunion.io/x/onecloud/pkg/compute/models"
 	"yunion.io/x/onecloud/pkg/util/httputils"
@@ -63,6 +64,12 @@ func (self *SESXiHostDriver) CheckAndSetCacheImage(ctx context.Context, host *mo
 	content.Format = cacheImage.GetFormat()
 
 	storage := host.GetStorageByFilePath(storageCache.Path)
+	if storage == nil {
+		msg := fmt.Sprintf("fail to find storage for storageCache %s", storageCache.Path)
+		log.Errorf(msg)
+		return errors.New(msg)
+	}
+
 	accessInfo, err := host.GetCloudaccount().GetVCenterAccessInfo(storage.ExternalId)
 	if err != nil {
 		return err

pkg/compute/models/hosts.go

@@ -1340,6 +1340,8 @@ func (manager *SHostManager) newFromCloudHost(extHost cloudprovider.ICloudHost,
 	host.MemSize = extHost.GetMemSizeMB()
 	host.StorageSize = extHost.GetStorageSizeMB()
 	host.StorageType = extHost.GetStorageType()
+	host.CpuCmtbound = 8.0
+	host.MemCmtbound = 1.0
 
 	host.ManagerId = extHost.GetManagerId()
 	host.IsEmulated = extHost.IsEmulated()

pkg/compute/models/storages.go

@@ -746,6 +746,7 @@ func (manager *SStorageManager) newFromCloudStorage(extStorage cloudprovider.ICl
 	storage.MediumType = extStorage.GetMediumType()
 	storage.StorageConf = extStorage.GetStorageConf()
 	storage.Capacity = extStorage.GetCapacityMB()
+	storage.Cmtbound = 1.0
 
 	storage.Enabled = extStorage.GetEnabled()
 

pkg/compute/tasks/cloud_account_sync_task.go

@@ -91,6 +91,7 @@ func (self *CloudAccountSyncInfoTask) OnCloudaccountSyncComplete(ctx context.Con
 				err := skus.SyncSkusByProviderIds([]string{cloudprovider.Provider})
 				return nil, err
 			})
+			return
 		}
 	}
 	self.SetStageComplete(ctx, nil)

pkg/util/esxi/storage.go

@@ -332,8 +332,14 @@ func (self *SDatastore) GetManagerId() string {
 	return self.manager.providerId
 }
 
+const dsPrefix = "ds://"
+
 func (self *SDatastore) GetUrl() string {
-	return self.getDatastore().Info.GetDatastoreInfo().Url
+	url := self.getDatastore().Info.GetDatastoreInfo().Url
+	if strings.HasPrefix(url, dsPrefix) {
+		url = url[len(dsPrefix):]
+	}
+	return url
 }
 
 func (self *SDatastore) GetMountPoint() string {