X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2FrNibWriter%2FrNibWriter.go;h=f9f75bd77c21579b0a415ca43c07ff5eaa25c326;hb=08bbf91d9f5afd6ecd6eeb9bcc8c160b8242d1ec;hp=13a31f33ccde5c1e90dafd7c035b52b56e80a6b6;hpb=efcb4528362460aa2249d319c9752b63bb720fe2;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/rNibWriter/rNibWriter.go b/E2Manager/rNibWriter/rNibWriter.go
index 13a31f3..f9f75bd 100644
--- a/E2Manager/rNibWriter/rNibWriter.go
+++ b/E2Manager/rNibWriter/rNibWriter.go
@@ -17,7 +17,6 @@
 //  This source code is part of the near-RT RIC (RAN Intelligent Controller)
 //  platform project (RICP).
 
-
 package rNibWriter
 
 import (
@@ -43,6 +42,8 @@ type RNibWriter interface {
 	SaveRanLoadInformation(inventoryName string, ranLoadInformation *entities.RanLoadInformation) error
 	SaveE2TInstance(e2tInstance *entities.E2TInstance) error
 	SaveE2TAddresses(addresses []string) error
+	RemoveE2TInstance(e2tAddress string) error
+	UpdateGnbCells(nodebInfo *entities.NodebInfo, servedNrCells []*entities.ServedNRCell) error
 }
 
 /*
@@ -82,13 +83,13 @@ func (w *rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity *
 	}
 
 	if entity.GetEnb() != nil {
-		pairs, rNibErr = appendEnbCells(nbIdentity, entity.GetEnb().GetServedCells(), pairs)
+		pairs, rNibErr = appendEnbCells(nbIdentity.InventoryName, entity.GetEnb().GetServedCells(), pairs)
 		if rNibErr != nil {
 			return rNibErr
 		}
 	}
 	if entity.GetGnb() != nil {
-		pairs, rNibErr = appendGnbCells(nbIdentity, entity.GetGnb().GetServedNrCells(), pairs)
+		pairs, rNibErr = appendGnbCells(nbIdentity.InventoryName, entity.GetGnb().GetServedNrCells(), pairs)
 		if rNibErr != nil {
 			return rNibErr
 		}
@@ -124,15 +125,34 @@ func (w *rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity *
 	return nil
 }
 
-/*
-UpdateNodebInfo...
-*/
-func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) error {
+func (w *rNibWriterInstance) UpdateGnbCells(nodebInfo *entities.NodebInfo, servedNrCells []*entities.ServedNRCell) error {
+
+	pairs, err := buildUpdateNodebInfoPairs(nodebInfo)
+
+	if err != nil {
+		return err
+	}
+
+	pairs, err = appendGnbCells(nodebInfo.RanName, servedNrCells, pairs)
+
+	if err != nil {
+		return err
+	}
+
+	err = w.sdl.Set(pairs)
+
+	if err != nil {
+		return common.NewInternalError(err)
+	}
+
+	return nil
+}
 
+func buildUpdateNodebInfoPairs(nodebInfo *entities.NodebInfo) ([]interface{}, error) {
 	nodebNameKey, rNibErr := common.ValidateAndBuildNodeBNameKey(nodebInfo.GetRanName())
 
 	if rNibErr != nil {
-		return rNibErr
+		return []interface{}{}, rNibErr
 	}
 
 	nodebIdKey, buildNodebIdKeyError := common.ValidateAndBuildNodeBIdKey(nodebInfo.GetNodeType().String(), nodebInfo.GlobalNbId.GetPlmnId(), nodebInfo.GlobalNbId.GetNbId())
@@ -140,16 +160,29 @@ func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) erro
 	data, err := proto.Marshal(nodebInfo)
 
 	if err != nil {
-		return common.NewInternalError(err)
+		return []interface{}{}, common.NewInternalError(err)
 	}
 
-	var pairs []interface{}
-	pairs = append(pairs, nodebNameKey, data)
+	pairs := []interface{}{nodebNameKey, data}
 
 	if buildNodebIdKeyError == nil {
 		pairs = append(pairs, nodebIdKey, data)
 	}
 
+	return pairs, nil
+}
+
+/*
+UpdateNodebInfo...
+*/
+func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) error {
+
+	pairs, err := buildUpdateNodebInfoPairs(nodebInfo)
+
+	if err != nil {
+		return err
+	}
+
 	err = w.sdl.Set(pairs)
 
 	if err != nil {
@@ -234,6 +267,19 @@ func (w *rNibWriterInstance) SaveE2TAddresses(addresses []string) error {
 	return nil
 }
 
+func (w *rNibWriterInstance) RemoveE2TInstance(address string) error {
+	key, rNibErr := common.ValidateAndBuildE2TInstanceKey(address)
+	if rNibErr != nil {
+		return rNibErr
+	}
+	err := w.sdl.Remove([]string{key})
+
+	if err != nil {
+		return common.NewInternalError(err)
+	}
+	return nil
+}
+
 /*
 Close the writer
 */
@@ -241,7 +287,7 @@ func Close() {
 	//Nothing to do
 }
 
-func appendEnbCells(nbIdentity *entities.NbIdentity, cells []*entities.ServedCellInfo, pairs []interface{}) ([]interface{}, error) {
+func appendEnbCells(inventoryName string, 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)
@@ -253,7 +299,7 @@ func appendEnbCells(nbIdentity *entities.NbIdentity, cells []*entities.ServedCel
 			return pairs, rNibErr
 		}
 		pairs = append(pairs, key, cellData)
-		key, rNibErr = common.ValidateAndBuildCellNamePciKey(nbIdentity.InventoryName, cell.GetPci())
+		key, rNibErr = common.ValidateAndBuildCellNamePciKey(inventoryName, cell.GetPci())
 		if rNibErr != nil {
 			return pairs, rNibErr
 		}
@@ -262,7 +308,7 @@ func appendEnbCells(nbIdentity *entities.NbIdentity, cells []*entities.ServedCel
 	return pairs, nil
 }
 
-func appendGnbCells(nbIdentity *entities.NbIdentity, cells []*entities.ServedNRCell, pairs []interface{}) ([]interface{}, error) {
+func appendGnbCells(inventoryName string, 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)
@@ -274,7 +320,7 @@ func appendGnbCells(nbIdentity *entities.NbIdentity, cells []*entities.ServedNRC
 			return pairs, rNibErr
 		}
 		pairs = append(pairs, key, cellData)
-		key, rNibErr = common.ValidateAndBuildCellNamePciKey(nbIdentity.InventoryName, cell.GetServedNrCellInformation().GetNrPci())
+		key, rNibErr = common.ValidateAndBuildCellNamePciKey(inventoryName, cell.GetServedNrCellInformation().GetNrPci())
 		if rNibErr != nil {
 			return pairs, rNibErr
 		}