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

region: fix network schedtag not cleanup when network deleted

Browse Source
This commit is contained in:
Zexi Li
2020-09-18 10:39:43 +08:00
parent 63e0f2ee76
commit 3ad40222c2
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/networks.go
+1
View File
@@ -1691,6 +1691,7 @@ func (self *SNetwork) CustomizeDelete(ctx context.Context, userCred mcclient.Tok
}
func (self *SNetwork) RealDelete(ctx context.Context, userCred mcclient.TokenCredential) error {
DeleteResourceJointSchedtags(self, ctx, userCred)
db.OpsLog.LogEvent(self, db.ACT_DELOCATE, self.GetShortDesc(ctx), userCred)
self.SetStatus(userCred, api.NETWORK_STATUS_DELETED, "real delete")
self.ClearSchedDescCache()
pkg/compute/models/schedtags.go
+3 -2
View File
@@ -369,7 +369,7 @@ func (self *SSchedtag) GetObjectQuery() *sqlchemy.SQuery {
q := objs.Query()
q = q.Join(objschedtags, sqlchemy.AND(sqlchemy.Equals(objschedtags.Field(jointMan.GetMasterIdKey(jointMan)), objs.Field("id")),
sqlchemy.IsFalse(objschedtags.Field("deleted"))))
q = q.Filter(sqlchemy.IsTrue(objs.Field("enabled")))
// q = q.Filter(sqlchemy.IsTrue(objs.Field("enabled")))
q = q.Filter(sqlchemy.Equals(objschedtags.Field("schedtag_id"), self.Id))
return q
}
@@ -379,7 +379,8 @@ func (self *SSchedtag) GetJointManager() ISchedtagJointManager {
}
func (self *SSchedtag) GetObjectCount() (int, error) {
return self.GetJointManager().Query().Equals("schedtag_id", self.Id).CountWithError()
q := self.GetObjectQuery()
return q.CountWithError()
}
func (self *SSchedtag) getSchedPoliciesCount() (int, error) {