fix: 修复vpc同步异常问题

This commit is contained in:
Qu Xuan
2020-07-09 20:52:36 +08:00
parent 424a756318
commit d7e16e3342
2 changed files with 11 additions and 1 deletions
+10
View File
@@ -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 {
+1 -1
View File
@@ -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