From f935155b5b0d772bbab0e76a7f4869c79b95410c Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Thu, 14 Mar 2019 16:06:33 +0800 Subject: [PATCH] fix: issues due to move of skustools to models at 2.7.0 --- pkg/compute/models/skus_test.go | 2 +- pkg/compute/models/skustools.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/compute/models/skus_test.go b/pkg/compute/models/skus_test.go index 0de26c3d66..00dc9dcdb6 100644 --- a/pkg/compute/models/skus_test.go +++ b/pkg/compute/models/skus_test.go @@ -1,4 +1,4 @@ -package skus +package models import ( "reflect" diff --git a/pkg/compute/models/skustools.go b/pkg/compute/models/skustools.go index e95ad2e386..871130b7a4 100644 --- a/pkg/compute/models/skustools.go +++ b/pkg/compute/models/skustools.go @@ -176,7 +176,7 @@ func (self *SkusZone) doUpdate(odata *SServerSku, sku jsonutils.JSONObject) erro func (self *SkusZone) SyncToLocalDB() error { log.Debugf("SkusZone %s start sync.", self.ExternalZoneId) // 更新已经soldout的sku - localIds, err := models.ServerSkuManager.FetchAllAvailableSkuIdByZoneId(self.ZoneId) + localIds, err := ServerSkuManager.FetchAllAvailableSkuIdByZoneId(self.ZoneId) if err != nil { return err } @@ -216,7 +216,7 @@ func (self *SkusZone) SyncToLocalDB() error { // 处理已经下架的sku: 将本次未更新且处于available状态的sku置为soldout状态 abandonIds := diff(localIds, updatedIds) log.Debugf("SyncToLocalDB abandon sku %s", abandonIds) - err = models.ServerSkuManager.MarkAllAsSoldout(abandonIds) + err = ServerSkuManager.MarkAllAsSoldout(abandonIds) if err != nil { return err }