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 #4887 from wanyaoqi/feature/wyq/glance-fix

Browse Source 
glance: validate image share on delete, update pulibc scope on mark standard
This commit is contained in:
yunion-ci-robot
2020-01-15 20:31:10 +08:00
committed by GitHub
parent 5e4155061f bb82d30331
commit edc6711d96
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/image/models/images.go
+20 -6
View File
@@ -658,6 +658,9 @@ func (self *SImage) ValidateDeleteCondition(ctx context.Context) error {
if self.IsGuestImage.IsTrue() {
return httperrors.NewForbiddenError("image is the part of guest image")
}
if self.IsPublic || len(self.GetSharedProjects()) > 0 {
return httperrors.NewForbiddenError("image is shared")
}
return self.SVirtualResourceBase.ValidateDeleteCondition(ctx)
}
@@ -1242,13 +1245,24 @@ func (self *SImage) PerformMarkStandard(
data jsonutils.JSONObject,
) (jsonutils.JSONObject, error) {
isStandard := jsonutils.QueryBoolean(data, "is_standard", false)
if (!self.IsStandard.IsTrue() && isStandard) || (self.IsStandard.IsTrue() && !isStandard) {
if !self.IsStandard.IsTrue() && isStandard {
params := jsonutils.NewDict()
params.Set("scope", jsonutils.NewString("system"))
_, err := self.PerformPublic(ctx, userCred, query, params)
if err != nil {
return nil, err
}
diff, err := db.Update(self, func() error {
if isStandard {
self.IsStandard = tristate.True
} else {
self.IsStandard = tristate.False
}
self.IsStandard = tristate.True
return nil
})
if err != nil {
return nil, httperrors.NewGeneralError(err)
}
db.OpsLog.LogEvent(self, db.ACT_UPDATE, diff, userCred)
} else if self.IsStandard.IsTrue() && !isStandard {
diff, err := db.Update(self, func() error {
self.IsStandard = tristate.False
return nil
})
if err != nil {