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 #10010 from swordqiu/hotfix/qj-export-vpc-less-than-listed

Browse Source 
fix(region): exported number of vpcs less than listed
This commit is contained in:
Zexi Li
2021-01-25 21:06:12 +08:00
committed by GitHub
parent aef5ba5090 0868fc815f
commit 7ba1778e2f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/vpcs.go
+3 -3
View File
@@ -1454,7 +1454,7 @@ func (manager *SVpcManager) ListItemExportKeys(ctx context.Context,
if keys.Contains("wire_count") {
wires := WireManager.Query("vpc_id").SubQuery()
subq := wires.Query(sqlchemy.COUNT("wire_count"), wires.Field("vpc_id")).GroupBy(wires.Field("vpc_id")).SubQuery()
q = q.Join(subq, sqlchemy.Equals(q.Field("id"), subq.Field("vpc_id")))
q = q.LeftJoin(subq, sqlchemy.Equals(q.Field("id"), subq.Field("vpc_id")))
q = q.AppendField(subq.Field("wire_count"))
}
@@ -1462,10 +1462,10 @@ func (manager *SVpcManager) ListItemExportKeys(ctx context.Context,
wires := WireManager.Query("id", "vpc_id").SubQuery()
networks := NetworkManager.Query("wire_id").SubQuery()
subq := networks.Query(sqlchemy.COUNT("network_count"), wires.Field("vpc_id"))
subq = subq.Join(wires, sqlchemy.Equals(networks.Field("wire_id"), wires.Field("id")))
subq = subq.LeftJoin(wires, sqlchemy.Equals(networks.Field("wire_id"), wires.Field("id")))
subq = subq.GroupBy(wires.Field("vpc_id"))
subqQ := subq.SubQuery()
q = q.Join(subqQ, sqlchemy.Equals(q.Field("id"), subqQ.Field("vpc_id")))
q = q.LeftJoin(subqQ, sqlchemy.Equals(q.Field("id"), subqQ.Field("vpc_id")))
q = q.AppendField(subqQ.Field("network_count"))
}