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 #7267 from tb365/bugfix/tb-bugfix-20072001

Browse Source 
fix GetOrCreateVpcForClassicNetwork
This commit is contained in:
yunion-ci-robot
2020-07-20 20:49:27 +08:00
committed by GitHub
parent 52cdaa4e4c a755d0d37e
commit e7305936b4
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/elasticcache_instances.go
+1 -1
View File
@@ -588,7 +588,7 @@ func (manager *SElasticcacheManager) newFromCloudElasticcache(ctx context.Contex
instance.NetworkType = extInstance.GetNetworkType()
if instance.NetworkType == api.LB_NETWORK_TYPE_CLASSIC {
vpc, err := VpcManager.GetOrCreateVpcForClassicNetwork(ctx, region)
vpc, err := VpcManager.GetOrCreateVpcForClassicNetwork(ctx, provider, region)
if err != nil {
return nil, errors.Wrap(err, "NewVpcForClassicNetwork")
}
pkg/compute/models/guests.go
+2 -1
View File
@@ -2733,7 +2733,8 @@ func getCloudNicNetwork(ctx context.Context, vnic cloudprovider.ICloudNic, host
if vnet == nil {
if vnic.InClassicNetwork() {
region := host.GetRegion()
vpc, err := VpcManager.GetOrCreateVpcForClassicNetwork(ctx, region)
cloudprovider := region.GetCloudprovider()
vpc, err := VpcManager.GetOrCreateVpcForClassicNetwork(ctx, cloudprovider, region)
if err != nil {
return nil, errors.Wrap(err, "NewVpcForClassicNetwork")
}
pkg/compute/models/vpcs.go
+1 -2
View File
@@ -191,8 +191,7 @@ func (manager *SVpcManager) getVpcExternalIdForClassicNetwork(regionId, cloudpro
return fmt.Sprintf("%s-%s", regionId, cloudproviderId)
}
func (manager *SVpcManager) GetOrCreateVpcForClassicNetwork(ctx context.Context, region *SCloudregion) (*SVpc, error) {
cloudprovider := region.GetCloudprovider()
func (manager *SVpcManager) GetOrCreateVpcForClassicNetwork(ctx context.Context, cloudprovider *SCloudprovider, region *SCloudregion) (*SVpc, error) {
externalId := manager.getVpcExternalIdForClassicNetwork(region.Id, cloudprovider.Id)
_vpc, err := db.FetchByExternalIdAndManagerId(manager, externalId, func(q *sqlchemy.SQuery) *sqlchemy.SQuery {
return q.Equals("manager_id", region.ManagerId)