[RIC-432] - Support Update eNB REST API.

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

diff --git a/E2Manager/rNibWriter/rNibWriter.go b/E2Manager/rNibWriter/rNibWriter.go
index 3186d70..d874938 100644 (file)
--- 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,10 +28,16 @@ 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.ISdlInstance
+       rnibWriterConfig configuration.RnibWriterConfig
 }
 
 /*
@@ -45,21 +52,36 @@ type RNibWriter interface {
        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
 }
 
 /*
 GetRNibWriter returns reference to RNibWriter
 */
 
-func GetRNibWriter(sdl common.ISdlInstance) RNibWriter {
-       return &rNibWriterInstance{sdl: sdl}
+func GetRNibWriter(sdl common.ISdlInstance, rnibWriterConfig configuration.RnibWriterConfig) RNibWriter {
+       return &rNibWriterInstance{sdl: sdl, rnibWriterConfig: rnibWriterConfig}
 }
 
-
 func (w *rNibWriterInstance) RemoveServedNrCells(inventoryName string, servedNrCells []*entities.ServedNRCell) error {
-       cellKeysToRemove := buildCellKeysToRemove(inventoryName, servedNrCells)
+       cellKeysToRemove := buildServedNRCellKeysToRemove(inventoryName, servedNrCells)
+
+       err := w.sdl.Remove(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(cellKeysToRemove)
 
        if err != nil {
@@ -86,22 +108,30 @@ SaveNodeb saves nodeB entity data in the redis DB according to the specified dat
 func (w *rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity *entities.NodebInfo) error {
        isNotEmptyIdentity := isNotEmpty(nbIdentity)
 
-       if isNotEmptyIdentity && entity.GetNodeType() == entities.Node_UNKNOWN {
+       nodeType := entity.GetNodeType()
+
+       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)
+
        if err != nil {
                return common.NewInternalError(err)
        }
+
        var pairs []interface{}
        key, rNibErr := common.ValidateAndBuildNodeBNameKey(nbIdentity.InventoryName)
+
        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())
+
+               key, rNibErr = common.ValidateAndBuildNodeBIdKey(nodeType.String(), nbIdentity.GlobalNbId.GetPlmnId(), nbIdentity.GlobalNbId.GetNbId())
                if rNibErr != nil {
                        return rNibErr
                }
@@ -114,13 +144,20 @@ func (w *rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity *
                        return rNibErr
                }
        }
+
        if entity.GetGnb() != nil {
                pairs, rNibErr = appendGnbCells(nbIdentity.InventoryName, entity.GetGnb().GetServedNrCells(), pairs)
                if rNibErr != nil {
                        return rNibErr
                }
        }
-       err = w.sdl.Set(pairs)
+
+       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)
+       }
+
        if err != nil {
                return common.NewInternalError(err)
        }
@@ -128,11 +165,7 @@ func (w *rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity *
        ranNameIdentity := &entities.NbIdentity{InventoryName: nbIdentity.InventoryName}
 
        if isNotEmptyIdentity {
-               nbIdData, err := proto.Marshal(ranNameIdentity)
-               if err != nil {
-                       return common.NewInternalError(err)
-               }
-               err = w.sdl.RemoveMember(entities.Node_UNKNOWN.String(), nbIdData)
+               err := w.removeNbIdentity(entities.Node_UNKNOWN, ranNameIdentity)
                if err != nil {
                        return common.NewInternalError(err)
                }
@@ -141,10 +174,13 @@ func (w *rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity *
        }
 
        nbIdData, err := proto.Marshal(nbIdentity)
+
        if err != nil {
                return common.NewInternalError(err)
        }
-       err = w.sdl.AddMember(entity.GetNodeType().String(), nbIdData)
+
+       err = w.sdl.AddMember(nodeType.String(), nbIdData)
+
        if err != nil {
                return common.NewInternalError(err)
        }
@@ -174,9 +210,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 +232,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,6 +278,38 @@ func buildUpdateNodebInfoPairs(nodebInfo *entities.NodebInfo) ([]interface{}, er
        return pairs, nil
 }
 
+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(nodeType.String(), nbIdData)
+       if err != nil {
+               return common.NewInternalError(err)
+       }
+       return nil
+}
+
 /*
 UpdateNodebInfo...
 */
@@ -351,7 +441,7 @@ 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)
 
@@ -359,7 +449,28 @@ func (w *rNibWriterInstance) UpdateNodebInfoOnConnectionStatusInversion(nodebInf
                return err
        }
 
-       err = w.sdl.SetAndPublish([]string{stateChangeMessageChannel, event}, pairs)
+       err = w.sdl.SetAndPublish([]string{w.rnibWriterConfig.StateChangeMessageChannel, event}, pairs)
+
+       if err != nil {
+               return common.NewInternalError(err)
+       }
+
+       return nil
+}
+
+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)
 
        if err != nil {
                return common.NewInternalError(err)
@@ -368,6 +479,28 @@ func (w *rNibWriterInstance) UpdateNodebInfoOnConnectionStatusInversion(nodebInf
        return nil
 }
 
+func (w *rNibWriterInstance) UpdateEnb(nodebInfo *entities.NodebInfo, servedCells []*entities.ServedCellInfo) error {
+
+       pairs, err := buildUpdateNodebInfoPairs(nodebInfo)
+
+       if err != nil {
+               return err
+       }
+
+       pairs, err = appendEnbCells(nodebInfo.RanName, servedCells, pairs)
+
+       if err != nil {
+               return err
+       }
+
+       err = w.sdl.SetAndPublish([]string{w.rnibWriterConfig.RanManipulationMessageChannel, fmt.Sprintf("%s_%s", nodebInfo.RanName, RanUpdatedEvent)}, pairs)
+
+       if err != nil {
+               return common.NewInternalError(err)
+       }
+
+       return nil
+}
 /*
 Close the writer
 */