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

region: capability public network count filter by host type

Browse Source
This commit is contained in:
Zexi Li
2019-10-17 12:10:38 +08:00
parent e61191f0eb
commit 165454224a
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/capabilities.go
+9 -5
View File
@@ -100,7 +100,8 @@ func GetCapabilities(ctx context.Context, userCred mcclient.TokenCredential, que
if len(domainId) > 0 {
query.(*jsonutils.JSONDict).Add(jsonutils.NewString(domainId), "domain_id")
}
publicNetworkCount, _ := getNetworkPublicCount(region, zone, domainId)
serverType := jsonutils.GetAnyString(query, []string{"host_type", "server_type"})
publicNetworkCount, _ := getNetworkPublicCount(region, zone, domainId, serverType)
capa.PublicNetworkCount = publicNetworkCount
mans := []ISpecModelManager{HostManager, IsolatedDeviceManager}
capa.Specs, err = GetModelsSpecs(ctx, userCred, query.(*jsonutils.JSONDict), mans...)
@@ -342,14 +343,14 @@ func getGPUs(region *SCloudregion, zone *SZone, domainId string) []string {
}
func getNetworkCount(region *SCloudregion, zone *SZone, domainId string) (int, error) {
return getNetworkCountByFilter(region, zone, domainId, tristate.None)
return getNetworkCountByFilter(region, zone, domainId, tristate.None, "")
}
func getNetworkPublicCount(region *SCloudregion, zone *SZone, domainId string) (int, error) {
return getNetworkCountByFilter(region, zone, domainId, tristate.True)
func getNetworkPublicCount(region *SCloudregion, zone *SZone, domainId, serverType string) (int, error) {
return getNetworkCountByFilter(region, zone, domainId, tristate.True, serverType)
}
func getNetworkCountByFilter(region *SCloudregion, zone *SZone, domainId string, isPublic tristate.TriState) (int, error) {
func getNetworkCountByFilter(region *SCloudregion, zone *SZone, domainId string, isPublic tristate.TriState, serverType string) (int, error) {
if zone != nil && region == nil {
region = zone.GetRegion()
}
@@ -399,6 +400,9 @@ func getNetworkCountByFilter(region *SCloudregion, zone *SZone, domainId string,
sqlchemy.Equals(q.Field("domain_id"), domainId))))
}
}
if len(serverType) > 0 {
q = q.Filter(sqlchemy.Equals(networks.Field("server_type"), serverType))
}
q = q.Filter(sqlchemy.Equals(networks.Field("status"), api.NETWORK_STATUS_AVAILABLE))
return q.CountWithError()