opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): purge private cloud sku

Browse Source
This commit is contained in:
Qu Xuan
2020-12-25 11:22:39 +08:00
parent 43495f8a00
commit b21903a329
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/purge.go
+20 -1
View File
@@ -1096,6 +1096,20 @@ func (zone *SZone) Purge(ctx context.Context, userCred mcclient.TokenCredential)
return zone.Delete(ctx, userCred)
}
func (self *SCloudregion) purgeSkus(ctx context.Context, userCred mcclient.TokenCredential) error {
skus, err := self.GetServerSkus()
if err != nil {
return errors.Wrapf(err, "GetServerSkus")
}
for i := range skus {
err = skus[i].RealDelete(ctx, userCred)
if err != nil {
return err
}
}
return nil
}
func (region *SCloudregion) purgeZones(ctx context.Context, userCred mcclient.TokenCredential) error {
zones, err := region.GetZones()
if err != nil {
@@ -1114,7 +1128,12 @@ func (region *SCloudregion) purge(ctx context.Context, userCred mcclient.TokenCr
lockman.LockObject(ctx, region)
defer lockman.ReleaseObject(ctx, region)
err := region.purgeZones(ctx, userCred)
err := region.purgeSkus(ctx, userCred)
if err != nil {
return errors.Wrapf(err, "purgeSkus")
}
err = region.purgeZones(ctx, userCred)
if err != nil {
return err
}