opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 忽略名称条件，只要cpu,mem一致就不再同步

Browse Source
This commit is contained in:
Qu Xuan
2019-12-03 16:27:12 +08:00
parent f3b0c8357d
commit 8ef397ce5d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/skus.go
+3 -3
View File
@@ -882,7 +882,7 @@ func (manager *SServerSkuManager) GetOneCloudSkus() ([]string, error) {
}
result := []string{}
for _, sku := range skus {
result = append(result, fmt.Sprintf("%s/%d/%d", sku.Name, sku.CpuCoreCount, sku.MemorySizeMB))
result = append(result, fmt.Sprintf("%d/%d", sku.CpuCoreCount, sku.MemorySizeMB))
}
return result, nil
}
@@ -975,14 +975,14 @@ func (manager *SServerSkuManager) SyncPrivateCloudSkus(ctx context.Context, user
defer lockman.ReleaseClass(ctx, manager, db.GetLockClassKey(manager, userCred))
syncResult := compare.SyncResult{}
names, err := manager.GetOneCloudSkus()
localskus, err := manager.GetOneCloudSkus()
if err != nil {
syncResult.Error(err)
return syncResult
}
for _, sku := range skus {
if !utils.IsInStringArray(fmt.Sprintf("%s/%d/%d", sku.GetName(), sku.GetCpuCoreCount(), sku.GetMemorySizeMB()), names) {
if !utils.IsInStringArray(fmt.Sprintf("%d/%d", sku.GetCpuCoreCount(), sku.GetMemorySizeMB()), localskus) {
err := manager.newFromCloudSku(ctx, userCred, sku)
if err != nil {
syncResult.AddError(err)