opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.4.0 -> release/2.5.0

Browse Source 
* commit '1570cfec28fb6967821a9b69fd7a4bc948d386e0':
  region: host list 去掉 container 计数
This commit is contained in:
邱剑
2019-01-14 15:13:08 +08:00
parent 9bb39f1a4a 1570cfec28
commit 55f5beb1cf
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/hosts.go
+10 -3
View File
@@ -1081,6 +1081,12 @@ func (self *SHost) GetGuestCount() int {
return q.Count()
}
func (self *SHost) GetContainerCount() int {
q := self.GetGuestsQuery()
q = q.Filter(sqlchemy.Equals(q.Field("hypervisor"), HYPERVISOR_CONTAINER))
return q.Count()
}
func (self *SHost) GetNonsystemGuestCount() int {
q := self.GetGuestsQuery()
q = q.Filter(sqlchemy.OR(sqlchemy.IsNull(q.Field("is_system")), sqlchemy.IsFalse(q.Field("is_system"))))
@@ -2096,9 +2102,10 @@ func (self *SHost) getMoreDetails(ctx context.Context, extra *jsonutils.JSONDict
extra.Add(jsonutils.NewInt(int64(usage.GuestVcpuCount)), "cpu_commit")
extra.Add(jsonutils.NewInt(int64(usage.GuestVmemSize)), "mem_commit")
}
extra.Add(jsonutils.NewInt(int64(self.GetGuestCount())), "guests")
extra.Add(jsonutils.NewInt(int64(self.GetNonsystemGuestCount())), "nonsystem_guests")
extra.Add(jsonutils.NewInt(int64(self.GetRunningGuestCount())), "running_guests")
containerCount := self.GetContainerCount()
extra.Add(jsonutils.NewInt(int64(self.GetGuestCount()-containerCount)), "guests")
extra.Add(jsonutils.NewInt(int64(self.GetNonsystemGuestCount()-containerCount)), "nonsystem_guests")
extra.Add(jsonutils.NewInt(int64(self.GetRunningGuestCount()-containerCount)), "running_guests")
totalCpu := self.GetCpuCount()
cpuCommitRate := 0.0
if totalCpu > 0 && usage.GuestVcpuCount > 0 {