sync R3 content from Azure

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

diff --git a/E2Manager/rNibWriter/rNibWriter.go b/E2Manager/rNibWriter/rNibWriter.go
index 1a0b60b..202a273 100644 (file)
--- a/E2Manager/rNibWriter/rNibWriter.go
+++ b/E2Manager/rNibWriter/rNibWriter.go
@@ -18,69 +18,42 @@
 package rNibWriter
 
 import (
-       "errors"
        "fmt"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
-       "gerrit.o-ran-sc.org/r/ric-plt/sdlgo"
        "github.com/golang/protobuf/proto"
 )
 
-var writerPool *common.Pool
-
 type rNibWriterInstance struct {
-       sdl       *common.ISdlInstance
-       namespace string
+       sdl common.ISdlInstance
 }
 
 /*
 RNibWriter interface allows saving data to the redis DB
 */
 type RNibWriter interface {
-       SaveNodeb(nbIdentity *entities.NbIdentity, nb *entities.NodebInfo) common.IRNibError
-       UpdateNodebInfo(nodebInfo *entities.NodebInfo) common.IRNibError
-       SaveRanLoadInformation(inventoryName string, ranLoadInformation *entities.RanLoadInformation) common.IRNibError
+       SaveNodeb(nbIdentity *entities.NbIdentity, nb *entities.NodebInfo) error
+       UpdateNodebInfo(nodebInfo *entities.NodebInfo) error
+       SaveRanLoadInformation(inventoryName string, ranLoadInformation *entities.RanLoadInformation) error
 }
 
 /*
-Init initializes the infrastructure required for the RNibWriter instance
+GetRNibWriter returns reference to RNibWriter
 */
-func Init(namespace string, poolSize int) {
-       initPool(poolSize,
-               func() interface{} {
-                       var sdlI common.ISdlInstance = sdlgo.NewSdlInstance(namespace, sdlgo.NewDatabase())
-                       return &rNibWriterInstance{sdl: &sdlI, namespace: namespace}
-               },
-               func(obj interface{}) {
-                       (*obj.(*rNibWriterInstance).sdl).Close()
-               })
-}
 
-/*
-InitPool initializes the writer's instances pool
-*/
-func initPool(poolSize int, newObj func() interface{}, destroyObj func(interface{})) {
-       writerPool = common.NewPool(poolSize, newObj, destroyObj)
-}
-
-/*
-GetRNibWriter returns RNibWriter instance from the pool
-*/
-func GetRNibWriter() RNibWriter {
-       return writerPool.Get().(RNibWriter)
+func GetRNibWriter(sdl common.ISdlInstance) RNibWriter {
+       return &rNibWriterInstance{sdl: sdl}
 }
 
 /*
 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) common.IRNibError {
-
+func (w *rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity *entities.NodebInfo) error {
        isNotEmptyIdentity := isNotEmpty(nbIdentity)
 
        if isNotEmptyIdentity && entity.GetNodeType() == entities.Node_UNKNOWN {
-               return common.NewValidationError(errors.New(fmt.Sprintf("#rNibWriter.saveNodeB - Unknown responding node type, entity: %v", entity)))
+               return common.NewValidationError(fmt.Sprintf("#rNibWriter.saveNodeB - Unknown responding node type, entity: %v", entity))
        }
-       defer writerPool.Put(w)
        data, err := proto.Marshal(entity)
        if err != nil {
                return common.NewInternalError(err)
@@ -112,7 +85,7 @@ func (w *rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity *
                        return rNibErr
                }
        }
-       err = (*w.sdl).Set(pairs)
+       err = w.sdl.Set(pairs)
        if err != nil {
                return common.NewInternalError(err)
        }
@@ -124,7 +97,7 @@ func (w *rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity *
                if err != nil {
                        return common.NewInternalError(err)
                }
-               err = (*w.sdl).RemoveMember(entities.Node_UNKNOWN.String(), nbIdData)
+               err = w.sdl.RemoveMember(entities.Node_UNKNOWN.String(), nbIdData)
                if err != nil {
                        return common.NewInternalError(err)
                }
@@ -136,7 +109,7 @@ func (w *rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity *
        if err != nil {
                return common.NewInternalError(err)
        }
-       err = (*w.sdl).AddMember(entity.GetNodeType().String(), nbIdData)
+       err = w.sdl.AddMember(entity.GetNodeType().String(), nbIdData)
        if err != nil {
                return common.NewInternalError(err)
        }
@@ -146,9 +119,7 @@ func (w *rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity *
 /*
 UpdateNodebInfo...
 */
-func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) common.IRNibError {
-
-       defer writerPool.Put(w)
+func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) error {
 
        nodebNameKey, rNibErr := common.ValidateAndBuildNodeBNameKey(nodebInfo.GetRanName())
 
@@ -156,11 +127,7 @@ func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) comm
                return rNibErr
        }
 
-       nodebIdKey, rNibErr := common.ValidateAndBuildNodeBIdKey(nodebInfo.GetNodeType().String(), nodebInfo.GlobalNbId.GetPlmnId(), nodebInfo.GlobalNbId.GetNbId())
-
-       if rNibErr != nil {
-               return rNibErr
-       }
+       nodebIdKey, buildNodebIdKeyError := common.ValidateAndBuildNodeBIdKey(nodebInfo.GetNodeType().String(), nodebInfo.GlobalNbId.GetPlmnId(), nodebInfo.GlobalNbId.GetNbId())
 
        data, err := proto.Marshal(nodebInfo)
 
@@ -169,8 +136,13 @@ func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) comm
        }
 
        var pairs []interface{}
-       pairs = append(pairs, nodebNameKey, data, nodebIdKey, data)
-       err = (*w.sdl).Set(pairs)
+       pairs = append(pairs, nodebNameKey, data)
+
+       if buildNodebIdKeyError == nil {
+               pairs = append(pairs, nodebIdKey, data)
+       }
+
+       err = w.sdl.Set(pairs)
 
        if err != nil {
                return common.NewInternalError(err)
@@ -182,9 +154,7 @@ func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) comm
 /*
 SaveRanLoadInformation stores ran load information for the provided ran
 */
-func (w *rNibWriterInstance) SaveRanLoadInformation(inventoryName string, ranLoadInformation *entities.RanLoadInformation) common.IRNibError {
-
-       defer writerPool.Put(w)
+func (w *rNibWriterInstance) SaveRanLoadInformation(inventoryName string, ranLoadInformation *entities.RanLoadInformation) error {
 
        key, rnibErr := common.ValidateAndBuildRanLoadInformationKey(inventoryName)
 
@@ -201,7 +171,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(pairs)
 
        if err != nil {
                return common.NewInternalError(err)
@@ -211,13 +181,13 @@ func (w *rNibWriterInstance) SaveRanLoadInformation(inventoryName string, ranLoa
 }
 
 /*
-Close closes writer's pool
+Close the writer
 */
 func Close() {
-       writerPool.Close()
+       //Nothing to do
 }
 
-func appendEnbCells(nbIdentity *entities.NbIdentity, cells []*entities.ServedCellInfo, pairs []interface{}) ([]interface{}, common.IRNibError) {
+func appendEnbCells(nbIdentity *entities.NbIdentity, cells []*entities.ServedCellInfo, pairs []interface{}) ([]interface{}, error) {
        for _, cell := range cells {
                cellEntity := entities.Cell{Type: entities.Cell_LTE_CELL, Cell: &entities.Cell_ServedCellInfo{ServedCellInfo: cell}}
                cellData, err := proto.Marshal(&cellEntity)
@@ -238,7 +208,7 @@ func appendEnbCells(nbIdentity *entities.NbIdentity, cells []*entities.ServedCel
        return pairs, nil
 }
 
-func appendGnbCells(nbIdentity *entities.NbIdentity, cells []*entities.ServedNRCell, pairs []interface{}) ([]interface{}, common.IRNibError) {
+func appendGnbCells(nbIdentity *entities.NbIdentity, cells []*entities.ServedNRCell, pairs []interface{}) ([]interface{}, error) {
        for _, cell := range cells {
                cellEntity := entities.Cell{Type: entities.Cell_NR_CELL, Cell: &entities.Cell_ServedNrCell{ServedNrCell: cell}}
                cellData, err := proto.Marshal(&cellEntity)