From 3e6c82f2fcc954eb183f71f39c75a76bee88714c Mon Sep 17 00:00:00 2001 From: mhf Date: Thu, 24 Nov 2022 22:38:15 +0800 Subject: [PATCH] fix(region): delete modelart Sku purgeAll.managerId --- pkg/compute/models/cloudproviders.go | 1 - pkg/compute/models/purge.go | 10 ++++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkg/compute/models/cloudproviders.go b/pkg/compute/models/cloudproviders.go index 08325c3a46..7b43dacc1b 100644 --- a/pkg/compute/models/cloudproviders.go +++ b/pkg/compute/models/cloudproviders.go @@ -1444,7 +1444,6 @@ func (self *SCloudprovider) RealDelete(ctx context.Context, userCred mcclient.To CloudregionManager, CloudproviderQuotaManager, ModelartsPoolManager, - ModelartsPoolSkuManager, } { err = manager.purgeAll(ctx, userCred, self.Id) if err != nil { diff --git a/pkg/compute/models/purge.go b/pkg/compute/models/purge.go index 1f6fa53d00..25df40eee5 100644 --- a/pkg/compute/models/purge.go +++ b/pkg/compute/models/purge.go @@ -1122,6 +1122,16 @@ func (self *SCloudregion) purgeSkus(ctx context.Context, userCred mcclient.Token return errors.Wrapf(err, "delete cache sku %s", cacheSkus[i].Id) } } + modelartsSku, err := self.GetModelartsPoolSkus() + if err != nil { + return errors.Wrapf(err, "GetModelartsPoolSkus") + } + for i := range modelartsSku { + err = modelartsSku[i].Delete(ctx, userCred) + if err != nil { + return errors.Wrapf(err, "delete modelarts sku %s", modelartsSku[i].Id) + } + } return nil }