From 3bf9b5b0d92f1c00fc2169cd6624c75d1f2f9a14 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Fri, 17 Jul 2020 20:38:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20globalvpc=E8=B7=9F=E9=9A=8F=E4=BA=91?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=85=B1=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/vpcs.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/compute/models/vpcs.go b/pkg/compute/models/vpcs.go index 3c96395067..a123f454d0 100644 --- a/pkg/compute/models/vpcs.go +++ b/pkg/compute/models/vpcs.go @@ -384,7 +384,7 @@ func (manager *SVpcManager) SyncVPCs(ctx context.Context, userCred mcclient.Toke localVPCs = append(localVPCs, commondb[i]) remoteVPCs = append(remoteVPCs, commonext[i]) syncResult.Update() - err = commondb[i].SyncGlobalVpc(ctx, userCred, provider.GetOwnerId()) + err = commondb[i].SyncGlobalVpc(ctx, userCred, provider.GetOwnerId(), provider) if err != nil { log.Errorf("%s(%s) sync global vpc error: %v", commondb[i].Name, commondb[i].Id, err) } @@ -399,7 +399,7 @@ func (manager *SVpcManager) SyncVPCs(ctx context.Context, userCred mcclient.Toke localVPCs = append(localVPCs, *newVpc) remoteVPCs = append(remoteVPCs, added[i]) syncResult.Add() - err = newVpc.SyncGlobalVpc(ctx, userCred, provider.GetOwnerId()) + err = newVpc.SyncGlobalVpc(ctx, userCred, provider.GetOwnerId(), provider) if err != nil { log.Errorf("%s(%s) sync global vpc error: %v", newVpc.Name, newVpc.Id, err) } @@ -429,10 +429,11 @@ func (self *SVpc) syncRemoveCloudVpc(ctx context.Context, userCred mcclient.Toke return err } -func (self *SVpc) SyncGlobalVpc(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider) error { +func (self *SVpc) SyncGlobalVpc(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, provider *SCloudprovider) error { if len(self.GlobalvpcId) > 0 { gv, _ := self.GetGlobalVpc() SyncCloudDomain(userCred, gv, ownerId) + gv.SyncShareState(ctx, userCred, provider.getAccountShareInfo()) return nil } region, err := self.GetRegion() @@ -476,6 +477,7 @@ func (self *SVpc) SyncGlobalVpc(ctx context.Context, userCred mcclient.TokenCred return errors.Wrap(err, "GlobalVpcManager.Insert") } SyncCloudDomain(userCred, gv, ownerId) + gv.SyncShareState(ctx, userCred, provider.getAccountShareInfo()) globalvpcId = gv.Id } _, err = db.Update(self, func() error {