E2Mgr release

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

diff --git a/E2Manager/rNibWriter/rNibWriter.go b/E2Manager/rNibWriter/rNibWriter.go
index 3069258..d107f55 100644 (file)
--- a/E2Manager/rNibWriter/rNibWriter.go
+++ b/E2Manager/rNibWriter/rNibWriter.go
@@ -36,8 +36,9 @@ const (
 )
 
 type rNibWriterInstance struct {
-       sdl              common.ISdlInstance
+       sdl              common.ISdlSyncStorage
        rnibWriterConfig configuration.RnibWriterConfig
+       ns               string
 }
 
 /*
@@ -46,6 +47,7 @@ RNibWriter interface allows saving data to the redis DB
 type RNibWriter interface {
        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
@@ -59,14 +61,20 @@ type RNibWriter interface {
        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 {
@@ -80,7 +88,7 @@ func (w *rNibWriterInstance) AddNbIdentity(nodeType entities.Node_Type, nbIdenti
                return common.NewInternalError(err)
        }
 
-       err = w.sdl.AddMember(nodeType.String(), nbIdData)
+       err = w.sdl.AddMember(w.ns, nodeType.String(), nbIdData)
 
        if err != nil {
                return common.NewInternalError(err)
@@ -91,7 +99,7 @@ func (w *rNibWriterInstance) AddNbIdentity(nodeType entities.Node_Type, nbIdenti
 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)
@@ -103,7 +111,7 @@ func (w *rNibWriterInstance) RemoveServedNrCells(inventoryName string, servedNrC
 func (w *rNibWriterInstance) RemoveServedCells(inventoryName string, servedCells []*entities.ServedCellInfo) error {
        cellKeysToRemove := buildServedCellInfoKeysToRemove(inventoryName, servedCells)
 
-       err := w.sdl.Remove(cellKeysToRemove)
+       err := w.sdl.Remove(w.ns, cellKeysToRemove)
 
        if err != nil {
                return common.NewInternalError(err)
@@ -166,13 +174,48 @@ func (w *rNibWriterInstance) SaveNodeb(nodebInfo *entities.NodebInfo) error {
                }
        }
 
-       if nodebInfo.GetNodeType() == entities.Node_ENB {
-               channelsAndEvents := getChannelsAndEventsPair(w.rnibWriterConfig.RanManipulationMessageChannel, nodebInfo.RanName, RanAddedEvent)
-               err = w.sdl.SetAndPublish(channelsAndEvents, 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)
+       }
+
+       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(w.ns, channelsAndEvents, pairs)
        if err != nil {
                return common.NewInternalError(err)
        }
@@ -180,6 +223,31 @@ func (w *rNibWriterInstance) SaveNodeb(nodebInfo *entities.NodebInfo) error {
        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 err
+       }
+
+       err = w.sdl.AddMember(w.ns, nodeType.String(), nbIdIdentitiesToAdd[:]...)
+       if err != nil {
+               return err
+       }
+
+       return nil
+}
+
 func (w *rNibWriterInstance) UpdateGnbCells(nodebInfo *entities.NodebInfo, servedNrCells []*entities.ServedNRCell) error {
 
        pairs, err := buildUpdateNodebInfoPairs(nodebInfo)
@@ -195,7 +263,7 @@ func (w *rNibWriterInstance) UpdateGnbCells(nodebInfo *entities.NodebInfo, serve
        }
 
        channelsAndEvents := getChannelsAndEventsPair(w.rnibWriterConfig.RanManipulationMessageChannel, nodebInfo.RanName, RanUpdatedEvent)
-       err = w.sdl.SetAndPublish(channelsAndEvents, pairs)
+       err = w.sdl.SetAndPublish(w.ns, channelsAndEvents, pairs)
 
        if err != nil {
                return common.NewInternalError(err)
@@ -297,17 +365,14 @@ func (w *rNibWriterInstance) RemoveNbIdentity(nodeType entities.Node_Type, nbIde
        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)
 
@@ -315,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)
@@ -324,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
 */
@@ -344,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)
@@ -370,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)
@@ -390,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)
@@ -404,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)
@@ -423,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)
@@ -443,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)
@@ -459,7 +543,7 @@ func (w *rNibWriterInstance) RemoveEnb(nodebInfo *entities.NodebInfo) error {
        }
 
        channelsAndEvents := getChannelsAndEventsPair(w.rnibWriterConfig.RanManipulationMessageChannel, nodebInfo.RanName, RanDeletedEvent)
-       err = w.sdl.RemoveAndPublish(channelsAndEvents, keysToRemove)
+       err = w.sdl.RemoveAndPublish(w.ns, channelsAndEvents, keysToRemove)
 
        if err != nil {
                return common.NewInternalError(err)
@@ -483,7 +567,7 @@ func (w *rNibWriterInstance) UpdateEnb(nodebInfo *entities.NodebInfo, servedCell
        }
 
        channelsAndEvents := getChannelsAndEventsPair(w.rnibWriterConfig.RanManipulationMessageChannel, nodebInfo.RanName, RanUpdatedEvent)
-       err = w.sdl.SetAndPublish(channelsAndEvents, pairs)
+       err = w.sdl.SetAndPublish(w.ns, channelsAndEvents, pairs)
 
        if err != nil {
                return common.NewInternalError(err)
@@ -492,6 +576,21 @@ func (w *rNibWriterInstance) UpdateEnb(nodebInfo *entities.NodebInfo, servedCell
        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
 */