Merge pull request #428 from Zexi/bugfix/usage-guest-count

fix: region usage guest 统计数量包括 host disabled
This commit is contained in:
yunion-ci-robot
2019-04-17 02:05:11 +08:00
committed by GitHub
+1 -1
View File
@@ -2373,7 +2373,7 @@ func filterGuestByRange(q *sqlchemy.SQuery, rangeObj db.IStandaloneModel, hostTy
hosts := HostManager.Query().SubQuery()
q = q.Join(hosts, sqlchemy.Equals(hosts.Field("id"), q.Field("host_id")))
q = q.Filter(sqlchemy.IsTrue(hosts.Field("enabled")))
//q = q.Filter(sqlchemy.IsTrue(hosts.Field("enabled")))
// q = q.Filter(sqlchemy.Equals(hosts.Field("host_status"), HOST_ONLINE))
q = AttachUsageQuery(q, hosts, hostTypes, resourceTypes, providers, rangeObj)