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

Automatic merge from release/2.2.0 -> release/2.3.0

Browse Source 
* commit '38a8bfa55899247a87b0ac7b55c89ac28877e014':
  安全组不统计容器、物理机、Vmware数量
This commit is contained in:
邱剑
2018-12-24 15:57:27 +08:00
parent 5226973908 38a8bfa558
commit 8c08a27eb6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/secgroups.go
+1 -1
View File
@@ -53,7 +53,7 @@ type SSecurityGroup struct {
func (self *SSecurityGroup) GetGuestsQuery() *sqlchemy.SQuery {
guests := GuestManager.Query().SubQuery()
return guests.Query().Filter(sqlchemy.OR(sqlchemy.Equals(guests.Field("secgrp_id"), self.Id),
sqlchemy.Equals(guests.Field("admin_secgrp_id"), self.Id)))
sqlchemy.Equals(guests.Field("admin_secgrp_id"), self.Id))).Filter(sqlchemy.NotIn(guests.Field("hypervisor"), []string{HYPERVISOR_CONTAINER, HYPERVISOR_BAREMETAL, HYPERVISOR_ESXI}))
}
func (self *SSecurityGroup) GetGuestsCount() int {