From 6a22bf0e7bc04d017e0ed083461b4256475fbf68 Mon Sep 17 00:00:00 2001 From: TangBin Date: Wed, 2 Sep 2020 17:52:09 +0800 Subject: [PATCH] create classic vpc fix --- pkg/compute/models/guests.go | 2 +- pkg/compute/models/vpcs.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index a13e1a56fb..750587df3a 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -2778,7 +2778,7 @@ func getCloudNicNetwork(ctx context.Context, vnic cloudprovider.ICloudNic, host if vnet == nil { if vnic.InClassicNetwork() { region := host.GetRegion() - cloudprovider := region.GetCloudprovider() + cloudprovider := host.GetCloudprovider() vpc, err := VpcManager.GetOrCreateVpcForClassicNetwork(ctx, cloudprovider, region) if err != nil { return nil, errors.Wrap(err, "NewVpcForClassicNetwork") diff --git a/pkg/compute/models/vpcs.go b/pkg/compute/models/vpcs.go index dcb3ce7070..cdd6430924 100644 --- a/pkg/compute/models/vpcs.go +++ b/pkg/compute/models/vpcs.go @@ -194,7 +194,7 @@ func (manager *SVpcManager) getVpcExternalIdForClassicNetwork(regionId, cloudpro 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) + return q.Equals("manager_id", cloudprovider.Id) }) if err == nil { return _vpc.(*SVpc), nil @@ -211,7 +211,7 @@ func (manager *SVpcManager) GetOrCreateVpcForClassicNetwork(ctx context.Context, vpc.SetEnabled(false) vpc.Status = api.VPC_STATUS_UNAVAILABLE vpc.ExternalId = externalId - vpc.ManagerId = region.ManagerId + vpc.ManagerId = cloudprovider.Id err = manager.TableSpec().Insert(ctx, vpc) if err != nil { return nil, errors.Wrap(err, "Insert vpc for classic network")