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

diff --git a/E2Manager/services/rnib_data_service.go b/E2Manager/services/rnib_data_service.go
index e2b5dc4..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.
@@ -59,6 +60,8 @@ type RNibDataService interface {
 	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 {
@@ -186,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
@@ -392,6 +395,24 @@ func (w *rNibDataService) AddEnb(nodebInfo *entities.NodebInfo) error {
 	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
+	})
+
+	return err
+}
+
 func (w *rNibDataService) retry(rnibFunc string, f func() error) (err error) {
 	attempts := w.maxAttempts