From 396a99c4cbcd6d5d3d255dd9526e38d9c61d3e3e Mon Sep 17 00:00:00 2001 From: TangBin Date: Tue, 22 Sep 2020 19:58:49 +0800 Subject: [PATCH] regional network filter bugfix --- pkg/compute/models/wireresource.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/compute/models/wireresource.go b/pkg/compute/models/wireresource.go index d4b97dce44..5a112dd6f7 100644 --- a/pkg/compute/models/wireresource.go +++ b/pkg/compute/models/wireresource.go @@ -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{