From 8ef397ce5d3d35e10303030dda568beba96c905e Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Tue, 3 Dec 2019 16:27:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BF=BD=E7=95=A5=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=8F=AA=E8=A6=81cpu,mem=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E5=B0=B1=E4=B8=8D=E5=86=8D=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/skus.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/compute/models/skus.go b/pkg/compute/models/skus.go index e3585a538d..8e91da1504 100644 --- a/pkg/compute/models/skus.go +++ b/pkg/compute/models/skus.go @@ -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)