opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-30 18:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

response scope-specific metrics

Browse Source
This commit is contained in:
Qiu Jian
2021-04-04 20:08:13 +08:00
parent 3248f57253
commit c2d3355ba6
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/usages/handler.go
+6 -3
View File
@@ -476,21 +476,24 @@ func ReportGeneralUsage(
) (count Usage, err error) {
count = make(map[string]interface{})
if scope == rbacutils.ScopeSystem || isOwner {
// if scope == rbacutils.ScopeSystem || isOwner {
if scope == rbacutils.ScopeSystem {
count, err = getSystemGeneralUsage(userCred, rangeObjs, hostTypes, providers, brands, cloudEnv, includeSystem)
if err != nil {
return
}
}
if scope.HigherEqual(rbacutils.ScopeDomain) && len(userCred.GetProjectDomainId()) > 0 {
// if scope.HigherEqual(rbacutils.ScopeDomain) && len(userCred.GetProjectDomainId()) > 0 {
if scope == rbacutils.ScopeDomain && len(userCred.GetProjectDomainId()) > 0 {
commonUsage, err := getDomainGeneralUsage(rbacutils.ScopeDomain, userCred, rangeObjs, hostTypes, providers, brands, cloudEnv)
if err == nil {
count.Include(commonUsage)
}
}
if scope.HigherEqual(rbacutils.ScopeProject) && len(userCred.GetProjectId()) > 0 {
// if scope.HigherEqual(rbacutils.ScopeProject) && len(userCred.GetProjectId()) > 0 {
if scope == rbacutils.ScopeProject && len(userCred.GetProjectId()) > 0 {
commonUsage, err := getProjectGeneralUsage(rbacutils.ScopeProject, userCred, rangeObjs, hostTypes, providers, brands, cloudEnv)
if err == nil {
count.Include(commonUsage)