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

Merge pull request #2457 from zexi/hotfix/capability-domain-public-network

Browse Source 
region: capability domain public network must equal domain_id
This commit is contained in:
yunion-ci-robot
2019-08-21 20:29:06 +08:00
committed by GitHub
parent ef2f578b41 225c6a02e0
commit d65d4ecf9b
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/capabilities.go
+7
View File
@@ -391,6 +391,13 @@ func getNetworkCountByFilter(region *SCloudregion, zone *SZone, domainId string,
sqlchemy.In(vpcs.Field("manager_id"), subq),
sqlchemy.IsNullOrEmpty(vpcs.Field("manager_id")),
))
if isPublic.Bool() {
q = q.Filter(sqlchemy.OR(
sqlchemy.Equals(q.Field("public_scope"), rbacutils.ScopeSystem),
sqlchemy.AND(
sqlchemy.Equals(q.Field("public_scope"), rbacutils.ScopeDomain),
sqlchemy.Equals(q.Field("domain_id"), domainId))))
}
}
q = q.Filter(sqlchemy.Equals(networks.Field("status"), api.NETWORK_STATUS_AVAILABLE))