opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-31 02:38:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): ipv6 cidr sync for network (#19702)

Browse Source
This commit is contained in:
屈轩
2024-03-11 17:52:24 +08:00
committed by GitHub
parent 20e7d080b9
commit 63c751111f
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/networks.go
+13 -8
View File
@@ -789,8 +789,8 @@ func (snet *SNetwork) SyncWithCloudNetwork(ctx context.Context, userCred mcclien
}
func (manager *SNetworkManager) newFromCloudNetwork(ctx context.Context, userCred mcclient.TokenCredential, extNet cloudprovider.ICloudNetwork, wire *SWire, syncOwnerId mcclient.IIdentityProvider, provider *SCloudprovider) (*SNetwork, error) {
net := SNetwork{}
net.SetModelManager(manager, &net)
net := &SNetwork{}
net.SetModelManager(manager, net)
net.Status = extNet.GetStatus()
net.ExternalId = extNet.GetGlobalId()
@@ -800,6 +800,11 @@ func (manager *SNetworkManager) newFromCloudNetwork(ctx context.Context, userCre
net.GuestIpMask = extNet.GetIpMask()
net.GuestGateway = extNet.GetGateway()
net.ServerType = extNet.GetServerType()
net.GuestIp6Start = extNet.GetIp6Start()
net.GuestIp6End = extNet.GetIp6End()
net.GuestIp6Mask = extNet.GetIp6Mask()
net.GuestGateway6 = extNet.GetGateway6()
// net.IsPublic = extNet.GetIsPublic()
// extScope := extNet.GetPublicScope()
// if extScope == rbacutils.ScopeDomain && !consts.GetNonDefaultDomainProjects() {
@@ -823,16 +828,16 @@ func (manager *SNetworkManager) newFromCloudNetwork(ctx context.Context, userCre
}
net.Name = newName
return manager.TableSpec().Insert(ctx, &net)
return manager.TableSpec().Insert(ctx, net)
}()
if err != nil {
return nil, errors.Wrapf(err, "Insert")
}
syncVirtualResourceMetadata(ctx, userCred, &net, extNet, false)
syncVirtualResourceMetadata(ctx, userCred, net, extNet, false)
if provider != nil {
SyncCloudProject(ctx, userCred, &net, syncOwnerId, extNet, provider)
SyncCloudProject(ctx, userCred, net, syncOwnerId, extNet, provider)
shareInfo := provider.getAccountShareInfo()
if utils.IsInStringArray(provider.Provider, api.PRIVATE_CLOUD_PROVIDERS) && extNet.GetPublicScope() == rbacscope.ScopeNone {
shareInfo = apis.SAccountShareInfo{
@@ -843,13 +848,13 @@ func (manager *SNetworkManager) newFromCloudNetwork(ctx context.Context, userCre
net.SyncShareState(ctx, userCred, shareInfo)
}
db.OpsLog.LogEvent(&net, db.ACT_CREATE, net.GetShortDesc(ctx), userCred)
db.OpsLog.LogEvent(net, db.ACT_CREATE, net.GetShortDesc(ctx), userCred)
notifyclient.EventNotify(ctx, userCred, notifyclient.SEventNotifyParam{
Obj: &net,
Obj: net,
Action: notifyclient.ActionSyncCreate,
})
return &net, nil
return net, nil
}
func (net *SNetwork) IsAddressInRange(address netutils.IPV4Addr) bool {