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

Merge pull request #278 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-region-guest-count to release/2.1.0

Browse Source 
* commit '749c1daac19f4f3a894488f80c1b212e9f168d6c':
  修复查询defautl region时guests count异常
This commit is contained in:
邱剑
2018-10-09 21:59:37 +08:00
parent 1116fda18b 749c1daac1
commit e865fc725c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudregions.go
+4 -2
View File
@@ -72,11 +72,13 @@ func (self *SCloudregion) GetZoneCount() int {
}
func (self *SCloudregion) GetGuestCount(increment bool) int {
zoneTable := ZoneManager.Query("id").Equals("cloudregion_id", self.Id)
zoneTable := ZoneManager.Query("id")
if self.Id == "default" {
zoneTable = ZoneManager.Query("id").Filter(sqlchemy.OR(sqlchemy.IsNull(zoneTable.Field("cloudregion_id")),
zoneTable = zoneTable.Filter(sqlchemy.OR(sqlchemy.IsNull(zoneTable.Field("cloudregion_id")),
sqlchemy.IsEmpty(zoneTable.Field("cloudregion_id")),
sqlchemy.Equals(zoneTable.Field("cloudregion_id"), self.Id)))
} else {
zoneTable = zoneTable.Equals("cloudregion_id", self.Id)
}
sq := HostManager.Query("id").In("zone_id", zoneTable)
query := GuestManager.Query().In("host_id", sq)