From ef74eec47c662f99feb0a4295ff0f437f7a8c6f1 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Thu, 14 Nov 2019 18:29:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=81=BF=E5=85=8Dregion=E5=90=8C?= =?UTF-8?q?=E5=90=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/skus_tools.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/compute/models/skus_tools.go b/pkg/compute/models/skus_tools.go index a399a84fc8..106a1f6759 100644 --- a/pkg/compute/models/skus_tools.go +++ b/pkg/compute/models/skus_tools.go @@ -219,17 +219,17 @@ func (self *SSkuResourcesMeta) getSkusByRegion(url string, region string) ([]jso self.regionalSkuCaches[url] = map[string][]jsonutils.JSONObject{} for i := range items { cloudregion, _ := items[i].GetString("cloudregion_id") - if _, ok := self.regionalSkuCaches[url][cloudregion]; !ok && len(cloudregion) > 0 { - self.regionalSkuCaches[url][cloudregion] = []jsonutils.JSONObject{} + if len(cloudregion) > 0 { + if _, ok := self.regionalSkuCaches[url][cloudregion]; !ok { + self.regionalSkuCaches[url][cloudregion] = []jsonutils.JSONObject{} + } + self.regionalSkuCaches[url][cloudregion] = append(self.regionalSkuCaches[url][cloudregion], items[i]) } - self.regionalSkuCaches[url][cloudregion] = append(self.regionalSkuCaches[url][cloudregion], items[i]) } } - for regionId, skus := range self.regionalSkuCaches[url] { - if strings.HasSuffix(region, regionId) { - return skus, nil - } + if skus, ok := self.regionalSkuCaches[url][region]; ok { + return skus, nil } return []jsonutils.JSONObject{}, nil }