From 17db0eeb6f2ed4c92cebace1831c2ba41f83cfb6 Mon Sep 17 00:00:00 2001 From: TangBin Date: Thu, 27 Dec 2018 20:02:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0sku=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=85=B3=E8=81=94=E4=B8=BB=E6=9C=BA=E6=95=B0=E9=87=8F=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E5=90=8D=E7=A7=B0?= 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 c16c672df6..aa52e448cc 100644 --- a/pkg/compute/models/skus.go +++ b/pkg/compute/models/skus.go @@ -140,7 +140,7 @@ func genInstanceType(family string, cpu, mem_mb int64) (string, error) { return fmt.Sprintf("ecs.%s.c%dm%d", family, cpu, mem_mb/1024), nil } -func instanceRelatedGuestCount(self *SServerSku) int { +func skuRelatedGuestCount(self *SServerSku) int { var q *sqlchemy.SQuery if len(self.ZoneId) > 0 { hostTable := HostManager.Query().SubQuery() @@ -165,14 +165,14 @@ func (self *SServerSku) AllowGetDetails(ctx context.Context, userCred mcclient.T func (self *SServerSku) GetCustomizeColumns(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) *jsonutils.JSONDict { extra := self.SStandaloneResourceBase.GetCustomizeColumns(ctx, userCred, query) - count := instanceRelatedGuestCount(self) + count := skuRelatedGuestCount(self) extra.Add(jsonutils.NewInt(int64(count)), "total_guest_count") return extra } func (self *SServerSku) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) *jsonutils.JSONDict { extra := self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query) - count := instanceRelatedGuestCount(self) + count := skuRelatedGuestCount(self) extra.Add(jsonutils.NewInt(int64(count)), "total_guest_count") return extra }