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

添加region对guest统计数据

Browse Source
This commit is contained in:
屈轩
2018-09-29 11:50:13 +08:00
parent 510b80dfeb
commit eb95ee7156
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudregions.go
+20
View File
@@ -3,6 +3,7 @@ package models
import (
"context"
"database/sql"
"time"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
@@ -70,6 +71,23 @@ func (self *SCloudregion) GetZoneCount() int {
}
}
func (self *SCloudregion) GetGuestCount(increment bool) int {
zoneTable := ZoneManager.Query("id").Equals("cloudregion_id", self.Id)
if self.Id == "default" {
zoneTable = ZoneManager.Query("id").Filter(sqlchemy.OR(sqlchemy.IsNull(zoneTable.Field("cloudregion_id")),
sqlchemy.IsEmpty(zoneTable.Field("cloudregion_id")),
sqlchemy.Equals(zoneTable.Field("cloudregion_id"), self.Id)))
}
sq := HostManager.Query("id").In("zone_id", zoneTable)
query := GuestManager.Query().In("host_id", sq)
if increment {
year, month, _ := time.Now().UTC().Date()
startOfMonth := time.Date(year, month, 1, 0, 0, 0, 0, time.UTC)
query.GE("created_at", startOfMonth)
}
return query.Count()
}
func (self *SCloudregion) GetVpcCount() int {
vpcs := VpcManager.Query()
if self.Id == "default" {
@@ -84,6 +102,8 @@ func (self *SCloudregion) GetVpcCount() int {
func (self *SCloudregion) getMoreDetails(extra *jsonutils.JSONDict) *jsonutils.JSONDict {
extra.Add(jsonutils.NewInt(int64(self.GetVpcCount())), "vpc_count")
extra.Add(jsonutils.NewInt(int64(self.GetZoneCount())), "zone_count")
extra.Add(jsonutils.NewInt(int64(self.GetGuestCount(false))), "guest_count")
extra.Add(jsonutils.NewInt(int64(self.GetGuestCount(true))), "guest_increment_count")
return extra
}
pkg/mcclient/modules/mod_cloudregions.go
+2 -1
View File
@@ -6,7 +6,8 @@ var (
func init() {
Cloudregions = NewComputeManager("cloudregion", "cloudregions",
[]string{"ID", "Name", "Enabled", "Status", "Provider", "Latitude", "Longitude"},
[]string{"ID", "Name", "Enabled", "Status", "Provider", "Latitude", "Longitude",
"vpc_count", "zone_count", "guest_count", "guest_increment_count"},
[]string{})
registerCompute(&Cloudregions)