diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index 2a69bb414b..b8a767e197 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -3209,15 +3209,11 @@ func (manager *SGuestManager) newCloudVM(ctx context.Context, userCred mcclient. lockman.LockRawObject(ctx, manager.Keyword(), "name") defer lockman.ReleaseRawObject(ctx, manager.Keyword(), "name") - if options.Options.EnableSyncName { - guest.Name = extVM.GetName() - } else { - newName, err := db.GenerateName(ctx, manager, syncOwnerId, extVM.GetName()) - if err != nil { - return errors.Wrapf(err, "db.GenerateName") - } - guest.Name = newName + newName, err := db.GenerateName(ctx, manager, syncOwnerId, extVM.GetName()) + if err != nil { + return errors.Wrapf(err, "db.GenerateName") } + guest.Name = newName return manager.TableSpec().Insert(ctx, &guest) }() diff --git a/pkg/notify/models/topic.go b/pkg/notify/models/topic.go index 998b952699..604e5d70b7 100644 --- a/pkg/notify/models/topic.go +++ b/pkg/notify/models/topic.go @@ -138,6 +138,8 @@ func (sm *STopicManager) InitializeData() error { DefaultServerPanicked, DefaultPasswordExpire, DefaultResourceRelease, + DefaultAttachOrDetach, + DefaultIsolatedDeviceChanged, ) q := sm.Query() topics := make([]STopic, 0, initSNames.Len())