opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-16 15:07:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15933 from swordqiu/hotfix/qj-usage-policy-filter-revisit2

Browse Source 
fix: usage filter by policy tags revisit2
This commit is contained in:
Zexi Li
2023-02-15 10:08:54 +08:00
committed by GitHub
parent 11fe9e51de ccb79efd23
commit 695fd2690a
7 changed files with 373 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/usages/handler.go
+2 -1
View File
@@ -950,12 +950,13 @@ func guestHypervisorsUsage(
count := make(map[string]interface{})
results := db.UsagePolicyCheck(userToken, models.GuestManager, scope)
log.Debugf("guestHypervisorsUsage origin %s", results.String())
results = results.Merge(policyResult)
if results.Result.IsDeny() {
// deny
return count
}
log.Debugf("guestHypervisorsUsage results %s", results.String())
log.Debugf("guestHypervisorsUsage policyResults %s results %s", policyResult.String(), results.String())
// temporarily hide system resources
// XXX needs more work later
guest := models.GuestManager.TotalCount(scope, ownerId, rangeObjs, status, hypervisors,