From d7e16e33422d83012d7de73895886061352f7a37 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Thu, 9 Jul 2020 20:52:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dvpc=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/cloudregions.go | 10 ++++++++++ pkg/compute/models/vpcs.go | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkg/compute/models/cloudregions.go b/pkg/compute/models/cloudregions.go index 515c03fec7..f6c11e3b65 100644 --- a/pkg/compute/models/cloudregions.go +++ b/pkg/compute/models/cloudregions.go @@ -250,6 +250,16 @@ func (self *SCloudregion) GetVpcs() ([]SVpc, error) { return vpcs, nil } +func (self *SCloudregion) GetCloudproviderVpcs(managerId string) ([]SVpc, error) { + vpcs := []SVpc{} + q := self.GetVpcQuery().Equals("manager_id", managerId) + err := db.FetchModelObjects(VpcManager, q, &vpcs) + if err != nil { + return nil, errors.Wrap(err, "db.FetchModelObjects") + } + return vpcs, nil +} + func (self *SCloudregion) GetDriver() IRegionDriver { provider := self.Provider if len(provider) == 0 { diff --git a/pkg/compute/models/vpcs.go b/pkg/compute/models/vpcs.go index 250afdc5b9..04dd11a9d3 100644 --- a/pkg/compute/models/vpcs.go +++ b/pkg/compute/models/vpcs.go @@ -343,7 +343,7 @@ func (manager *SVpcManager) SyncVPCs(ctx context.Context, userCred mcclient.Toke remoteVPCs := make([]cloudprovider.ICloudVpc, 0) syncResult := compare.SyncResult{} - dbVPCs, err := region.GetVpcs() + dbVPCs, err := region.GetCloudproviderVpcs(provider.Id) if err != nil { syncResult.Error(err) return nil, nil, syncResult