fix(region): send notify when vpc or network created (#20929)

This commit is contained in:
屈轩
2024-08-07 11:55:05 +08:00
committed by GitHub
parent e02ce67cf6
commit 65859262f1
3 changed files with 13 additions and 4 deletions
+2 -1
View File
@@ -195,7 +195,8 @@ func (model *SInfrasResourceBase) PerformChangeOwner(
}
func (model *SInfrasResourceBase) CustomizeCreate(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data jsonutils.JSONObject) error {
SharableModelCustomizeCreate(model.GetIInfrasModel(), ctx, userCred, ownerId, query, data)
// 避免domain_id为空导致异常
defer SharableModelCustomizeCreate(model.GetIInfrasModel(), ctx, userCred, ownerId, query, data)
return model.SDomainLevelResourceBase.CustomizeCreate(ctx, userCred, ownerId, query, data)
}
+7 -3
View File
@@ -2346,10 +2346,10 @@ func (net *SNetwork) PostCreate(ctx context.Context, userCred mcclient.TokenCred
if vpc != nil && vpc.IsManaged() {
task, err := taskman.TaskManager.NewTask(ctx, "NetworkCreateTask", net, userCred, data.(*jsonutils.JSONDict), "", "", nil)
if err != nil {
log.Errorf("networkcreateTask create fail: %s", err)
} else {
task.ScheduleRun(nil)
net.SetStatus(ctx, userCred, apis.STATUS_CREATE_FAILED, err.Error())
return
}
task.ScheduleRun(nil)
} else {
{
err := net.syncAdditionalWires(ctx, nil)
@@ -2361,6 +2361,10 @@ func (net *SNetwork) PostCreate(ctx context.Context, userCred mcclient.TokenCred
if err := net.ClearSchedDescCache(); err != nil {
log.Errorf("network post create clear schedcache error: %v", err)
}
notifyclient.EventNotify(ctx, userCred, notifyclient.SEventNotifyParam{
Obj: net,
Action: notifyclient.ActionCreate,
})
}
// reserve gateway IP
{
+4
View File
@@ -1025,6 +1025,10 @@ func (svpc *SVpc) PostCreate(ctx context.Context, userCred mcclient.TokenCredent
}()
if len(svpc.ManagerId) == 0 {
notifyclient.EventNotify(ctx, userCred, notifyclient.SEventNotifyParam{
Obj: svpc,
Action: notifyclient.ActionCreate,
})
return
}
task, err := taskman.TaskManager.NewTask(ctx, "VpcCreateTask", svpc, userCred, nil, "", "", nil)