From 8d7bc247c97a868593aefb38f95e520549ac8315 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Mon, 27 Apr 2020 15:50:14 +0800 Subject: [PATCH] fix: cloudaccount usage region/zone count not accurate --- pkg/compute/usages/handler.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/compute/usages/handler.go b/pkg/compute/usages/handler.go index 36e776c51f..6c29ceda7d 100644 --- a/pkg/compute/usages/handler.go +++ b/pkg/compute/usages/handler.go @@ -465,7 +465,7 @@ func ReportGeneralUsage( func RegionUsage(rangeObjs []db.IStandaloneModel, providers []string, brands []string, cloudEnv string) Usage { q := models.CloudregionManager.Query() - if len(providers) > 0 || len(brands) > 0 || len(cloudEnv) > 0 { + if len(rangeObjs) > 0 || len(providers) > 0 || len(brands) > 0 || len(cloudEnv) > 0 { subq := models.VpcManager.Query("cloudregion_id") subq = models.CloudProviderFilter(subq, subq.Field("manager_id"), providers, brands, cloudEnv) subq = models.RangeObjectsFilter(subq, rangeObjs, nil, nil, subq.Field("manager_id")) @@ -480,7 +480,7 @@ func RegionUsage(rangeObjs []db.IStandaloneModel, providers []string, brands []s func ZoneUsage(rangeObjs []db.IStandaloneModel, providers []string, brands []string, cloudEnv string) Usage { q := models.ZoneManager.Query() - if len(providers) > 0 || len(brands) > 0 || len(cloudEnv) > 0 { + if len(rangeObjs) > 0 || len(providers) > 0 || len(brands) > 0 || len(cloudEnv) > 0 { subq := models.HostManager.Query("zone_id") subq = models.CloudProviderFilter(subq, subq.Field("manager_id"), providers, brands, cloudEnv) subq = models.RangeObjectsFilter(subq, rangeObjs, nil, nil, subq.Field("manager_id"))