X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2FrNibWriter%2FrNibWriter.go;h=71913bf0cd5fe546f26a0a7e9469572e0d062d60;hb=refs%2Fchanges%2F15%2F4315%2F1;hp=a44f38822cf10cf53144f48314d2318894dae075;hpb=d916e2aef4c415d9865643fafa8c181a9fdfd65b;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/rNibWriter/rNibWriter.go b/E2Manager/rNibWriter/rNibWriter.go
index a44f388..71913bf 100644
--- 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,17 +52,18 @@ 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
+	SaveGeneralConfiguration(config *entities.GeneralConfiguration) 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)
 	err := w.sdl.Remove(cellKeysToRemove)
@@ -67,28 +75,47 @@ func (w *rNibWriterInstance) RemoveServedNrCells(inventoryName string, servedNrC
 	return nil
 }
 
+func (w *rNibWriterInstance) SaveGeneralConfiguration(config *entities.GeneralConfiguration) error {
+
+	err := w.SaveWithKeyAndMarshal(common.BuildGeneralConfigurationKey(), config)
+
+	if err != nil {
+		return common.NewInternalError(err)
+	}
+
+	return nil
+}
+
 /*
 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) 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
 		}
@@ -101,13 +128,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,10 +162,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)
 	}
@@ -315,6 +352,46 @@ func (w *rNibWriterInstance) RemoveE2TInstance(address string) error {
 	return nil
 }
 
+func (w *rNibWriterInstance) SaveWithKeyAndMarshal(key string, entity interface{}) error {
+
+	data, err := json.Marshal(entity)
+
+	if err != nil {
+		return common.NewInternalError(err)
+	}
+
+	var pairs []interface{}
+	pairs = append(pairs, key, data)
+
+	err = w.sdl.Set(pairs)
+
+	if err != nil {
+		return common.NewInternalError(err)
+	}
+
+	return nil
+}
+
+/*
+UpdateNodebInfoOnConnectionStatusInversion...
+*/
+func (w *rNibWriterInstance) UpdateNodebInfoOnConnectionStatusInversion(nodebInfo *entities.NodebInfo, stateChangeMessageChannel string, event string) error {
+
+	pairs, err := buildUpdateNodebInfoPairs(nodebInfo)
+
+	if err != nil {
+		return err
+	}
+
+	err = w.sdl.SetAndPublish([]string{stateChangeMessageChannel, event}, pairs)
+
+	if err != nil {
+		return common.NewInternalError(err)
+	}
+
+	return nil
+}
+
 /*
 Close the writer
 */