X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fservices%2Frnib_data_service.go;h=5bb181c123b32733798d4f72b0ce42a6767635c2;hb=0fb24ff00209041b316352327e2c73b699943131;hp=e96ba488315866bbf7a439ca0b3e25777d41d8af;hpb=db0380732b248c2343c95cdd56b33a50b3383d66;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/services/rnib_data_service.go b/E2Manager/services/rnib_data_service.go
index e96ba48..5bb181c 100644
--- a/E2Manager/services/rnib_data_service.go
+++ b/E2Manager/services/rnib_data_service.go
@@ -1,6 +1,7 @@
 //
 // Copyright 2019 AT&T Intellectual Property
 // Copyright 2019 Nokia
+// Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -31,8 +32,9 @@ import (
 )
 
 type RNibDataService interface {
-	SaveNodeb(nbIdentity *entities.NbIdentity, nb *entities.NodebInfo) error
+	SaveNodeb(nodebInfo *entities.NodebInfo) error
 	UpdateNodebInfo(nodebInfo *entities.NodebInfo) error
+	UpdateNodebInfoAndPublish(nodebInfo *entities.NodebInfo) error
 	SaveRanLoadInformation(inventoryName string, ranLoadInformation *entities.RanLoadInformation) error
 	GetNodeb(ranName string) (*entities.NodebInfo, error)
 	GetListNodebIds() ([]*entities.NbIdentity, error)
@@ -52,28 +54,56 @@ type RNibDataService interface {
 	GetGeneralConfiguration() (*entities.GeneralConfiguration, error)
 	UpdateNodebInfoOnConnectionStatusInversion(nodebInfo *entities.NodebInfo, event 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
+	AddNbIdentity(nodeType entities.Node_Type, nbIdentity *entities.NbIdentity) error
+	RemoveNbIdentity(nodeType entities.Node_Type, nbIdentity *entities.NbIdentity) error
+	AddEnb(nodebInfo *entities.NodebInfo) error
+	UpdateNbIdentity(nodeType entities.Node_Type, oldNbIdentities *entities.NbIdentity, newNbIdentities *entities.NbIdentity) error
+	UpdateNbIdentities(nodeType entities.Node_Type, oldNbIdentities []*entities.NbIdentity, newNbIdentities []*entities.NbIdentity) error
 }
 
 type rNibDataService struct {
-	logger                    *logger.Logger
-	rnibReader                reader.RNibReader
-	rnibWriter                rNibWriter.RNibWriter
-	maxAttempts               int
-	retryInterval             time.Duration
-	stateChangeMessageChannel string
+	logger        *logger.Logger
+	rnibReader    reader.RNibReader
+	rnibWriter    rNibWriter.RNibWriter
+	maxAttempts   int
+	retryInterval time.Duration
 }
 
 func NewRnibDataService(logger *logger.Logger, config *configuration.Configuration, rnibReader reader.RNibReader, rnibWriter rNibWriter.RNibWriter) *rNibDataService {
 	return &rNibDataService{
-		logger:                    logger,
-		rnibReader:                rnibReader,
-		rnibWriter:                rnibWriter,
-		maxAttempts:               config.MaxRnibConnectionAttempts,
-		retryInterval:             time.Duration(config.RnibRetryIntervalMs) * time.Millisecond,
-		stateChangeMessageChannel: config.StateChangeMessageChannel,
+		logger:        logger,
+		rnibReader:    rnibReader,
+		rnibWriter:    rnibWriter,
+		maxAttempts:   config.MaxRnibConnectionAttempts,
+		retryInterval: time.Duration(config.RnibRetryIntervalMs) * time.Millisecond,
 	}
 }
 
+func (w *rNibDataService) AddNbIdentity(nodeType entities.Node_Type, nbIdentity *entities.NbIdentity) error {
+	w.logger.Infof("#RnibDataService.AddNbIdentity - nbIdentity: %s", nbIdentity)
+
+	err := w.retry("AddNbIdentity", func() (err error) {
+		err = w.rnibWriter.AddNbIdentity(nodeType, nbIdentity)
+		return
+	})
+
+	return err
+}
+
+func (w *rNibDataService) RemoveNbIdentity(nodeType entities.Node_Type, nbIdentity *entities.NbIdentity) error{
+	w.logger.Infof("#RnibDataService.RemoveNbIdentity - nbIdentity: %s", nbIdentity)
+
+	err := w.retry("RemoveNbIdentity", func() (err error) {
+		err = w.rnibWriter.RemoveNbIdentity(nodeType, nbIdentity)
+		return
+	})
+
+	return err
+}
+
 func (w *rNibDataService) RemoveServedNrCells(inventoryName string, servedNrCells []*entities.ServedNRCell) error {
 	err := w.retry("RemoveServedNrCells", func() (err error) {
 		err = w.rnibWriter.RemoveServedNrCells(inventoryName, servedNrCells)
@@ -83,6 +113,17 @@ func (w *rNibDataService) RemoveServedNrCells(inventoryName string, servedNrCell
 	return err
 }
 
+func (w *rNibDataService) RemoveEnb(nodebInfo *entities.NodebInfo) error {
+	w.logger.Infof("#RnibDataService.RemoveEnb - nodebInfo: %s", nodebInfo)
+
+	err := w.retry("RemoveEnb", func() (err error) {
+		err = w.rnibWriter.RemoveEnb(nodebInfo)
+		return
+	})
+
+	return err
+}
+
 func (w *rNibDataService) UpdateGnbCells(nodebInfo *entities.NodebInfo, servedNrCells []*entities.ServedNRCell) error {
 	w.logger.Infof("#RnibDataService.UpdateGnbCells - nodebInfo: %s, servedNrCells: %s", nodebInfo, servedNrCells)
 
@@ -105,11 +146,22 @@ func (w *rNibDataService) UpdateNodebInfo(nodebInfo *entities.NodebInfo) error {
 	return err
 }
 
-func (w *rNibDataService) SaveNodeb(nbIdentity *entities.NbIdentity, nb *entities.NodebInfo) error {
-	w.logger.Infof("#RnibDataService.SaveNodeb - nbIdentity: %s, nodebInfo: %s", nbIdentity, nb)
+func (w *rNibDataService) UpdateNodebInfoAndPublish(nodebInfo *entities.NodebInfo) error {
+	w.logger.Infof("#RnibDataService.UpdateNodebInfoAndPublish - nodebInfo: %s", nodebInfo)
+
+	err := w.retry("UpdateNodebInfoAndPublish", func() (err error) {
+		err = w.rnibWriter.UpdateNodebInfoAndPublish(nodebInfo)
+		return
+	})
+
+	return err
+}
+
+func (w *rNibDataService) SaveNodeb(nodebInfo *entities.NodebInfo) error {
+	w.logger.Infof("#RnibDataService.SaveNodeb - nodebInfo: %s", nodebInfo)
 
 	err := w.retry("SaveNodeb", func() (err error) {
-		err = w.rnibWriter.SaveNodeb(nbIdentity, nb)
+		err = w.rnibWriter.SaveNodeb(nodebInfo)
 		return
 	})
 
@@ -137,7 +189,7 @@ func (w *rNibDataService) GetNodeb(ranName string) (*entities.NodebInfo, error)
 	})
 
 	if err == nil {
-		w.logger.Infof("#RnibDataService.GetNodeb - RAN name: %s, connection status: %s, associated E2T: %s", nodeb.RanName, nodeb.ConnectionStatus, nodeb.AssociatedE2TInstanceAddress)
+		w.logger.Infof("#RnibDataService.GetNodeb - RAN name: %s, connection status: %s, associated E2T: %s, setup from network: %t", nodeb.RanName, nodeb.ConnectionStatus, nodeb.AssociatedE2TInstanceAddress, nodeb.SetupFromNetwork)
 	}
 
 	return nodeb, err
@@ -294,6 +346,24 @@ func (w *rNibDataService) SaveGeneralConfiguration(config *entities.GeneralConfi
 	return err
 }
 
+func (w *rNibDataService) RemoveServedCells(inventoryName string, servedCells []*entities.ServedCellInfo) error {
+	err := w.retry("RemoveServedCells", func() (err error) {
+		err = w.rnibWriter.RemoveServedCells(inventoryName, servedCells)
+		return
+	})
+
+	return err
+}
+
+func (w *rNibDataService) UpdateEnb(nodebInfo *entities.NodebInfo, servedCells []*entities.ServedCellInfo) error {
+	err := w.retry("UpdateEnb", func() (err error) {
+		err = w.rnibWriter.UpdateEnb(nodebInfo, servedCells)
+		return
+	})
+
+	return err
+}
+
 func (w *rNibDataService) PingRnib() bool {
 	err := w.retry("GetListNodebIds", func() (err error) {
 		_, err = w.rnibReader.GetListNodebIds()
@@ -304,10 +374,39 @@ func (w *rNibDataService) PingRnib() bool {
 }
 
 func (w *rNibDataService) UpdateNodebInfoOnConnectionStatusInversion(nodebInfo *entities.NodebInfo, event string) error {
-	w.logger.Infof("#RnibDataService.UpdateNodebInfoOnConnectionStatusInversion - nodebInfo: %s", nodebInfo)
+	w.logger.Infof("#RnibDataService.UpdateNodebInfoOnConnectionStatusInversion - event: %s, nodebInfo: %s", event, nodebInfo)
 
 	err := w.retry("UpdateNodebInfoOnConnectionStatusInversion", func() (err error) {
-		err = w.rnibWriter.UpdateNodebInfoOnConnectionStatusInversion(nodebInfo, w.stateChangeMessageChannel, event)
+		err = w.rnibWriter.UpdateNodebInfoOnConnectionStatusInversion(nodebInfo, event)
+		return
+	})
+
+	return err
+}
+
+func (w *rNibDataService) AddEnb(nodebInfo *entities.NodebInfo) error {
+	w.logger.Infof("#RnibDataService.AddEnb - nodebInfo: %s", nodebInfo)
+
+	err := w.retry("AddEnb", func() (err error) {
+		err = w.rnibWriter.AddEnb(nodebInfo)
+		return
+	})
+
+	return err
+}
+
+func (w *rNibDataService) UpdateNbIdentity(nodeType entities.Node_Type, oldNbIdentity *entities.NbIdentity, newNbIdentity *entities.NbIdentity) error {
+	err := w.retry("UpdateNbIdentities", func() (err error) {
+		err = w.rnibWriter.UpdateNbIdentities(nodeType, []*entities.NbIdentity{oldNbIdentity}, []*entities.NbIdentity{newNbIdentity})
+		return
+	})
+
+	return err
+}
+
+func (w *rNibDataService) UpdateNbIdentities(nodeType entities.Node_Type, oldNbIdentities []*entities.NbIdentity, newNbIdentities []*entities.NbIdentity) error {
+	err := w.retry("UpdateNbIdentities", func() (err error) {
+		err = w.rnibWriter.UpdateNbIdentities(nodeType, oldNbIdentities, newNbIdentities)
 		return
 	})