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

Merge pull request #8004 from tb365/automated-cherry-pick-of-#8003-upstream-release-3.2

Browse Source 
Automated cherry pick of #8003: regional network filter bugfix
This commit is contained in:
Zexi Li
2020-09-23 21:09:14 +08:00
committed by GitHub
parent 1356ae3124 396a99c4cb
commit f14fbb4007
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/wireresource.go
+2 -2
View File
@@ -192,11 +192,11 @@ func (manager *SWireResourceBaseManager) ListItemFilter(
}
err = q.First(region)
if err != nil {
return nil, errors.Wrap(err, "q.First")
return nil, errors.Wrap(err, "regionQ.First")
}
if utils.IsInStringArray(region.Provider, api.REGIONAL_NETWORK_PROVIDERS) {
vpcQ := VpcManager.Query().SubQuery()
q = q.Join(vpcQ, sqlchemy.Equals(vpcQ.Field("id"), q.Field("vpc_id"))).
wireQ = wireQ.Join(vpcQ, sqlchemy.Equals(vpcQ.Field("id"), wireQ.Field("vpc_id"))).
Filter(sqlchemy.Equals(vpcQ.Field("cloudregion_id"), region.Id))
} else {
zoneQuery := api.ZonalFilterListInput{