X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2FrNibWriter%2FrNibWriter.go;h=d107f55fbc56a920a690788f8151b0952c114196;hb=04ff63f1708020673dd9be975476e0f76f179a81;hp=c73cc373ba6780d7c328c2a07c85eb1e091730cb;hpb=7e2e493acba882641329f867cccb73b3d2a2d2d8;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/rNibWriter/rNibWriter.go b/E2Manager/rNibWriter/rNibWriter.go index c73cc37..d107f55 100644 --- a/E2Manager/rNibWriter/rNibWriter.go +++ b/E2Manager/rNibWriter/rNibWriter.go @@ -36,16 +36,18 @@ const ( ) type rNibWriterInstance struct { - sdl common.ISdlInstance + sdl common.ISdlSyncStorage rnibWriterConfig configuration.RnibWriterConfig + ns string } /* RNibWriter interface allows saving data to the redis DB */ type RNibWriter interface { - SaveNodeb(nbIdentity *entities.NbIdentity, nb *entities.NodebInfo) error + SaveNodeb(nodebInfo *entities.NodebInfo) error UpdateNodebInfo(nodebInfo *entities.NodebInfo) error + UpdateNodebInfoAndPublish(nodebInfo *entities.NodebInfo) error SaveRanLoadInformation(inventoryName string, ranLoadInformation *entities.RanLoadInformation) error SaveE2TInstance(e2tInstance *entities.E2TInstance) error SaveE2TAddresses(addresses []string) error @@ -55,19 +57,61 @@ type RNibWriter interface { UpdateNodebInfoOnConnectionStatusInversion(nodebInfo *entities.NodebInfo, ent string) error SaveGeneralConfiguration(config *entities.GeneralConfiguration) error RemoveEnb(nodebInfo *entities.NodebInfo) error + RemoveServedCells(inventoryName string, servedCells []*entities.ServedCellInfo) error + UpdateEnb(nodebInfo *entities.NodebInfo, servedCells []*entities.ServedCellInfo) error + AddNbIdentity(nodeType entities.Node_Type, nbIdentity *entities.NbIdentity) error + RemoveNbIdentity(nodeType entities.Node_Type, nbIdentity *entities.NbIdentity) error + AddEnb(nodebInfo *entities.NodebInfo) error + UpdateNbIdentities(nodeType entities.Node_Type, oldNbIdentities []*entities.NbIdentity, newNbIdentities []*entities.NbIdentity) error } /* GetRNibWriter returns reference to RNibWriter */ -func GetRNibWriter(sdl common.ISdlInstance, rnibWriterConfig configuration.RnibWriterConfig) RNibWriter { - return &rNibWriterInstance{sdl: sdl, rnibWriterConfig: rnibWriterConfig} +func GetRNibWriter(sdl common.ISdlSyncStorage, rnibWriterConfig configuration.RnibWriterConfig) RNibWriter { + return &rNibWriterInstance{ + sdl: sdl, + rnibWriterConfig: rnibWriterConfig, + ns: common.GetRNibNamespace(), + } +} + +func getChannelsAndEventsPair(channel string, ranName string, event string) []string { + return []string{channel, fmt.Sprintf("%s_%s", ranName, event)} +} + +func (w *rNibWriterInstance) AddNbIdentity(nodeType entities.Node_Type, nbIdentity *entities.NbIdentity) error { + nbIdData, err := proto.Marshal(nbIdentity) + + if err != nil { + return common.NewInternalError(err) + } + + err = w.sdl.AddMember(w.ns, nodeType.String(), nbIdData) + + if err != nil { + return common.NewInternalError(err) + } + return nil } func (w *rNibWriterInstance) RemoveServedNrCells(inventoryName string, servedNrCells []*entities.ServedNRCell) error { cellKeysToRemove := buildServedNRCellKeysToRemove(inventoryName, servedNrCells) - err := w.sdl.Remove(cellKeysToRemove) + + err := w.sdl.Remove(w.ns, cellKeysToRemove) + + if err != nil { + return common.NewInternalError(err) + } + + return nil +} + +func (w *rNibWriterInstance) RemoveServedCells(inventoryName string, servedCells []*entities.ServedCellInfo) error { + cellKeysToRemove := buildServedCellInfoKeysToRemove(inventoryName, servedCells) + + err := w.sdl.Remove(w.ns, cellKeysToRemove) if err != nil { return common.NewInternalError(err) @@ -90,23 +134,16 @@ func (w *rNibWriterInstance) SaveGeneralConfiguration(config *entities.GeneralCo /* SaveNodeb saves nodeB entity data in the redis DB according to the specified data model */ -func (w *rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity *entities.NodebInfo) error { - isNotEmptyIdentity := isNotEmpty(nbIdentity) - - nodeType := entity.GetNodeType() +func (w *rNibWriterInstance) SaveNodeb(nodebInfo *entities.NodebInfo) error { - if isNotEmptyIdentity && nodeType == entities.Node_UNKNOWN { - return common.NewValidationError(fmt.Sprintf("#rNibWriter.saveNodeB - Unknown responding node type, entity: %v", entity)) - } - - data, err := proto.Marshal(entity) + data, err := proto.Marshal(nodebInfo) if err != nil { return common.NewInternalError(err) } var pairs []interface{} - key, rNibErr := common.ValidateAndBuildNodeBNameKey(nbIdentity.InventoryName) + key, rNibErr := common.ValidateAndBuildNodeBNameKey(nodebInfo.RanName) if rNibErr != nil { return rNibErr @@ -114,61 +151,100 @@ func (w *rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity * pairs = append(pairs, key, data) - if isNotEmptyIdentity { + if nodebInfo.GlobalNbId != nil { - key, rNibErr = common.ValidateAndBuildNodeBIdKey(nodeType.String(), nbIdentity.GlobalNbId.GetPlmnId(), nbIdentity.GlobalNbId.GetNbId()) + key, rNibErr = common.ValidateAndBuildNodeBIdKey(nodebInfo.GetNodeType().String(), nodebInfo.GlobalNbId.GetPlmnId(), nodebInfo.GlobalNbId.GetNbId()) if rNibErr != nil { return rNibErr } pairs = append(pairs, key, data) } - if entity.GetEnb() != nil { - pairs, rNibErr = appendEnbCells(nbIdentity.InventoryName, entity.GetEnb().GetServedCells(), pairs) + if nodebInfo.GetEnb() != nil { + pairs, rNibErr = appendEnbCells(nodebInfo.RanName, nodebInfo.GetEnb().GetServedCells(), pairs) if rNibErr != nil { return rNibErr } } - if entity.GetGnb() != nil { - pairs, rNibErr = appendGnbCells(nbIdentity.InventoryName, entity.GetGnb().GetServedNrCells(), pairs) + if nodebInfo.GetGnb() != nil { + pairs, rNibErr = appendGnbCells(nodebInfo.RanName, nodebInfo.GetGnb().GetServedNrCells(), pairs) if rNibErr != nil { return rNibErr } } - if nodeType == entities.Node_ENB { - err = w.sdl.SetAndPublish([]string{w.rnibWriterConfig.RanManipulationMessageChannel, fmt.Sprintf("%s_%s", entity.RanName, RanAddedEvent)}, pairs) - } else { - err = w.sdl.Set(pairs) + err = w.sdl.Set(w.ns, pairs) + + if err != nil { + return common.NewInternalError(err) } + return nil +} + +func (w *rNibWriterInstance) AddEnb(nodebInfo *entities.NodebInfo) error { + + data, err := proto.Marshal(nodebInfo) + if err != nil { return common.NewInternalError(err) } - ranNameIdentity := &entities.NbIdentity{InventoryName: nbIdentity.InventoryName} + var pairs []interface{} + key, rNibErr := common.ValidateAndBuildNodeBNameKey(nodebInfo.RanName) - if isNotEmptyIdentity { - err := w.removeNbIdentity(entities.Node_UNKNOWN, ranNameIdentity) - if err != nil { - return common.NewInternalError(err) + if rNibErr != nil { + return rNibErr + } + + pairs = append(pairs, key, data) + + if nodebInfo.GlobalNbId != nil { + + key, rNibErr = common.ValidateAndBuildNodeBIdKey(nodebInfo.GetNodeType().String(), nodebInfo.GlobalNbId.GetPlmnId(), nodebInfo.GlobalNbId.GetNbId()) + if rNibErr != nil { + return rNibErr } - } else { - nbIdentity = ranNameIdentity + pairs = append(pairs, key, data) } - nbIdData, err := proto.Marshal(nbIdentity) + pairs, rNibErr = appendEnbCells(nodebInfo.RanName, nodebInfo.GetEnb().GetServedCells(), pairs) + if rNibErr != nil { + return rNibErr + } + channelsAndEvents := getChannelsAndEventsPair(w.rnibWriterConfig.RanManipulationMessageChannel, nodebInfo.RanName, RanAddedEvent) + err = w.sdl.SetAndPublish(w.ns, channelsAndEvents, pairs) if err != nil { return common.NewInternalError(err) } - err = w.sdl.AddMember(nodeType.String(), nbIdData) + return nil +} + +func (w *rNibWriterInstance) UpdateNbIdentities(nodeType entities.Node_Type, oldNbIdentities []*entities.NbIdentity, newNbIdentities []*entities.NbIdentity) error { + nbIdIdentitiesToRemove, err := w.buildNbIdentitiesMembers(oldNbIdentities) if err != nil { - return common.NewInternalError(err) + return err + } + + err = w.sdl.RemoveMember(w.ns, nodeType.String(), nbIdIdentitiesToRemove[:]...) + if err != nil { + return err } + + nbIdIdentitiesToAdd, err := w.buildNbIdentitiesMembers(newNbIdentities) + if err != nil { + return err + } + + err = w.sdl.AddMember(w.ns, nodeType.String(), nbIdIdentitiesToAdd[:]...) + if err != nil { + return err + } + return nil } @@ -186,7 +262,8 @@ func (w *rNibWriterInstance) UpdateGnbCells(nodebInfo *entities.NodebInfo, serve return err } - err = w.sdl.Set(pairs) + channelsAndEvents := getChannelsAndEventsPair(w.rnibWriterConfig.RanManipulationMessageChannel, nodebInfo.RanName, RanUpdatedEvent) + err = w.sdl.SetAndPublish(w.ns, channelsAndEvents, pairs) if err != nil { return common.NewInternalError(err) @@ -197,7 +274,7 @@ func (w *rNibWriterInstance) UpdateGnbCells(nodebInfo *entities.NodebInfo, serve func buildServedNRCellKeysToRemove(inventoryName string, servedNrCellsToRemove []*entities.ServedNRCell) []string { - cellKeysToRemove := []string{} + var cellKeysToRemove []string for _, cell := range servedNrCellsToRemove { @@ -219,7 +296,7 @@ func buildServedNRCellKeysToRemove(inventoryName string, servedNrCellsToRemove [ func buildServedCellInfoKeysToRemove(inventoryName string, servedCellsToRemove []*entities.ServedCellInfo) []string { - cellKeysToRemove := []string{} + var cellKeysToRemove []string for _, cell := range servedCellsToRemove { @@ -283,22 +360,19 @@ func (w *rNibWriterInstance) buildRemoveEnbKeys(nodebInfo *entities.NodebInfo) ( return keys, nil } -func (w *rNibWriterInstance) removeNbIdentity(nodeType entities.Node_Type ,nbIdentity *entities.NbIdentity) error { +func (w *rNibWriterInstance) RemoveNbIdentity(nodeType entities.Node_Type, nbIdentity *entities.NbIdentity) error { nbIdData, err := proto.Marshal(nbIdentity) if err != nil { return common.NewInternalError(err) } - err = w.sdl.RemoveMember(nodeType.String(), nbIdData) + err = w.sdl.RemoveMember(w.ns, nodeType.String(), nbIdData) if err != nil { return common.NewInternalError(err) } return nil } -/* -UpdateNodebInfo... -*/ -func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) error { +func (w *rNibWriterInstance) updateNodebInfo(nodebInfo *entities.NodebInfo, publish bool) error { pairs, err := buildUpdateNodebInfoPairs(nodebInfo) @@ -306,7 +380,12 @@ func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) erro return err } - err = w.sdl.Set(pairs) + if publish { + channelsAndEvents := getChannelsAndEventsPair(w.rnibWriterConfig.RanManipulationMessageChannel, nodebInfo.RanName, RanUpdatedEvent) + err = w.sdl.SetAndPublish(w.ns, channelsAndEvents, pairs) + } else { + err = w.sdl.Set(w.ns, pairs) + } if err != nil { return common.NewInternalError(err) @@ -315,6 +394,20 @@ func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) erro return nil } +/* +UpdateNodebInfo... +*/ +func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) error { + return w.updateNodebInfo(nodebInfo, false) +} + +/* +UpdateNodebInfoAndPublish... +*/ +func (w *rNibWriterInstance) UpdateNodebInfoAndPublish(nodebInfo *entities.NodebInfo) error { + return w.updateNodebInfo(nodebInfo, true) +} + /* SaveRanLoadInformation stores ran load information for the provided ran */ @@ -335,7 +428,7 @@ func (w *rNibWriterInstance) SaveRanLoadInformation(inventoryName string, ranLoa var pairs []interface{} pairs = append(pairs, key, data) - err = w.sdl.Set(pairs) + err = w.sdl.Set(w.ns, pairs) if err != nil { return common.NewInternalError(err) @@ -361,7 +454,7 @@ func (w *rNibWriterInstance) SaveE2TInstance(e2tInstance *entities.E2TInstance) var pairs []interface{} pairs = append(pairs, key, data) - err = w.sdl.Set(pairs) + err = w.sdl.Set(w.ns, pairs) if err != nil { return common.NewInternalError(err) @@ -381,7 +474,7 @@ func (w *rNibWriterInstance) SaveE2TAddresses(addresses []string) error { var pairs []interface{} pairs = append(pairs, E2TAddressesKey, data) - err = w.sdl.Set(pairs) + err = w.sdl.Set(w.ns, pairs) if err != nil { return common.NewInternalError(err) @@ -395,7 +488,7 @@ func (w *rNibWriterInstance) RemoveE2TInstance(address string) error { if rNibErr != nil { return rNibErr } - err := w.sdl.Remove([]string{key}) + err := w.sdl.Remove(w.ns, []string{key}) if err != nil { return common.NewInternalError(err) @@ -414,7 +507,7 @@ func (w *rNibWriterInstance) SaveWithKeyAndMarshal(key string, entity interface{ var pairs []interface{} pairs = append(pairs, key, data) - err = w.sdl.Set(pairs) + err = w.sdl.Set(w.ns, pairs) if err != nil { return common.NewInternalError(err) @@ -434,7 +527,7 @@ func (w *rNibWriterInstance) UpdateNodebInfoOnConnectionStatusInversion(nodebInf return err } - err = w.sdl.SetAndPublish([]string{w.rnibWriterConfig.StateChangeMessageChannel, event}, pairs) + err = w.sdl.SetAndPublish(w.ns, []string{w.rnibWriterConfig.StateChangeMessageChannel, event}, pairs) if err != nil { return common.NewInternalError(err) @@ -444,18 +537,37 @@ func (w *rNibWriterInstance) UpdateNodebInfoOnConnectionStatusInversion(nodebInf } func (w *rNibWriterInstance) RemoveEnb(nodebInfo *entities.NodebInfo) error { - ranNameIdentity := &entities.NbIdentity{InventoryName: nodebInfo.RanName, GlobalNbId: nodebInfo.GetGlobalNbId()} - err := w.removeNbIdentity(entities.Node_ENB, ranNameIdentity) + keysToRemove, err := w.buildRemoveEnbKeys(nodebInfo) if err != nil { return err } - keysToRemove, err := w.buildRemoveEnbKeys(nodebInfo) + channelsAndEvents := getChannelsAndEventsPair(w.rnibWriterConfig.RanManipulationMessageChannel, nodebInfo.RanName, RanDeletedEvent) + err = w.sdl.RemoveAndPublish(w.ns, channelsAndEvents, keysToRemove) + + if err != nil { + return common.NewInternalError(err) + } + + return nil +} + +func (w *rNibWriterInstance) UpdateEnb(nodebInfo *entities.NodebInfo, servedCells []*entities.ServedCellInfo) error { + + pairs, err := buildUpdateNodebInfoPairs(nodebInfo) + if err != nil { return err } - err = w.sdl.RemoveAndPublish([]string{w.rnibWriterConfig.RanManipulationMessageChannel, fmt.Sprintf("%s_%s", nodebInfo.RanName, RanDeletedEvent)}, keysToRemove) + pairs, err = appendEnbCells(nodebInfo.RanName, servedCells, pairs) + + if err != nil { + return err + } + + channelsAndEvents := getChannelsAndEventsPair(w.rnibWriterConfig.RanManipulationMessageChannel, nodebInfo.RanName, RanUpdatedEvent) + err = w.sdl.SetAndPublish(w.ns, channelsAndEvents, pairs) if err != nil { return common.NewInternalError(err) @@ -464,6 +576,21 @@ func (w *rNibWriterInstance) RemoveEnb(nodebInfo *entities.NodebInfo) error { return nil } +func (w *rNibWriterInstance) buildNbIdentitiesMembers(nbIdentities []*entities.NbIdentity) ([]interface{}, error) { + + var nbIdIdentitiesMembers []interface{} + for _, nbIdentity := range nbIdentities { + + nbIdData, err := proto.Marshal(nbIdentity) + if err != nil { + return nil, common.NewInternalError(err) + } + nbIdIdentitiesMembers = append(nbIdIdentitiesMembers, nbIdData) + } + + return nbIdIdentitiesMembers, nil +} + /* Close the writer */ @@ -512,7 +639,3 @@ func appendGnbCells(inventoryName string, cells []*entities.ServedNRCell, pairs } return pairs, nil } - -func isNotEmpty(nbIdentity *entities.NbIdentity) bool { - return nbIdentity.GlobalNbId != nil && nbIdentity.GlobalNbId.PlmnId != "" && nbIdentity.GlobalNbId.NbId != "" -}