opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix GetOrCreateVpcForClassicNetwork

Browse Source
This commit is contained in:
tangbin
2020-07-20 18:52:08 +08:00
parent 2910eeb89b
commit ea14aaa52e
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
@@ -584,7 +584,7 @@ func (manager *SElasticcacheManager) newFromCloudElasticcache(ctx context.Contex
instance.NetworkType = extInstance.GetNetworkType()
if instance.NetworkType == api.LB_NETWORK_TYPE_CLASSIC {
vpc, err := VpcManager.GetOrCreateVpcForClassicNetwork(region)
vpc, err := VpcManager.GetOrCreateVpcForClassicNetwork(provider, region)
if err != nil {
return nil, errors.Wrap(err, "NewVpcForClassicNetwork")
}
pkg/compute/models/guests.go
+2 -1
View File
@@ -2703,7 +2703,8 @@ func getCloudNicNetwork(vnic cloudprovider.ICloudNic, host *SHost, ipList []stri
if vnet == nil {
if vnic.InClassicNetwork() {
region := host.GetRegion()
vpc, err := VpcManager.GetOrCreateVpcForClassicNetwork(region)
cloudprovider := region.GetCloudprovider()
vpc, err := VpcManager.GetOrCreateVpcForClassicNetwork(cloudprovider, region)
if err != nil {
return nil, errors.Wrap(err, "NewVpcForClassicNetwork")
}
pkg/compute/models/vpcs.go
+1 -2
View File
@@ -179,8 +179,7 @@ func (manager *SVpcManager) getVpcExternalIdForClassicNetwork(regionId, cloudpro
return fmt.Sprintf("%s-%s", regionId, cloudproviderId)
}
func (manager *SVpcManager) GetOrCreateVpcForClassicNetwork(region *SCloudregion) (*SVpc, error) {
cloudprovider := region.GetCloudprovider()
func (manager *SVpcManager) GetOrCreateVpcForClassicNetwork(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)