[RIC-584] - Validate setup from network and antenna type in ENB REST APIs

[ric-plt/e2mgr.git] / E2Manager / rNibWriter / rNibWriter.go

diff --git a/E2Manager/rNibWriter/rNibWriter.go b/E2Manager/rNibWriter/rNibWriter.go
index d874938..670ee6b 100644 (file)
--- a/E2Manager/rNibWriter/rNibWriter.go
+++ b/E2Manager/rNibWriter/rNibWriter.go
@@ -44,8 +44,9 @@ type rNibWriterInstance struct {
 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
@@ -57,6 +58,9 @@ type RNibWriter interface {
        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
 }
 
 /*
@@ -67,6 +71,25 @@ func GetRNibWriter(sdl common.ISdlInstance, rnibWriterConfig configuration.RnibW
        return &rNibWriterInstance{sdl: sdl, rnibWriterConfig: rnibWriterConfig}
 }
 
+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(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)
 
@@ -105,23 +128,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
@@ -129,61 +145,75 @@ 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(pairs)
 
        if err != nil {
                return common.NewInternalError(err)
        }
 
-       ranNameIdentity := &entities.NbIdentity{InventoryName: nbIdentity.InventoryName}
+       return nil
+}
 
-       if isNotEmptyIdentity {
-               err := w.removeNbIdentity(entities.Node_UNKNOWN, ranNameIdentity)
-               if err != nil {
-                       return common.NewInternalError(err)
-               }
-       } else {
-               nbIdentity = ranNameIdentity
-       }
+func (w *rNibWriterInstance) AddEnb(nodebInfo *entities.NodebInfo) error {
 
-       nbIdData, err := proto.Marshal(nbIdentity)
+       data, err := proto.Marshal(nodebInfo)
 
        if err != nil {
                return common.NewInternalError(err)
        }
 
-       err = w.sdl.AddMember(nodeType.String(), nbIdData)
+       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
+               }
+               pairs = append(pairs, key, data)
+       }
+
+       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(channelsAndEvents, pairs)
        if err != nil {
                return common.NewInternalError(err)
        }
+
        return nil
 }
 
@@ -201,7 +231,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(channelsAndEvents, pairs)
 
        if err != nil {
                return common.NewInternalError(err)
@@ -298,7 +329,7 @@ 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)
@@ -310,10 +341,7 @@ func (w *rNibWriterInstance) removeNbIdentity(nodeType entities.Node_Type ,nbIde
        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)
 
@@ -321,7 +349,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(channelsAndEvents, pairs)
+       } else {
+               err = w.sdl.Set(pairs)
+       }
 
        if err != nil {
                return common.NewInternalError(err)
@@ -330,6 +363,21 @@ 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
 */
@@ -459,18 +507,13 @@ 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)
-       if err != nil {
-               return err
-       }
-
        keysToRemove, err := w.buildRemoveEnbKeys(nodebInfo)
        if err != nil {
                return err
        }
 
-       err = w.sdl.RemoveAndPublish([]string{w.rnibWriterConfig.RanManipulationMessageChannel, fmt.Sprintf("%s_%s", nodebInfo.RanName, RanDeletedEvent)}, keysToRemove)
+       channelsAndEvents := getChannelsAndEventsPair(w.rnibWriterConfig.RanManipulationMessageChannel, nodebInfo.RanName, RanDeletedEvent)
+       err = w.sdl.RemoveAndPublish(channelsAndEvents, keysToRemove)
 
        if err != nil {
                return common.NewInternalError(err)
@@ -493,7 +536,8 @@ func (w *rNibWriterInstance) UpdateEnb(nodebInfo *entities.NodebInfo, servedCell
                return err
        }
 
-       err = w.sdl.SetAndPublish([]string{w.rnibWriterConfig.RanManipulationMessageChannel, fmt.Sprintf("%s_%s", nodebInfo.RanName, RanUpdatedEvent)}, pairs)
+       channelsAndEvents := getChannelsAndEventsPair(w.rnibWriterConfig.RanManipulationMessageChannel, nodebInfo.RanName, RanUpdatedEvent)
+       err = w.sdl.SetAndPublish(channelsAndEvents, pairs)
 
        if err != nil {
                return common.NewInternalError(err)
@@ -501,6 +545,7 @@ func (w *rNibWriterInstance) UpdateEnb(nodebInfo *entities.NodebInfo, servedCell
 
        return nil
 }
+
 /*
 Close the writer
 */
@@ -549,7 +594,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