diff --git a/cmd/climc/shell/images.go b/cmd/climc/shell/images.go index 9944d437a8..c620f59efd 100644 --- a/cmd/climc/shell/images.go +++ b/cmd/climc/shell/images.go @@ -252,7 +252,7 @@ func init() { } type ImageDeleteOptions struct { - ID []string `help:"Image ID or name"` + ID []string `help:"Image ID or name" json:"-"` OverridePendingDelete *bool `help:"Delete image directly instead of pending delete" short-token:"f"` } R(&ImageDeleteOptions{}, "image-delete", "Delete a image", func(s *mcclient.ClientSession, args *ImageDeleteOptions) error { diff --git a/pkg/image/models/images.go b/pkg/image/models/images.go index c12e5b81f2..8b8e217b05 100644 --- a/pkg/image/models/images.go +++ b/pkg/image/models/images.go @@ -538,7 +538,8 @@ func (self *SImage) PostCreate(ctx context.Context, userCred mcclient.TokenCrede // if SImage belong to a guest image, pending quota will not be set. if self.IsGuestImage.IsFalse() { pendingUsage := SQuota{Image: 1} - keys := imageCreateInput2QuotaKeys(self.DiskFormat, ownerId) + inputDiskFormat, _ := data.GetString("disk_format") + keys := imageCreateInput2QuotaKeys(inputDiskFormat, ownerId) pendingUsage.SetKeys(keys) cancelUsage := SQuota{Image: 1} keys = self.GetQuotaKeys()