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

vpc list add param vpc_usable

Browse Source
This commit is contained in:
TangBin
2020-02-28 11:34:49 +08:00
parent b2317f07d0
commit 48a28a6adb
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/vpcs_const.go
+1
View File
@@ -53,6 +53,7 @@ type VpcListInput struct {
ManagedResourceListInput
UsableResourceListInput
UsableVpcResourceListInput
// filter by globalvpc
Globalvpc string `json:"globalvpc"`
pkg/compute/models/vpcs.go
+12 -7
View File
@@ -794,7 +794,9 @@ func (manager *SVpcManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQue
return nil, err
}
if query.Usable != nil && *query.Usable {
usable := (query.Usable != nil && *query.Usable)
vpcUsable := (query.UsableVpc != nil && *query.UsableVpc)
if vpcUsable || usable {
regions := CloudregionManager.Query().SubQuery()
cloudproviders := CloudproviderManager.Query().SubQuery()
providerSQ := cloudproviders.Query(cloudproviders.Field("id")).Filter(
@@ -814,14 +816,17 @@ func (manager *SVpcManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQue
),
),
)
wires := WireManager.Query().SubQuery()
networks := NetworkManager.Query().SubQuery()
sq := wires.Query(wires.Field("vpc_id")).Join(networks, sqlchemy.Equals(wires.Field("id"), networks.Field("wire_id"))).Filter(
sqlchemy.Equals(networks.Field("status"), api.NETWORK_STATUS_AVAILABLE),
)
if usable {
wires := WireManager.Query().SubQuery()
networks := NetworkManager.Query().SubQuery()
q = q.In("id", sq.SubQuery())
sq := wires.Query(wires.Field("vpc_id")).Join(networks, sqlchemy.Equals(wires.Field("id"), networks.Field("wire_id"))).Filter(
sqlchemy.Equals(networks.Field("status"), api.NETWORK_STATUS_AVAILABLE),
)
q = q.In("id", sq.SubQuery())
}
}
globalVpcStr := query.Globalvpc