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

Merge pull request #10549 from swordqiu/hotfix/qj-image-update-iso-min-disk

Browse Source 
fix(image): update min_disk of iso image
This commit is contained in:
Zexi Li
2021-04-01 20:51:44 +08:00
committed by GitHub
parent af9c89f3bb 298568772a
commit efe5ce4508
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/image/models/images.go
+5 -5
View File
@@ -623,7 +623,7 @@ func (self *SImage) ValidateUpdateData(ctx context.Context, userCred mcclient.To
if appParams != nil && appParams.Request.ContentLength > 0 {
return nil, httperrors.NewInvalidStatusError("cannot upload in status %s", self.Status)
}
if minDiskSize, err := data.Int("min_disk"); err == nil {
if minDiskSize, err := data.Int("min_disk"); err == nil && self.DiskFormat != string(qemuimg.ISO) {
img, err := qemuimg.NewQemuImage(self.GetLocalLocation())
if err != nil {
return nil, errors.Wrap(err, "open image")
@@ -929,9 +929,9 @@ func (manager *SImageManager) count(scope rbacutils.TRbacScope, ownerId mcclient
sq = sq.IsFalse("pending_deleted")
}
if isISO.IsTrue() {
sq = sq.Equals("disk_format", "iso")
sq = sq.Equals("disk_format", string(qemuimg.ISO))
} else if isISO.IsFalse() {
sq = sq.NotEquals("disk_format", "iso")
sq = sq.NotEquals("disk_format", string(qemuimg.ISO))
}
cnt, _ := sq.CountWithError()
@@ -985,13 +985,13 @@ func (manager *SImageManager) Usage(scope rbacutils.TRbacScope, ownerId mcclient
count := manager.count(scope, ownerId, api.IMAGE_STATUS_ACTIVE, tristate.False, false, tristate.False)
expandUsageCount(usages, prefix, "img", "", count)
count = manager.count(scope, ownerId, api.IMAGE_STATUS_ACTIVE, tristate.True, false, tristate.False)
expandUsageCount(usages, prefix, "iso", "", count)
expandUsageCount(usages, prefix, string(qemuimg.ISO), "", count)
count = manager.count(scope, ownerId, api.IMAGE_STATUS_ACTIVE, tristate.None, false, tristate.False)
expandUsageCount(usages, prefix, "imgiso", "", count)
count = manager.count(scope, ownerId, "", tristate.False, true, tristate.False)
expandUsageCount(usages, prefix, "img", "pending_delete", count)
count = manager.count(scope, ownerId, "", tristate.True, true, tristate.False)
expandUsageCount(usages, prefix, "iso", "pending_delete", count)
expandUsageCount(usages, prefix, string(qemuimg.ISO), "pending_delete", count)
count = manager.count(scope, ownerId, "", tristate.None, true, tristate.False)
expandUsageCount(usages, prefix, "imgiso", "pending_delete", count)
return usages