X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2FrNibWriter%2FrNibWriter.go;h=d107f55fbc56a920a690788f8151b0952c114196;hb=358ea21b00a5d2ccdb9dfa64e416787008d06442;hp=73220351b72171c23fd2cb209e30d64d3cc67a42;hpb=76709204dfd7968156b5fa81190f146a8991812d;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/rNibWriter/rNibWriter.go b/E2Manager/rNibWriter/rNibWriter.go index 7322035..d107f55 100644 --- a/E2Manager/rNibWriter/rNibWriter.go +++ b/E2Manager/rNibWriter/rNibWriter.go @@ -20,6 +20,7 @@ package rNibWriter import ( + "e2mgr/configuration" "encoding/json" "fmt" "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common" @@ -27,40 +28,90 @@ import ( "github.com/golang/protobuf/proto" ) -const E2TAddressesKey = "E2TAddresses" +const ( + E2TAddressesKey = "E2TAddresses" + RanAddedEvent = "ADDED" + RanUpdatedEvent = "UPDATED" + RanDeletedEvent = "DELETED" +) 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 RemoveE2TInstance(e2tAddress string) error UpdateGnbCells(nodebInfo *entities.NodebInfo, servedNrCells []*entities.ServedNRCell) error RemoveServedNrCells(inventoryName string, servedNrCells []*entities.ServedNRCell) error - UpdateNodebInfoOnConnectionStatusInversion(nodebInfo *entities.NodebInfo, stateChangeMessageChannel string, event string) error + 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) RNibWriter { - return &rNibWriterInstance{sdl: sdl} +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 := buildCellKeysToRemove(inventoryName, servedNrCells) - err := w.sdl.Remove(cellKeysToRemove) + cellKeysToRemove := buildServedNRCellKeysToRemove(inventoryName, servedNrCells) + + 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) @@ -83,71 +134,117 @@ 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) +func (w *rNibWriterInstance) SaveNodeb(nodebInfo *entities.NodebInfo) error { + + data, err := proto.Marshal(nodebInfo) - if isNotEmptyIdentity && entity.GetNodeType() == entities.Node_UNKNOWN { - return common.NewValidationError(fmt.Sprintf("#rNibWriter.saveNodeB - Unknown responding node type, entity: %v", entity)) - } - data, err := proto.Marshal(entity) 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 } + pairs = append(pairs, key, data) - if isNotEmptyIdentity { - key, rNibErr = common.ValidateAndBuildNodeBIdKey(entity.GetNodeType().String(), nbIdentity.GlobalNbId.GetPlmnId(), nbIdentity.GlobalNbId.GetNbId()) + if nodebInfo.GlobalNbId != nil { + + 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 } } - err = w.sdl.Set(pairs) + + err = w.sdl.Set(w.ns, pairs) + if err != nil { return common.NewInternalError(err) } - ranNameIdentity := &entities.NbIdentity{InventoryName: nbIdentity.InventoryName} + return nil +} - if isNotEmptyIdentity { - nbIdData, err := proto.Marshal(ranNameIdentity) - if err != nil { - return common.NewInternalError(err) - } - err = w.sdl.RemoveMember(entities.Node_UNKNOWN.String(), nbIdData) - if err != nil { - return common.NewInternalError(err) +func (w *rNibWriterInstance) AddEnb(nodebInfo *entities.NodebInfo) error { + + data, err := proto.Marshal(nodebInfo) + + if err != nil { + return common.NewInternalError(err) + } + + var pairs []interface{} + key, rNibErr := common.ValidateAndBuildNodeBNameKey(nodebInfo.RanName) + + 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(entity.GetNodeType().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 err + } + + err = w.sdl.RemoveMember(w.ns, nodeType.String(), nbIdIdentitiesToRemove[:]...) + if err != nil { + return err + } + + nbIdIdentitiesToAdd, err := w.buildNbIdentitiesMembers(newNbIdentities) if err != nil { - return common.NewInternalError(err) + return err } + + err = w.sdl.AddMember(w.ns, nodeType.String(), nbIdIdentitiesToAdd[:]...) + if err != nil { + return err + } + return nil } @@ -165,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) @@ -174,9 +272,9 @@ func (w *rNibWriterInstance) UpdateGnbCells(nodebInfo *entities.NodebInfo, serve return nil } -func buildCellKeysToRemove(inventoryName string, servedNrCellsToRemove []*entities.ServedNRCell) []string { +func buildServedNRCellKeysToRemove(inventoryName string, servedNrCellsToRemove []*entities.ServedNRCell) []string { - cellKeysToRemove := []string{} + var cellKeysToRemove []string for _, cell := range servedNrCellsToRemove { @@ -196,6 +294,28 @@ func buildCellKeysToRemove(inventoryName string, servedNrCellsToRemove []*entiti return cellKeysToRemove } +func buildServedCellInfoKeysToRemove(inventoryName string, servedCellsToRemove []*entities.ServedCellInfo) []string { + + var cellKeysToRemove []string + + for _, cell := range servedCellsToRemove { + + key, _ := common.ValidateAndBuildCellIdKey(cell.GetCellId()) + + if len(key) != 0 { + cellKeysToRemove = append(cellKeysToRemove, key) + } + + key, _ = common.ValidateAndBuildCellNamePciKey(inventoryName, cell.GetPci()) + + if len(key) != 0 { + cellKeysToRemove = append(cellKeysToRemove, key) + } + } + + return cellKeysToRemove +} + func buildUpdateNodebInfoPairs(nodebInfo *entities.NodebInfo) ([]interface{}, error) { nodebNameKey, rNibErr := common.ValidateAndBuildNodeBNameKey(nodebInfo.GetRanName()) @@ -220,10 +340,39 @@ func buildUpdateNodebInfoPairs(nodebInfo *entities.NodebInfo) ([]interface{}, er return pairs, nil } -/* -UpdateNodebInfo... -*/ -func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) error { +func (w *rNibWriterInstance) buildRemoveEnbKeys(nodebInfo *entities.NodebInfo) ([]string, error) { + keys := buildServedCellInfoKeysToRemove(nodebInfo.GetRanName(), nodebInfo.GetEnb().GetServedCells()) + + nodebNameKey, rNibErr := common.ValidateAndBuildNodeBNameKey(nodebInfo.GetRanName()) + + if rNibErr != nil { + return []string{}, rNibErr + } + + keys = append(keys, nodebNameKey) + + nodebIdKey, buildNodebIdKeyError := common.ValidateAndBuildNodeBIdKey(nodebInfo.GetNodeType().String(), nodebInfo.GlobalNbId.GetPlmnId(), nodebInfo.GlobalNbId.GetNbId()) + + if buildNodebIdKeyError == nil { + keys = append(keys, nodebIdKey) + } + + return keys, nil +} + +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(w.ns, nodeType.String(), nbIdData) + if err != nil { + return common.NewInternalError(err) + } + return nil +} + +func (w *rNibWriterInstance) updateNodebInfo(nodebInfo *entities.NodebInfo, publish bool) error { pairs, err := buildUpdateNodebInfoPairs(nodebInfo) @@ -231,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) @@ -240,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 */ @@ -260,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) @@ -286,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) @@ -306,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) @@ -320,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) @@ -339,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) @@ -351,7 +519,40 @@ func (w *rNibWriterInstance) SaveWithKeyAndMarshal(key string, entity interface{ /* UpdateNodebInfoOnConnectionStatusInversion... */ -func (w *rNibWriterInstance) UpdateNodebInfoOnConnectionStatusInversion(nodebInfo *entities.NodebInfo, stateChangeMessageChannel string, event string) error { +func (w *rNibWriterInstance) UpdateNodebInfoOnConnectionStatusInversion(nodebInfo *entities.NodebInfo, event string) error { + + pairs, err := buildUpdateNodebInfoPairs(nodebInfo) + + if err != nil { + return err + } + + err = w.sdl.SetAndPublish(w.ns, []string{w.rnibWriterConfig.StateChangeMessageChannel, event}, pairs) + + if err != nil { + return common.NewInternalError(err) + } + + return nil +} + +func (w *rNibWriterInstance) RemoveEnb(nodebInfo *entities.NodebInfo) error { + keysToRemove, err := w.buildRemoveEnbKeys(nodebInfo) + if err != nil { + return err + } + + 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) @@ -359,9 +560,14 @@ func (w *rNibWriterInstance) UpdateNodebInfoOnConnectionStatusInversion(nodebInf return err } - //TODO: Handle "Redis deployment doesn't support MSETMPUB command" when executing SetAndPublish - //err = w.sdl.SetAndPublish([]string{stateChangeMessageChannel, event}, pairs) - err = w.sdl.Set(pairs) + 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) @@ -370,6 +576,21 @@ func (w *rNibWriterInstance) UpdateNodebInfoOnConnectionStatusInversion(nodebInf 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 */ @@ -418,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 != "" -} \ No newline at end of file