X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2FrNibWriter%2FrNibWriter.go;h=1a0b60ba767f57e73ceea5ed6795f6c11160d46a;hb=19e72a51b5edbf108d230093fdf85b42fe5ab470;hp=14f1564fdc28c614940b39a1e0e5794378df4537;hpb=07ef76dd471a0892a893c90e0ab06713aee34be1;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/rNibWriter/rNibWriter.go b/E2Manager/rNibWriter/rNibWriter.go
index 14f1564..1a0b60b 100644
--- a/E2Manager/rNibWriter/rNibWriter.go
+++ b/E2Manager/rNibWriter/rNibWriter.go
@@ -18,32 +18,33 @@
 package rNibWriter
 
 import (
-	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
-	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
 	"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
 }
+
 /*
 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
 }
+
 /*
 Init initializes the infrastructure required for the RNibWriter instance
- */
+*/
 func Init(namespace string, poolSize int) {
 	initPool(poolSize,
 		func() interface{} {
@@ -54,27 +55,30 @@ func Init(namespace string, poolSize int) {
 			(*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)
 }
+
 /*
 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 {
 
 	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)))
+	if isNotEmptyIdentity && entity.GetNodeType() == entities.Node_UNKNOWN {
+		return common.NewValidationError(errors.New(fmt.Sprintf("#rNibWriter.saveNodeB - Unknown responding node type, entity: %v", entity)))
 	}
 	defer writerPool.Put(w)
 	data, err := proto.Marshal(entity)
@@ -83,14 +87,14 @@ func (w *rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity *
 	}
 	var pairs []interface{}
 	key, rNibErr := common.ValidateAndBuildNodeBNameKey(nbIdentity.InventoryName)
-	if rNibErr != nil{
+	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 rNibErr != nil{
+		if rNibErr != nil {
 			return rNibErr
 		}
 		pairs = append(pairs, key, data)
@@ -98,13 +102,13 @@ func (w *rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity *
 
 	if entity.GetEnb() != nil {
 		pairs, rNibErr = appendEnbCells(nbIdentity, entity.GetEnb().GetServedCells(), pairs)
-		if rNibErr != nil{
+		if rNibErr != nil {
 			return rNibErr
 		}
 	}
 	if entity.GetGnb() != nil {
 		pairs, rNibErr = appendGnbCells(nbIdentity, entity.GetGnb().GetServedNrCells(), pairs)
-		if rNibErr != nil{
+		if rNibErr != nil {
 			return rNibErr
 		}
 	}
@@ -112,19 +116,69 @@ func (w *rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity *
 	if err != nil {
 		return common.NewInternalError(err)
 	}
+
+	ranNameIdentity := &entities.NbIdentity{InventoryName: nbIdentity.InventoryName}
+
 	if isNotEmptyIdentity {
-		nbIdData, err := proto.Marshal(nbIdentity)
+		nbIdData, err := proto.Marshal(ranNameIdentity)
 		if err != nil {
 			return common.NewInternalError(err)
 		}
-		err = (*w.sdl).AddMember(entity.GetNodeType().String(), nbIdData)
+		err = (*w.sdl).RemoveMember(entities.Node_UNKNOWN.String(), nbIdData)
 		if err != nil {
 			return common.NewInternalError(err)
 		}
+	} else {
+		nbIdentity = ranNameIdentity
+	}
+
+	nbIdData, err := proto.Marshal(nbIdentity)
+	if err != nil {
+		return common.NewInternalError(err)
+	}
+	err = (*w.sdl).AddMember(entity.GetNodeType().String(), nbIdData)
+	if err != nil {
+		return common.NewInternalError(err)
 	}
 	return nil
 }
 
+/*
+UpdateNodebInfo...
+*/
+func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) common.IRNibError {
+
+	defer writerPool.Put(w)
+
+	nodebNameKey, rNibErr := common.ValidateAndBuildNodeBNameKey(nodebInfo.GetRanName())
+
+	if rNibErr != nil {
+		return rNibErr
+	}
+
+	nodebIdKey, rNibErr := common.ValidateAndBuildNodeBIdKey(nodebInfo.GetNodeType().String(), nodebInfo.GlobalNbId.GetPlmnId(), nodebInfo.GlobalNbId.GetNbId())
+
+	if rNibErr != nil {
+		return rNibErr
+	}
+
+	data, err := proto.Marshal(nodebInfo)
+
+	if err != nil {
+		return common.NewInternalError(err)
+	}
+
+	var pairs []interface{}
+	pairs = append(pairs, nodebNameKey, data, nodebIdKey, data)
+	err = (*w.sdl).Set(pairs)
+
+	if err != nil {
+		return common.NewInternalError(err)
+	}
+
+	return nil
+}
+
 /*
 SaveRanLoadInformation stores ran load information for the provided ran
 */
@@ -132,7 +186,7 @@ func (w *rNibWriterInstance) SaveRanLoadInformation(inventoryName string, ranLoa
 
 	defer writerPool.Put(w)
 
-	key, rnibErr:= common.ValidateAndBuildRanLoadInformationKey(inventoryName)
+	key, rnibErr := common.ValidateAndBuildRanLoadInformationKey(inventoryName)
 
 	if rnibErr != nil {
 		return rnibErr
@@ -158,25 +212,25 @@ func (w *rNibWriterInstance) SaveRanLoadInformation(inventoryName string, ranLoa
 
 /*
 Close closes writer's pool
- */
-func Close(){
+*/
+func Close() {
 	writerPool.Close()
 }
 
 func appendEnbCells(nbIdentity *entities.NbIdentity, cells []*entities.ServedCellInfo, pairs []interface{}) ([]interface{}, common.IRNibError) {
 	for _, cell := range cells {
-		cellEntity := entities.Cell{Type:entities.Cell_LTE_CELL, Cell:&entities.Cell_ServedCellInfo{ServedCellInfo:cell}}
+		cellEntity := entities.Cell{Type: entities.Cell_LTE_CELL, Cell: &entities.Cell_ServedCellInfo{ServedCellInfo: cell}}
 		cellData, err := proto.Marshal(&cellEntity)
 		if err != nil {
 			return pairs, common.NewInternalError(err)
 		}
 		key, rNibErr := common.ValidateAndBuildCellIdKey(cell.GetCellId())
-		if rNibErr != nil{
+		if rNibErr != nil {
 			return pairs, rNibErr
 		}
 		pairs = append(pairs, key, cellData)
 		key, rNibErr = common.ValidateAndBuildCellNamePciKey(nbIdentity.InventoryName, cell.GetPci())
-		if rNibErr != nil{
+		if rNibErr != nil {
 			return pairs, rNibErr
 		}
 		pairs = append(pairs, key, cellData)
@@ -184,20 +238,20 @@ 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{}, common.IRNibError) {
 	for _, cell := range cells {
-		cellEntity := entities.Cell{Type:entities.Cell_NR_CELL, Cell:&entities.Cell_ServedNrCell{ServedNrCell:cell}}
+		cellEntity := entities.Cell{Type: entities.Cell_NR_CELL, Cell: &entities.Cell_ServedNrCell{ServedNrCell: cell}}
 		cellData, err := proto.Marshal(&cellEntity)
 		if err != nil {
 			return pairs, common.NewInternalError(err)
 		}
 		key, rNibErr := common.ValidateAndBuildNrCellIdKey(cell.GetServedNrCellInformation().GetCellId())
-		if rNibErr != nil{
+		if rNibErr != nil {
 			return pairs, rNibErr
 		}
 		pairs = append(pairs, key, cellData)
 		key, rNibErr = common.ValidateAndBuildCellNamePciKey(nbIdentity.InventoryName, cell.GetServedNrCellInformation().GetNrPci())
-		if rNibErr != nil{
+		if rNibErr != nil {
 			return pairs, rNibErr
 		}
 		pairs = append(pairs, key, cellData)
@@ -207,4 +261,4 @@ func appendGnbCells(nbIdentity *entities.NbIdentity, cells  []*entities.ServedNR
 
 func isNotEmpty(nbIdentity *entities.NbIdentity) bool {
 	return nbIdentity.GlobalNbId != nil && nbIdentity.GlobalNbId.PlmnId != "" && nbIdentity.GlobalNbId.NbId != ""
-}
\ No newline at end of file
+}