Squash-merging e2ap-v2.0 branch
[ric-plt/e2mgr.git] / E2Manager / handlers / rmrmsghandlers / e2_setup_request_notification_handler_test.go
index 199d7e1..aff0ebb 100644 (file)
@@ -1,6 +1,7 @@
 //
 // Copyright 2019 AT&T Intellectual Property
 // Copyright 2019 Nokia
+// Copyright (c) 2022 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.
@@ -28,47 +29,71 @@ import (
        "e2mgr/rmrCgo"
        "e2mgr/services"
        "e2mgr/tests"
+       "e2mgr/utils"
        "encoding/xml"
        "errors"
+       "testing"
+
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
        "github.com/stretchr/testify/assert"
        "github.com/stretchr/testify/mock"
-       "io/ioutil"
-       "path/filepath"
-       "testing"
 )
 
 const (
        e2tInstanceFullAddress                   = "10.0.2.15:9999"
        e2SetupMsgPrefix                         = e2tInstanceFullAddress + "|"
-       nodebRanName                             = "gnb:310-410-b5c67788"
-       GnbSetupRequestXmlPath                   = "../../tests/resources/setupRequest_gnb.xml"
-       EnGnbSetupRequestXmlPath                 = "../../tests/resources/setupRequest_en-gNB.xml"
-       NgEnbSetupRequestXmlPath                 = "../../tests/resources/setupRequest_ng-eNB.xml"
-       EnbSetupRequestXmlPath                   = "../../tests/resources/setupRequest_enb.xml"
-       GnbWithoutFunctionsSetupRequestXmlPath   = "../../tests/resources/setupRequest_gnb_without_functions.xml"
-       E2SetupFailureResponseWithMiscCause      = "<E2AP-PDU><unsuccessfulOutcome><procedureCode>1</procedureCode><criticality><reject/></criticality><value><E2setupFailure><protocolIEs><E2setupFailureIEs><id>1</id><criticality><ignore/></criticality><value><Cause><misc><om-intervention/></misc></Cause></value></E2setupFailureIEs><E2setupFailureIEs><id>31</id><criticality><ignore/></criticality><value><TimeToWait><v60s/></TimeToWait></value></E2setupFailureIEs></protocolIEs></E2setupFailure></value></unsuccessfulOutcome></E2AP-PDU>"
-       E2SetupFailureResponseWithTransportCause = "<E2AP-PDU><unsuccessfulOutcome><procedureCode>1</procedureCode><criticality><reject/></criticality><value><E2setupFailure><protocolIEs><E2setupFailureIEs><id>1</id><criticality><ignore/></criticality><value><Cause><transport><transport-resource-unavailable/></transport></Cause></value></E2setupFailureIEs><E2setupFailureIEs><id>31</id><criticality><ignore/></criticality><value><TimeToWait><v60s/></TimeToWait></value></E2setupFailureIEs></protocolIEs></E2setupFailure></value></unsuccessfulOutcome></E2AP-PDU>"
+       gnbNodebRanName                          = "gnb:310-410-b5c67788"
+       enbNodebRanName                          = "enB_macro:P310-410-b5c67788"
+       GnbSetupRequestXmlPath                   = "../../tests/resources/setupRequest/setupRequest_gnb.xml"
+       GnbWithZeroFunctionsSetupRequestXmlPath  = "../../tests/resources/setupRequest/setupRequest_gnb_with_zero_functions.xml"
+       EnGnbSetupRequestXmlPath                 = "../../tests/resources/setupRequest/setupRequest_en-gNB.xml"
+       NgEnbSetupRequestXmlPath                 = "../../tests/resources/setupRequest/setupRequest_ng-eNB.xml"
+       EnbSetupRequestXmlPath                   = "../../tests/resources/setupRequest/setupRequest_enb.xml"
+       GnbWithoutFunctionsSetupRequestXmlPath   = "../../tests/resources/setupRequest/setupRequest_gnb_without_functions.xml"
+       E2SetupFailureResponseWithMiscCause      = "<E2AP-PDU><unsuccessfulOutcome><procedureCode>1</procedureCode><criticality><reject/></criticality><value><E2setupFailure><protocolIEs><E2setupFailureIEs><id>49</id><criticality><ignore/></criticality><value><TransactionID>1</TransactionID></value></E2setupFailureIEs><E2setupFailureIEs><id>1</id><criticality><ignore/></criticality><value><Cause><misc><om-intervention/></misc></Cause></value></E2setupFailureIEs><E2setupFailureIEs><id>31</id><criticality><ignore/></criticality><value><TimeToWait><v60s/></TimeToWait></value></E2setupFailureIEs></protocolIEs></E2setupFailure></value></unsuccessfulOutcome></E2AP-PDU>"
+       E2SetupFailureResponseWithTransportCause = "<E2AP-PDU><unsuccessfulOutcome><procedureCode>1</procedureCode><criticality><reject/></criticality><value><E2setupFailure><protocolIEs><E2setupFailureIEs><id>49</id><criticality><ignore/></criticality><value><TransactionID>1</TransactionID></value></E2setupFailureIEs><E2setupFailureIEs><id>1</id><criticality><ignore/></criticality><value><Cause><transport><transport-resource-unavailable/></transport></Cause></value></E2setupFailureIEs><E2setupFailureIEs><id>31</id><criticality><ignore/></criticality><value><TimeToWait><v60s/></TimeToWait></value></E2setupFailureIEs></protocolIEs></E2setupFailure></value></unsuccessfulOutcome></E2AP-PDU>"
+       E2SetupFailureResponseWithRicCause       = "<E2AP-PDU><unsuccessfulOutcome><procedureCode>1</procedureCode><criticality><reject/></criticality><value><E2setupFailure><protocolIEs><E2setupFailureIEs><id>49</id><criticality><ignore/></criticality><value><TransactionID>1</TransactionID></value></E2setupFailureIEs><E2setupFailureIEs><id>1</id><criticality><ignore/></criticality><value><Cause><ricRequest><request-id-unknown/></ricRequest></Cause></value></E2setupFailureIEs><E2setupFailureIEs><id>31</id><criticality><ignore/></criticality><value><TimeToWait><v60s/></TimeToWait></value></E2setupFailureIEs></protocolIEs></E2setupFailure></value></unsuccessfulOutcome></E2AP-PDU>"
        StateChangeMessageChannel                = "RAN_CONNECTION_STATUS_CHANGE"
 )
 
-func readXmlFile(t *testing.T, xmlPath string) []byte {
-       path, err := filepath.Abs(xmlPath)
-       if err != nil {
-               t.Fatal(err)
-       }
-       xmlAsBytes, err := ioutil.ReadFile(path)
-       if err != nil {
-               t.Fatal(err)
-       }
+func initMocks(t *testing.T) (*E2SetupRequestNotificationHandler, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.RmrMessengerMock, *mocks.E2TInstancesManagerMock, *mocks.RoutingManagerClientMock, managers.RanListManager) {
+       logger := tests.InitLog(t)
+       config := &configuration.Configuration{
+               RnibRetryIntervalMs:       10,
+               MaxRnibConnectionAttempts: 3,
+               RnibWriter: configuration.RnibWriterConfig{
+                       StateChangeMessageChannel: StateChangeMessageChannel,
+               },
+               GlobalRicId: struct {
+                       RicId string
+                       Mcc   string
+                       Mnc   string
+               }{Mcc: "327", Mnc: "94", RicId: "AACCE"}}
+       rmrMessengerMock := &mocks.RmrMessengerMock{}
+       rmrSender := tests.InitRmrSender(rmrMessengerMock, logger)
+       readerMock := &mocks.RnibReaderMock{}
+       writerMock := &mocks.RnibWriterMock{}
+       routingManagerClientMock := &mocks.RoutingManagerClientMock{}
+       rnibDataService := services.NewRnibDataService(logger, config, readerMock, writerMock)
+       e2tInstancesManagerMock := &mocks.E2TInstancesManagerMock{}
+       ranListManager := managers.NewRanListManager(logger, rnibDataService)
+       ranAlarmService := services.NewRanAlarmService(logger, config)
+       ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(logger, rnibDataService, ranListManager, ranAlarmService)
+       e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManagerMock, routingManagerClientMock, ranConnectStatusChangeManager)
+       handler := NewE2SetupRequestNotificationHandler(logger, config, e2tInstancesManagerMock, rmrSender, rnibDataService, e2tAssociationManager, ranConnectStatusChangeManager, ranListManager)
+       return handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock, ranListManager
+}
 
-       return xmlAsBytes
+func getMbuf(ranName string, msgType int, payloadStr string, request *models.NotificationRequest) *rmrCgo.MBuf {
+       payload := []byte(payloadStr)
+       mbuf := rmrCgo.NewMBuf(msgType, len(payload), ranName, &payload, &request.TransactionId, request.GetMsgSrc())
+       return mbuf
 }
 
 func TestParseGnbSetupRequest_Success(t *testing.T) {
-       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
-       handler, _, _, _, _, _ := initMocks(t)
+       xmlGnb := utils.ReadXmlFile(t, GnbSetupRequestXmlPath)
+       handler, _, _, _, _, _, _ := initMocks(t)
        prefBytes := []byte(e2SetupMsgPrefix)
        request, _, err := handler.parseSetupRequest(append(prefBytes, xmlGnb...))
        assert.Equal(t, "02F829", request.GetPlmnId())
@@ -77,8 +102,8 @@ func TestParseGnbSetupRequest_Success(t *testing.T) {
 }
 
 func TestParseEnGnbSetupRequest_Success(t *testing.T) {
-       enGnbXml := readXmlFile(t, EnGnbSetupRequestXmlPath)
-       handler, _, _, _, _, _ := initMocks(t)
+       enGnbXml := utils.ReadXmlFile(t, EnGnbSetupRequestXmlPath)
+       handler, _, _, _, _, _, _ := initMocks(t)
        prefBytes := []byte(e2SetupMsgPrefix)
        request, _, err := handler.parseSetupRequest(append(prefBytes, enGnbXml...))
        assert.Equal(t, "131014", request.GetPlmnId())
@@ -87,8 +112,8 @@ func TestParseEnGnbSetupRequest_Success(t *testing.T) {
 }
 
 func TestParseNgEnbSetupRequest_Success(t *testing.T) {
-       ngEnbXml := readXmlFile(t, NgEnbSetupRequestXmlPath)
-       handler, _, _, _, _, _ := initMocks(t)
+       ngEnbXml := utils.ReadXmlFile(t, NgEnbSetupRequestXmlPath)
+       handler, _, _, _, _, _, _ := initMocks(t)
        prefBytes := []byte(e2SetupMsgPrefix)
        request, _, err := handler.parseSetupRequest(append(prefBytes, ngEnbXml...))
        assert.Equal(t, "131014", request.GetPlmnId())
@@ -97,8 +122,8 @@ func TestParseNgEnbSetupRequest_Success(t *testing.T) {
 }
 
 func TestParseEnbSetupRequest_Success(t *testing.T) {
-       enbXml := readXmlFile(t, EnbSetupRequestXmlPath)
-       handler, _, _, _, _, _ := initMocks(t)
+       enbXml := utils.ReadXmlFile(t, EnbSetupRequestXmlPath)
+       handler, _, _, _, _, _, _ := initMocks(t)
        prefBytes := []byte(e2SetupMsgPrefix)
        request, _, err := handler.parseSetupRequest(append(prefBytes, enbXml...))
        assert.Equal(t, "6359AB", request.GetPlmnId())
@@ -107,8 +132,8 @@ func TestParseEnbSetupRequest_Success(t *testing.T) {
 }
 
 func TestParseSetupRequest_PipFailure(t *testing.T) {
-       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
-       handler, _, _, _, _, _ := initMocks(t)
+       xmlGnb := utils.ReadXmlFile(t, GnbSetupRequestXmlPath)
+       handler, _, _, _, _, _, _ := initMocks(t)
        prefBytes := []byte("10.0.2.15:9999")
        request, _, err := handler.parseSetupRequest(append(prefBytes, xmlGnb...))
        assert.Nil(t, request)
@@ -117,7 +142,7 @@ func TestParseSetupRequest_PipFailure(t *testing.T) {
 }
 
 func TestParseSetupRequest_UnmarshalFailure(t *testing.T) {
-       handler, _, _, _, _, _ := initMocks(t)
+       handler, _, _, _, _, _, _ := initMocks(t)
        prefBytes := []byte(e2SetupMsgPrefix)
        request, _, err := handler.parseSetupRequest(append(prefBytes, 1, 2, 3))
        assert.Nil(t, request)
@@ -125,11 +150,107 @@ func TestParseSetupRequest_UnmarshalFailure(t *testing.T) {
        assert.EqualError(t, err, "#E2SetupRequestNotificationHandler.parseSetupRequest - Error unmarshalling E2 Setup Request payload: 31302e302e322e31353a393939397c010203")
 }
 
+func TestE2SetupRequestNotificationHandler_HandleParseError(t *testing.T) {
+       xmlGnb := utils.ReadXmlFile(t, GnbSetupRequestXmlPath)
+       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock, _ := initMocks(t)
+       readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
+       notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte("invalid_prefix"), xmlGnb...)}
+       handler.Handle(notificationRequest)
+       readerMock.AssertNotCalled(t, "GetNodeb", mock.Anything)
+       writerMock.AssertNotCalled(t, "SaveNodeb", mock.Anything, mock.Anything)
+       routingManagerClientMock.AssertNotCalled(t, "AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything)
+       writerMock.AssertNotCalled(t, "UpdateNodebInfo", mock.Anything)
+       e2tInstancesManagerMock.AssertNotCalled(t, "AddRansToInstance", mock.Anything, mock.Anything)
+       rmrMessengerMock.AssertNotCalled(t, "SendMsg", mock.Anything, mock.Anything)
+}
+
+func TestE2SetupRequestNotificationHandler_HandleUnmarshalError(t *testing.T) {
+       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock, _ := initMocks(t)
+       readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
+       notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), "xmlGnb"...)}
+       handler.Handle(notificationRequest)
+       readerMock.AssertNotCalled(t, "GetNodeb", mock.Anything)
+       writerMock.AssertNotCalled(t, "SaveNodeb", mock.Anything, mock.Anything)
+       routingManagerClientMock.AssertNotCalled(t, "AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything)
+       writerMock.AssertNotCalled(t, "UpdateNodebInfo", mock.Anything)
+       e2tInstancesManagerMock.AssertNotCalled(t, "AddRansToInstance", mock.Anything, mock.Anything)
+       rmrMessengerMock.AssertNotCalled(t, "SendMsg", mock.Anything, mock.Anything)
+}
+
+func TestE2SetupRequestNotificationHandler_ConvertTo20BitStringError(t *testing.T) {
+       xmlEnGnb := utils.ReadXmlFile(t, EnGnbSetupRequestXmlPath)
+       logger := tests.InitLog(t)
+       config := &configuration.Configuration{
+               RnibRetryIntervalMs:       10,
+               MaxRnibConnectionAttempts: 3,
+               RnibWriter: configuration.RnibWriterConfig{
+                       StateChangeMessageChannel: StateChangeMessageChannel,
+               },
+               GlobalRicId: struct {
+                       RicId string
+                       Mcc   string
+                       Mnc   string
+               }{Mcc: "327", Mnc: "94", RicId: "10011001101010101011"}}
+       rmrMessengerMock := &mocks.RmrMessengerMock{}
+       rmrSender := tests.InitRmrSender(rmrMessengerMock, logger)
+       readerMock := &mocks.RnibReaderMock{}
+       writerMock := &mocks.RnibWriterMock{}
+       routingManagerClientMock := &mocks.RoutingManagerClientMock{}
+       rnibDataService := services.NewRnibDataService(logger, config, readerMock, writerMock)
+       e2tInstancesManagerMock := &mocks.E2TInstancesManagerMock{}
+       ranListManager := managers.NewRanListManager(logger, rnibDataService)
+       ranAlarmService := services.NewRanAlarmService(logger, config)
+       ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(logger, rnibDataService, ranListManager, ranAlarmService)
+
+       e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManagerMock, routingManagerClientMock, ranConnectStatusChangeManager)
+       handler := NewE2SetupRequestNotificationHandler(logger, config, e2tInstancesManagerMock, rmrSender, rnibDataService, e2tAssociationManager, ranConnectStatusChangeManager, ranListManager)
+       readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
+       e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil)
+       var gnb *entities.NodebInfo
+       readerMock.On("GetNodeb", mock.Anything).Return(gnb, common.NewResourceNotFoundError("Not found"))
+       writerMock.On("SaveNodeb", mock.Anything, mock.Anything).Return(nil)
+       writerMock.On("AddNbIdentity", entities.Node_GNB, mock.Anything).Return(nil)
+       writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, mock.Anything).Return(nil)
+       routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil)
+       writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil)
+       writerMock.On("UpdateNbIdentities", mock.Anything, mock.Anything, mock.Anything).Return(nil)
+       e2tInstancesManagerMock.On("AddRansToInstance", mock.Anything, mock.Anything).Return(nil)
+       var errEmpty error
+       rmrMessage := &rmrCgo.MBuf{}
+       rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(rmrMessage, errEmpty)
+       prefBytes := []byte(e2SetupMsgPrefix)
+       notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append(prefBytes, xmlEnGnb...)}
+       handler.Handle(notificationRequest)
+       readerMock.AssertCalled(t, "GetNodeb", mock.Anything)
+       e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceFullAddress)
+       writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, mock.Anything)
+       routingManagerClientMock.AssertCalled(t, "AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything)
+       writerMock.AssertCalled(t, "UpdateNodebInfo", mock.Anything)
+       e2tInstancesManagerMock.AssertCalled(t, "AddRansToInstance", mock.Anything, mock.Anything)
+       rmrMessengerMock.AssertNotCalled(t, "SendMsg", mock.Anything, mock.Anything)
+}
+
+func TestExtractionOfNodeTypeFromRanName(t *testing.T) {
+       handler, _, _, _, _, _, _ := initMocks(t)
+       validRanNames := []string{"gnb_P310_410_b5c67788", "en_gnb_P310_410_b5c67788", "ng_enB_macro_P310_410_b5c67788", "ng_enB_shortmacro_P310_410_b5c67788", "ng_enB_longmacro_P310_410_b5c67788", "enB_macro_P310_410_b5c67788", "enB_home_P310_410_b5c67788", "enB_shortmacro_P310_410_b5c67788", "enB_longmacro_P310_410_b5c67788"}
+       for _, v := range validRanNames {
+               nodeb := &entities.NodebInfo{RanName: v}
+               err := handler.setNodeTypeAndConfiguration(nodeb)
+               assert.Nil(t, err)
+       }
+       inValidRanNames := []string{"P310_410_b5c67788", "blabla_P310_410_b5c67788", "ng_enB-macro_P310_410_b5c67788", "ng_enb_shortmacro_P310_410_b5c67788", "ng_enB-longmacro_P310_410_b5c67788", "enB_new_macro_P310_410_b5c67788"}
+       for _, v := range inValidRanNames {
+               nodeb := &entities.NodebInfo{RanName: v}
+               err := handler.setNodeTypeAndConfiguration(nodeb)
+               assert.NotNil(t, err, v)
+       }
+}
+
 func TestE2SetupRequestNotificationHandler_GetGeneralConfigurationFailure(t *testing.T) {
-       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
-       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
+       xmlGnb := utils.ReadXmlFile(t, GnbSetupRequestXmlPath)
+       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock, _ := initMocks(t)
        readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{}, common.NewInternalError(errors.New("some error")))
-       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)}
+       notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)}
        handler.Handle(notificationRequest)
        rmrMessengerMock.AssertNotCalled(t, "SendMsg")
        e2tInstancesManagerMock.AssertNotCalled(t, "GetE2TInstance")
@@ -138,18 +259,12 @@ func TestE2SetupRequestNotificationHandler_GetGeneralConfigurationFailure(t *tes
        writerMock.AssertNotCalled(t, "SaveNodeb")
 }
 
-func getMbuf(msgType int, payloadStr string, request *models.NotificationRequest) *rmrCgo.MBuf {
-       payload := []byte(payloadStr)
-       mbuf := rmrCgo.NewMBuf(msgType, len(payload), nodebRanName, &payload, &request.TransactionId, request.GetMsgSrc())
-       return mbuf
-}
-
 func TestE2SetupRequestNotificationHandler_EnableRicFalse(t *testing.T) {
-       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
-       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
+       xmlGnb := utils.ReadXmlFile(t, GnbSetupRequestXmlPath)
+       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock, _ := initMocks(t)
        readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: false}, nil)
-       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)}
-       mbuf := getMbuf(rmrCgo.RIC_E2_SETUP_FAILURE, E2SetupFailureResponseWithMiscCause, notificationRequest)
+       notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)}
+       mbuf := getMbuf(gnbNodebRanName, rmrCgo.RIC_E2_SETUP_FAILURE, E2SetupFailureResponseWithMiscCause, notificationRequest)
        rmrMessengerMock.On("WhSendMsg", mbuf, true).Return(&rmrCgo.MBuf{}, nil)
        handler.Handle(notificationRequest)
        rmrMessengerMock.AssertCalled(t, "WhSendMsg", mbuf, true)
@@ -159,19 +274,53 @@ func TestE2SetupRequestNotificationHandler_EnableRicFalse(t *testing.T) {
        writerMock.AssertNotCalled(t, "SaveNodeb")
 }
 
+func TestE2SetupRequestNotificationHandler_HandleGetE2TInstanceError(t *testing.T) {
+       xmlGnb := utils.ReadXmlFile(t, GnbSetupRequestXmlPath)
+       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock, _ := initMocks(t)
+       readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
+       e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, common.NewResourceNotFoundError("Not found"))
+       prefBytes := []byte(e2SetupMsgPrefix)
+       notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append(prefBytes, xmlGnb...)}
+       handler.Handle(notificationRequest)
+       e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceFullAddress)
+       readerMock.AssertNotCalled(t, "GetNodeb", mock.Anything)
+       writerMock.AssertNotCalled(t, "SaveNodeb", mock.Anything, mock.Anything)
+       routingManagerClientMock.AssertNotCalled(t, "AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything)
+       writerMock.AssertNotCalled(t, "UpdateNodebInfo", mock.Anything)
+       e2tInstancesManagerMock.AssertNotCalled(t, "AddRansToInstance", mock.Anything, mock.Anything)
+       rmrMessengerMock.AssertNotCalled(t, "SendMsg", mock.Anything, mock.Anything)
+}
 
-func TestE2SetupRequestNotificationHandler_HandleNewRanError(t *testing.T) {
-       xml := readXmlFile(t, GnbSetupRequestXmlPath)
-       handler, readerMock, writerMock, _, e2tInstancesManagerMock, _ := initMocks(t)
+func TestE2SetupRequestNotificationHandler_HandleGetNodebError(t *testing.T) {
+       xmlGnb := utils.ReadXmlFile(t, GnbSetupRequestXmlPath)
+       handler, readerMock, writerMock, routingManagerClientMock, e2tInstancesManagerMock, rmrMessengerMock, _ := initMocks(t)
        readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
        e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil)
        var gnb *entities.NodebInfo
-       readerMock.On("GetNodeb", nodebRanName).Return(gnb, common.NewResourceNotFoundError("Not found"))
-       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xml...)}
-       nodebInfo := getExpectedNodebForNewRan(notificationRequest.Payload)
-       nbIdentity := &entities.NbIdentity{InventoryName: nodebRanName, GlobalNbId: nodebInfo.GlobalNbId}
-       writerMock.On("SaveNodeb", nbIdentity, nodebInfo).Return(common.NewInternalError(errors.New("error")))
+       readerMock.On("GetNodeb", mock.Anything).Return(gnb, common.NewInternalError(errors.New("some error")))
+       notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)}
+       handler.Handle(notificationRequest)
+       e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceFullAddress)
+       readerMock.AssertCalled(t, "GetNodeb", mock.Anything)
+       writerMock.AssertNotCalled(t, "SaveNodeb", mock.Anything, mock.Anything)
+       routingManagerClientMock.AssertNotCalled(t, "AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything)
+       writerMock.AssertNotCalled(t, "UpdateNodebInfo", mock.Anything)
+       e2tInstancesManagerMock.AssertNotCalled(t, "AddRansToInstance", mock.Anything, mock.Anything)
+       rmrMessengerMock.AssertNotCalled(t, "SendMsg", mock.Anything, mock.Anything)
+}
 
+/* New Ran UTs - BEGIN */
+
+func TestE2SetupRequestNotificationHandler_HandleNewRanSaveNodebFailure(t *testing.T) {
+       xml := utils.ReadXmlFile(t, GnbSetupRequestXmlPath)
+       handler, readerMock, writerMock, _, e2tInstancesManagerMock, _, _ := initMocks(t)
+       readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
+       e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil)
+       var gnb *entities.NodebInfo
+       readerMock.On("GetNodeb", gnbNodebRanName).Return(gnb, common.NewResourceNotFoundError("Not found"))
+       notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xml...)}
+       nodebInfo := getExpectedGnbNodebForNewRan(notificationRequest.Payload)
+       writerMock.On("SaveNodeb", nodebInfo).Return(common.NewInternalError(errors.New("error")))
        handler.Handle(notificationRequest)
 
        readerMock.AssertExpectations(t)
@@ -179,366 +328,487 @@ func TestE2SetupRequestNotificationHandler_HandleNewRanError(t *testing.T) {
        e2tInstancesManagerMock.AssertExpectations(t)
 }
 
-func testE2SetupRequestNotificationHandler_HandleNewRanSuccess(t *testing.T, xmlPath string) {
-       xml := readXmlFile(t, xmlPath)
-       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
+func TestE2SetupRequestNotificationHandler_HandleNewRan_invalidRanName(t *testing.T) {
+       xml := utils.ReadXmlFile(t, EnbSetupRequestXmlPath)
+       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, _, _ := initMocks(t)
        readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
        e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil)
-       var gnb *entities.NodebInfo
-       readerMock.On("GetNodeb", nodebRanName).Return(gnb, common.NewResourceNotFoundError("Not found"))
-       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xml...)}
-       nodebInfo := getExpectedNodebForNewRan(notificationRequest.Payload)
-       nbIdentity := &entities.NbIdentity{InventoryName: nodebRanName, GlobalNbId: nodebInfo.GlobalNbId}
-       writerMock.On("SaveNodeb", nbIdentity, nodebInfo).Return(nil)
-       updatedNodebInfo := *nodebInfo
-       updatedNodebInfo.ConnectionStatus = entities.ConnectionStatus_CONNECTED
-       writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNodebInfo, StateChangeMessageChannel, nodebRanName+"_CONNECTED").Return(nil)
-       routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil)
-       updatedNodebInfo2 := *nodebInfo
-       updatedNodebInfo2.ConnectionStatus = entities.ConnectionStatus_CONNECTED
-       updatedNodebInfo2.AssociatedE2TInstanceAddress = e2tInstanceFullAddress
-       writerMock.On("UpdateNodebInfo", &updatedNodebInfo2).Return(nil)
-       e2tInstancesManagerMock.On("AddRansToInstance", e2tInstanceFullAddress, []string{nodebRanName}).Return(nil)
-       rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(&rmrCgo.MBuf{}, nil)
-
+       var enb *entities.NodebInfo
+       invalidEnbRanName := "enB-macro:P310-410-b5c67788"
+       readerMock.On("GetNodeb", invalidEnbRanName).Return(enb, common.NewResourceNotFoundError("Not found"))
+       notificationRequest := &models.NotificationRequest{RanName: invalidEnbRanName, Payload: append([]byte(e2SetupMsgPrefix), xml...)}
+       mbuf := getMbuf(invalidEnbRanName, rmrCgo.RIC_E2_SETUP_FAILURE, E2SetupFailureResponseWithRicCause, notificationRequest)
+       rmrMessengerMock.On("WhSendMsg", mbuf, true).Return(&rmrCgo.MBuf{}, nil)
        handler.Handle(notificationRequest)
 
        readerMock.AssertExpectations(t)
        writerMock.AssertExpectations(t)
+       rmrMessengerMock.AssertCalled(t, "WhSendMsg", mbuf, true)
        e2tInstancesManagerMock.AssertExpectations(t)
 }
 
-func TestE2SetupRequestNotificationHandler_HandleUpdateNodebInfoOnConnectionStatusInversionFailureForNewGnb(t *testing.T) {
-       xml := readXmlFile(t, GnbSetupRequestXmlPath)
-       handler, readerMock, writerMock, _, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
+func TestE2SetupRequestNotificationHandler_HandleNewRanAddNbIdentityFailure(t *testing.T) {
+       xml := utils.ReadXmlFile(t, GnbSetupRequestXmlPath)
+       handler, readerMock, writerMock, _, e2tInstancesManagerMock, _, _ := initMocks(t)
        readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
        e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil)
        var gnb *entities.NodebInfo
-       readerMock.On("GetNodeb", nodebRanName).Return(gnb, common.NewResourceNotFoundError("Not found"))
-       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xml...)}
-       nodebInfo := getExpectedNodebForNewRan(notificationRequest.Payload)
-       nbIdentity := &entities.NbIdentity{InventoryName: nodebRanName, GlobalNbId: nodebInfo.GlobalNbId}
-       writerMock.On("SaveNodeb", nbIdentity, nodebInfo).Return(nil)
+       readerMock.On("GetNodeb", gnbNodebRanName).Return(gnb, common.NewResourceNotFoundError("Not found"))
+       notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xml...)}
+       nodebInfo := getExpectedGnbNodebForNewRan(notificationRequest.Payload)
+       writerMock.On("SaveNodeb", nodebInfo).Return(nil)
+       nbIdentity := &entities.NbIdentity{InventoryName: gnbNodebRanName, GlobalNbId: nodebInfo.GlobalNbId}
+       writerMock.On("AddNbIdentity", entities.Node_GNB, nbIdentity).Return(common.NewInternalError(errors.New("error")))
+       handler.Handle(notificationRequest)
+       readerMock.AssertExpectations(t)
+       writerMock.AssertExpectations(t)
+       e2tInstancesManagerMock.AssertExpectations(t)
+}
+
+func TestE2SetupRequestNotificationHandler_HandleNewRanRoutingManagerError(t *testing.T) {
+       xmlGnb := utils.ReadXmlFile(t, GnbSetupRequestXmlPath)
+
+       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock, _ := initMocks(t)
+       readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
+       e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil)
+       readerMock.On("GetNodeb", gnbNodebRanName).Return(&entities.NodebInfo{}, common.NewResourceNotFoundError("Not found"))
+       notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)}
+       nodebInfo := getExpectedGnbNodebForNewRan(notificationRequest.Payload)
+       writerMock.On("SaveNodeb", nodebInfo).Return(nil)
+       nbIdentity := &entities.NbIdentity{InventoryName: gnbNodebRanName, GlobalNbId: nodebInfo.GlobalNbId}
+       writerMock.On("AddNbIdentity", entities.Node_GNB, nbIdentity).Return(nil)
        updatedNodebInfo := *nodebInfo
+       routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(errors.New("association error"))
+       updatedNodebInfo.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
+       writerMock.On("UpdateNodebInfo", &updatedNodebInfo).Return(nil)
+       writerMock.On("UpdateNbIdentities", mock.Anything, mock.Anything, mock.Anything).Return(nil)
+       var errEmpty error
+       mbuf := getMbuf(gnbNodebRanName, rmrCgo.RIC_E2_SETUP_FAILURE, E2SetupFailureResponseWithTransportCause, notificationRequest)
+       rmrMessengerMock.On("WhSendMsg", mbuf, true).Return(&rmrCgo.MBuf{}, errEmpty)
+       handler.Handle(notificationRequest)
+       readerMock.AssertExpectations(t)
+       e2tInstancesManagerMock.AssertExpectations(t)
+       writerMock.AssertExpectations(t)
+       routingManagerClientMock.AssertCalled(t, "AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything)
+       e2tInstancesManagerMock.AssertExpectations(t)
+       rmrMessengerMock.AssertCalled(t, "WhSendMsg", mbuf, true)
+}
+
+func testE2SetupRequestNotificationHandler_HandleNewRanSuccess(t *testing.T, xmlPath string, nodeType entities.Node_Type) {
+       xml := utils.ReadXmlFile(t, xmlPath)
+       var ranName string
+       if nodeType == entities.Node_GNB {
+               ranName = gnbNodebRanName
+       } else {
+               ranName = enbNodebRanName
+       }
+       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock, _ := initMocks(t)
+       readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
+       e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil)
+       var gnb *entities.NodebInfo
+       readerMock.On("GetNodeb", ranName).Return(gnb, common.NewResourceNotFoundError("Not found"))
+       notificationRequest := &models.NotificationRequest{RanName: ranName, Payload: append([]byte(e2SetupMsgPrefix), xml...)}
+       var expectedNodebInfo *entities.NodebInfo
+       if nodeType == entities.Node_GNB {
+               expectedNodebInfo = getExpectedGnbNodebForNewRan(notificationRequest.Payload)
+       } else {
+               expectedNodebInfo = getExpectedEnbNodebForNewRan(notificationRequest.Payload)
+       }
+       writerMock.On("SaveNodeb", expectedNodebInfo).Return(nil)
+       nbIdentity := &entities.NbIdentity{InventoryName: ranName, GlobalNbId: expectedNodebInfo.GlobalNbId}
+       writerMock.On("AddNbIdentity", nodeType, nbIdentity).Return(nil)
+       updatedNodebInfo := *expectedNodebInfo
        updatedNodebInfo.ConnectionStatus = entities.ConnectionStatus_CONNECTED
-       writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNodebInfo, StateChangeMessageChannel, nodebRanName+"_CONNECTED").Return(common.NewInternalError(errors.New("some error")))
+       writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNodebInfo, ranName+"_CONNECTED").Return(nil)
+       routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil)
+       updatedNodebInfo2 := *expectedNodebInfo
+       updatedNodebInfo2.ConnectionStatus = entities.ConnectionStatus_CONNECTED
+       updatedNodebInfo2.AssociatedE2TInstanceAddress = e2tInstanceFullAddress
+       writerMock.On("UpdateNodebInfo", &updatedNodebInfo2).Return(nil)
+
+       newNbIdentity := &entities.NbIdentity{InventoryName: ranName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, GlobalNbId: expectedNodebInfo.GlobalNbId}
+       writerMock.On("UpdateNbIdentities", updatedNodebInfo2.GetNodeType(), []*entities.NbIdentity{nbIdentity}, []*entities.NbIdentity{newNbIdentity}).Return(nil)
+
+       e2tInstancesManagerMock.On("AddRansToInstance", e2tInstanceFullAddress, []string{ranName}).Return(nil)
+       rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(&rmrCgo.MBuf{}, nil)
+
        handler.Handle(notificationRequest)
+
        readerMock.AssertExpectations(t)
        writerMock.AssertExpectations(t)
-       routingManagerClientMock.AssertExpectations(t)
        e2tInstancesManagerMock.AssertExpectations(t)
 }
 
 func TestE2SetupRequestNotificationHandler_HandleNewGnbSuccess(t *testing.T) {
-       testE2SetupRequestNotificationHandler_HandleNewRanSuccess(t, GnbSetupRequestXmlPath)
+       testE2SetupRequestNotificationHandler_HandleNewRanSuccess(t, GnbSetupRequestXmlPath, entities.Node_GNB)
 }
 
 func TestE2SetupRequestNotificationHandler_HandleNewGnbWithoutFunctionsSuccess(t *testing.T) {
-       testE2SetupRequestNotificationHandler_HandleNewRanSuccess(t, GnbWithoutFunctionsSetupRequestXmlPath)
+       testE2SetupRequestNotificationHandler_HandleNewRanSuccess(t, GnbWithoutFunctionsSetupRequestXmlPath, entities.Node_GNB)
 }
 
 func TestE2SetupRequestNotificationHandler_HandleNewEnGnbSuccess(t *testing.T) {
-       testE2SetupRequestNotificationHandler_HandleNewRanSuccess(t, EnGnbSetupRequestXmlPath)
+       testE2SetupRequestNotificationHandler_HandleNewRanSuccess(t, EnGnbSetupRequestXmlPath, entities.Node_GNB)
 }
 
 func TestE2SetupRequestNotificationHandler_HandleNewNgEnbSuccess(t *testing.T) {
-       testE2SetupRequestNotificationHandler_HandleNewRanSuccess(t, NgEnbSetupRequestXmlPath)
+       testE2SetupRequestNotificationHandler_HandleNewRanSuccess(t, NgEnbSetupRequestXmlPath, entities.Node_ENB)
 }
 
-func testE2SetupRequestNotificationHandler_HandleExistingConnectedGnbSuccess(t *testing.T, withFunctions bool) {
-       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
-       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
+func getExpectedGnbNodebForNewRan(payload []byte) *entities.NodebInfo {
+       pipInd := bytes.IndexByte(payload, '|')
+       setupRequest := &models.E2SetupRequestMessage{}
+       _ = xml.Unmarshal(utils.NormalizeXml(payload[pipInd+1:]), &setupRequest.E2APPDU)
+
+       nodeb := &entities.NodebInfo{
+               AssociatedE2TInstanceAddress: e2tInstanceFullAddress,
+               RanName:                      gnbNodebRanName,
+               SetupFromNetwork:             true,
+               NodeType:                     entities.Node_GNB,
+               Configuration: &entities.NodebInfo_Gnb{
+                       Gnb: &entities.Gnb{
+                               GnbType:      entities.GnbType_GNB,
+                               RanFunctions: setupRequest.ExtractRanFunctionsList(),
+                               NodeConfigs:  setupRequest.ExtractE2NodeConfigList(),
+                       },
+               },
+               GlobalNbId: &entities.GlobalNbId{
+                       PlmnId: setupRequest.GetPlmnId(),
+                       NbId:   setupRequest.GetNbId(),
+               },
+       }
+
+       return nodeb
+}
+
+func getExpectedEnbNodebForNewRan(payload []byte) *entities.NodebInfo {
+       pipInd := bytes.IndexByte(payload, '|')
+       setupRequest := &models.E2SetupRequestMessage{}
+       _ = xml.Unmarshal(utils.NormalizeXml(payload[pipInd+1:]), &setupRequest.E2APPDU)
+
+       nodeb := &entities.NodebInfo{
+               AssociatedE2TInstanceAddress: e2tInstanceFullAddress,
+               RanName:                      enbNodebRanName,
+               SetupFromNetwork:             true,
+               NodeType:                     entities.Node_ENB,
+               Configuration: &entities.NodebInfo_Enb{
+                       Enb: &entities.Enb{
+                               EnbType:     entities.EnbType_MACRO_ENB,
+                               NodeConfigs: setupRequest.ExtractE2NodeConfigList(),
+                       },
+               },
+               GlobalNbId: &entities.GlobalNbId{
+                       PlmnId: setupRequest.GetPlmnId(),
+                       NbId:   setupRequest.GetNbId(),
+               },
+       }
+
+       return nodeb
+}
+
+/* New Ran UTs - END */
+
+/* Existing Ran UTs - BEGIN */
+
+func getExpectedNodebForExistingRan(nodeb *entities.NodebInfo, payload []byte) *entities.NodebInfo {
+       pipInd := bytes.IndexByte(payload, '|')
+       setupRequest := &models.E2SetupRequestMessage{}
+       _ = xml.Unmarshal(utils.NormalizeXml(payload[pipInd+1:]), &setupRequest.E2APPDU)
+
+       nb := *nodeb
+
+       if nodeb.NodeType == entities.Node_ENB {
+               if e2NodeConfig := setupRequest.ExtractE2NodeConfigList(); e2NodeConfig != nil {
+                       updatedEnb := *nodeb.GetEnb()
+                       updatedEnb.NodeConfigs = e2NodeConfig
+                       nb.Configuration = &entities.NodebInfo_Enb{Enb: &updatedEnb}
+               }
+
+               return &nb
+       }
+
+       if ranFuncs := setupRequest.ExtractRanFunctionsList(); ranFuncs != nil {
+               updatedGnb := *nodeb.GetGnb()
+               updatedGnb.RanFunctions = ranFuncs
+               nb.Configuration = &entities.NodebInfo_Gnb{Gnb: &updatedGnb}
+       }
+
+       if e2NodeConfig := setupRequest.ExtractE2NodeConfigList(); e2NodeConfig != nil {
+               updatedGnb := *nodeb.GetGnb()
+               updatedGnb.RanFunctions = nb.GetGnb().RanFunctions
+               updatedGnb.NodeConfigs = e2NodeConfig
+               nb.Configuration = &entities.NodebInfo_Gnb{Gnb: &updatedGnb}
+       }
+
+       return &nb
+}
+
+func TestE2SetupRequestNotificationHandler_HandleExistingConnectedEnbSuccess(t *testing.T) {
+       xmlEnb := utils.ReadXmlFile(t, EnbSetupRequestXmlPath)
+       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock, ranListManager := initMocks(t)
+
+       oldNbIdentity := &entities.NbIdentity{InventoryName: enbNodebRanName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}}
+       readerMock.On("GetListNodebIds").Return([]*entities.NbIdentity{oldNbIdentity}, nil)
+
+       err := ranListManager.InitNbIdentityMap()
+       if err != nil {
+               t.Errorf("Error cannot init identity")
+       }
        readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
        e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil)
        var nodebInfo = &entities.NodebInfo{
-               RanName:                      nodebRanName,
+               RanName:                      enbNodebRanName,
                AssociatedE2TInstanceAddress: e2tInstanceFullAddress,
                ConnectionStatus:             entities.ConnectionStatus_CONNECTED,
-               NodeType:                     entities.Node_GNB,
-               Configuration:                &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{}},
+               NodeType:                     entities.Node_ENB,
+               Configuration:                &entities.NodebInfo_Enb{Enb: &entities.Enb{}},
        }
 
-       if withFunctions {
-               gnb := nodebInfo.GetGnb()
-               gnb.RanFunctions = []*entities.RanFunction{{RanFunctionId: 2, RanFunctionRevision: 2}}
-       }
-
-       readerMock.On("GetNodeb", nodebRanName).Return(nodebInfo, nil)
+       readerMock.On("GetNodeb", enbNodebRanName).Return(nodebInfo, nil)
        routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil)
 
-       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)}
-       gnbToUpdate := getExpectedNodebForExistingRan(*nodebInfo, notificationRequest.Payload)
-       writerMock.On("UpdateNodebInfo", gnbToUpdate).Return(nil)
-       e2tInstancesManagerMock.On("AddRansToInstance", e2tInstanceFullAddress, []string{nodebRanName}).Return(nil)
+       notificationRequest := &models.NotificationRequest{RanName: enbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlEnb...)}
+       enbToUpdate := getExpectedNodebForExistingRan(nodebInfo, notificationRequest.Payload)
+       enbToUpdate.SetupFromNetwork = true
+       newNbIdentity := &entities.NbIdentity{InventoryName: enbNodebRanName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}}
+       writerMock.On("UpdateNbIdentities", enbToUpdate.GetNodeType(), []*entities.NbIdentity{oldNbIdentity}, []*entities.NbIdentity{newNbIdentity}).Return(nil)
+       writerMock.On("UpdateNodebInfo", enbToUpdate).Return(nil)
+       e2tInstancesManagerMock.On("AddRansToInstance", e2tInstanceFullAddress, []string{enbNodebRanName}).Return(nil)
        var errEmpty error
        rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(&rmrCgo.MBuf{}, errEmpty)
        handler.Handle(notificationRequest)
        readerMock.AssertExpectations(t)
        writerMock.AssertExpectations(t)
-       writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 3)
        e2tInstancesManagerMock.AssertExpectations(t)
        rmrMessengerMock.AssertCalled(t, "SendMsg", mock.Anything, true)
 }
 
-func TestE2SetupRequestNotificationHandler_HandleExistingConnectedGnbWithoutFunctionsSuccess(t *testing.T) {
-       testE2SetupRequestNotificationHandler_HandleExistingConnectedGnbSuccess(t, false)
-}
+func TestE2SetupRequestNotificationHandler_HandleExistingDisconnectedEnbSuccess(t *testing.T) {
+       xmlEnb := utils.ReadXmlFile(t, EnbSetupRequestXmlPath)
+       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock, ranListManager := initMocks(t)
 
-func TestE2SetupRequestNotificationHandler_HandleExistingConnectedGnbWithFunctionsSuccess(t *testing.T) {
-       testE2SetupRequestNotificationHandler_HandleExistingConnectedGnbSuccess(t, true)
-}
+       oldNbIdentity := &entities.NbIdentity{InventoryName: enbNodebRanName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}}
+       readerMock.On("GetListNodebIds").Return([]*entities.NbIdentity{oldNbIdentity}, nil)
+       err := ranListManager.InitNbIdentityMap()
+       if err != nil {
+               t.Errorf("Error cannot init identity")
+       }
 
-func TestE2SetupRequestNotificationHandler_HandleExistingDisconnectedGnbSuccess(t *testing.T) {
-       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
-       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
        readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
        e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil)
        var nodebInfo = &entities.NodebInfo{
-               RanName:                      nodebRanName,
+               RanName:                      enbNodebRanName,
                AssociatedE2TInstanceAddress: e2tInstanceFullAddress,
                ConnectionStatus:             entities.ConnectionStatus_DISCONNECTED,
-               NodeType:                     entities.Node_GNB,
-               Configuration:                &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{}},
+               NodeType:                     entities.Node_ENB,
+               Configuration:                &entities.NodebInfo_Enb{Enb: &entities.Enb{}},
        }
 
-       readerMock.On("GetNodeb", nodebRanName).Return(nodebInfo, nil)
+       readerMock.On("GetNodeb", enbNodebRanName).Return(nodebInfo, nil)
        routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil)
 
-       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)}
-       gnbToUpdate := getExpectedNodebForExistingRan(*nodebInfo, notificationRequest.Payload)
-       writerMock.On("UpdateNodebInfo", gnbToUpdate).Return(nil)
-       gnbToUpdate2 := *gnbToUpdate
-       gnbToUpdate2.ConnectionStatus = entities.ConnectionStatus_CONNECTED
-       writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &gnbToUpdate2, StateChangeMessageChannel, nodebRanName+"_CONNECTED").Return(nil)
-       gnbToUpdate3 := *gnbToUpdate
-       gnbToUpdate3.ConnectionStatus = entities.ConnectionStatus_CONNECTED
-       gnbToUpdate3.AssociatedE2TInstanceAddress = e2tInstanceFullAddress
-       writerMock.On("UpdateNodebInfo", &gnbToUpdate3).Return(nil)
-       e2tInstancesManagerMock.On("AddRansToInstance", e2tInstanceFullAddress, []string{nodebRanName}).Return(nil)
+       notificationRequest := &models.NotificationRequest{RanName: enbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlEnb...)}
+       enbToUpdate := getExpectedNodebForExistingRan(nodebInfo, notificationRequest.Payload)
+
+       enbToUpdate2 := *enbToUpdate
+       enbToUpdate2.ConnectionStatus = entities.ConnectionStatus_CONNECTED
+       enbToUpdate2.SetupFromNetwork = true
+       writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &enbToUpdate2, enbNodebRanName+"_CONNECTED").Return(nil)
+
+       newNbIdentity := &entities.NbIdentity{InventoryName: enbNodebRanName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}}
+       writerMock.On("UpdateNbIdentities", enbToUpdate.GetNodeType(), []*entities.NbIdentity{oldNbIdentity}, []*entities.NbIdentity{newNbIdentity}).Return(nil)
+
+       enbToUpdate3 := *enbToUpdate
+       enbToUpdate3.ConnectionStatus = entities.ConnectionStatus_CONNECTED
+       enbToUpdate3.SetupFromNetwork = true
+       enbToUpdate3.AssociatedE2TInstanceAddress = e2tInstanceFullAddress
+       writerMock.On("UpdateNodebInfo", &enbToUpdate3).Return(nil)
+       e2tInstancesManagerMock.On("AddRansToInstance", e2tInstanceFullAddress, []string{enbNodebRanName}).Return(nil)
        var errEmpty error
-       rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(&rmrCgo.MBuf{}, errEmpty)
+       rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(&rmrCgo.MBuf{}, errEmpty)
        handler.Handle(notificationRequest)
        readerMock.AssertExpectations(t)
        writerMock.AssertExpectations(t)
-       writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2)
        e2tInstancesManagerMock.AssertExpectations(t)
+       rmrMessengerMock.AssertCalled(t, "SendMsg", mock.Anything, true)
 }
 
-func getExpectedNodebForExistingRan(nodeb entities.NodebInfo, payload []byte) *entities.NodebInfo {
-       pipInd := bytes.IndexByte(payload, '|')
-       setupRequest := &models.E2SetupRequestMessage{}
-       _ = xml.Unmarshal(normalizeXml(payload[pipInd+1:]), &setupRequest.E2APPDU)
-       nodeb.GetGnb().RanFunctions = setupRequest.ExtractRanFunctionsList()
-       return &nodeb
-}
+func testE2SetupRequestNotificationHandler_HandleExistingConnectedGnbSuccess(t *testing.T, withFunctions bool, xmlToRead string) {
+       xmlGnb := utils.ReadXmlFile(t, xmlToRead)
+       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock, ranListManager := initMocks(t)
 
-func getExpectedNodebForNewRan(payload []byte) *entities.NodebInfo {
-       pipInd := bytes.IndexByte(payload, '|')
-       setupRequest := &models.E2SetupRequestMessage{}
-       _ = xml.Unmarshal(normalizeXml(payload[pipInd+1:]), &setupRequest.E2APPDU)
+       oldNbIdentity := &entities.NbIdentity{InventoryName: gnbNodebRanName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}}
+       readerMock.On("GetListNodebIds").Return([]*entities.NbIdentity{oldNbIdentity}, nil)
+       err := ranListManager.InitNbIdentityMap()
+       if err != nil {
+               t.Errorf("Error cannot init identity")
+       }
 
-       nodeb := &entities.NodebInfo{
+       readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
+       e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil)
+       var nodebInfo = &entities.NodebInfo{
+               RanName:                      gnbNodebRanName,
                AssociatedE2TInstanceAddress: e2tInstanceFullAddress,
-               RanName:                      nodebRanName,
+               ConnectionStatus:             entities.ConnectionStatus_CONNECTED,
                NodeType:                     entities.Node_GNB,
-               Configuration: &entities.NodebInfo_Gnb{
-                       Gnb: &entities.Gnb{
-                               RanFunctions: setupRequest.ExtractRanFunctionsList(),
-                       },
-               },
-               GlobalNbId: &entities.GlobalNbId{
-                       PlmnId: setupRequest.GetPlmnId(),
-                       NbId:   setupRequest.GetNbId(),
-               },
+               Configuration:                &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{}},
        }
 
-       return nodeb
-}
+       if withFunctions {
+               gnb := nodebInfo.GetGnb()
+               gnb.RanFunctions = []*entities.RanFunction{{RanFunctionId: 2, RanFunctionRevision: 2}}
+       }
 
-func TestE2SetupRequestNotificationHandler_HandleParseError(t *testing.T) {
-       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
-       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
-       readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
-       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte("invalid_prefix"), xmlGnb...)}
-       handler.Handle(notificationRequest)
-       readerMock.AssertNotCalled(t, "GetNodeb", mock.Anything)
-       writerMock.AssertNotCalled(t, "SaveNodeb", mock.Anything, mock.Anything)
-       routingManagerClientMock.AssertNotCalled(t, "AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything)
-       writerMock.AssertNotCalled(t, "UpdateNodebInfo", mock.Anything)
-       e2tInstancesManagerMock.AssertNotCalled(t, "AddRansToInstance", mock.Anything, mock.Anything)
-       rmrMessengerMock.AssertNotCalled(t, "SendMsg", mock.Anything, mock.Anything)
-}
+       readerMock.On("GetNodeb", gnbNodebRanName).Return(nodebInfo, nil)
+       routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil)
 
-func TestE2SetupRequestNotificationHandler_HandleUnmarshalError(t *testing.T) {
-       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
-       readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
-       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte(e2SetupMsgPrefix), "xmlGnb"...)}
-       handler.Handle(notificationRequest)
-       readerMock.AssertNotCalled(t, "GetNodeb", mock.Anything)
-       writerMock.AssertNotCalled(t, "SaveNodeb", mock.Anything, mock.Anything)
-       routingManagerClientMock.AssertNotCalled(t, "AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything)
-       writerMock.AssertNotCalled(t, "UpdateNodebInfo", mock.Anything)
-       e2tInstancesManagerMock.AssertNotCalled(t, "AddRansToInstance", mock.Anything, mock.Anything)
-       rmrMessengerMock.AssertNotCalled(t, "SendMsg", mock.Anything, mock.Anything)
-}
+       notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)}
+       gnbToUpdate := getExpectedNodebForExistingRan(nodebInfo, notificationRequest.Payload)
+       gnbToUpdate.SetupFromNetwork = true
+       writerMock.On("UpdateNodebInfo", gnbToUpdate).Return(nil)
+       if withFunctions {
+               writerMock.On("UpdateNodebInfoAndPublish", gnbToUpdate).Return(nil)
+       }
+       newNbIdentity := &entities.NbIdentity{InventoryName: gnbNodebRanName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}}
+       writerMock.On("UpdateNbIdentities", gnbToUpdate.GetNodeType(), []*entities.NbIdentity{oldNbIdentity}, []*entities.NbIdentity{newNbIdentity}).Return(nil)
 
-func TestE2SetupRequestNotificationHandler_HandleGetE2TInstanceError(t *testing.T) {
-       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
-       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
-       readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
-       e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, common.NewResourceNotFoundError("Not found"))
-       prefBytes := []byte(e2SetupMsgPrefix)
-       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlGnb...)}
+       e2tInstancesManagerMock.On("AddRansToInstance", e2tInstanceFullAddress, []string{gnbNodebRanName}).Return(nil)
+       var errEmpty error
+       rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(&rmrCgo.MBuf{}, errEmpty)
        handler.Handle(notificationRequest)
-       e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceFullAddress)
-       readerMock.AssertNotCalled(t, "GetNodeb", mock.Anything)
-       writerMock.AssertNotCalled(t, "SaveNodeb", mock.Anything, mock.Anything)
-       routingManagerClientMock.AssertNotCalled(t, "AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything)
-       writerMock.AssertNotCalled(t, "UpdateNodebInfo", mock.Anything)
-       e2tInstancesManagerMock.AssertNotCalled(t, "AddRansToInstance", mock.Anything, mock.Anything)
-       rmrMessengerMock.AssertNotCalled(t, "SendMsg", mock.Anything, mock.Anything)
+       readerMock.AssertExpectations(t)
+       writerMock.AssertExpectations(t)
+       e2tInstancesManagerMock.AssertExpectations(t)
+       rmrMessengerMock.AssertCalled(t, "SendMsg", mock.Anything, true)
 }
 
-func TestE2SetupRequestNotificationHandler_HandleGetNodebError(t *testing.T) {
-       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
-       handler, readerMock, writerMock, routingManagerClientMock, e2tInstancesManagerMock, rmrMessengerMock := initMocks(t)
+func TestE2SetupRequestNotificationHandler_HandleExistingConnectedGnbRoutingManagerError(t *testing.T) {
+       xmlGnb := utils.ReadXmlFile(t, GnbSetupRequestXmlPath)
+       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock, ranListManager := initMocks(t)
        readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
        e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil)
-       var gnb *entities.NodebInfo
-       readerMock.On("GetNodeb", mock.Anything).Return(gnb, common.NewInternalError(errors.New("some error")))
-       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)}
-       handler.Handle(notificationRequest)
-       e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceFullAddress)
-       readerMock.AssertCalled(t, "GetNodeb", mock.Anything)
-       writerMock.AssertNotCalled(t, "SaveNodeb", mock.Anything, mock.Anything)
-       routingManagerClientMock.AssertNotCalled(t, "AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything)
-       writerMock.AssertNotCalled(t, "UpdateNodebInfo", mock.Anything)
-       e2tInstancesManagerMock.AssertNotCalled(t, "AddRansToInstance", mock.Anything, mock.Anything)
-       rmrMessengerMock.AssertNotCalled(t, "SendMsg", mock.Anything, mock.Anything)
-}
+       var nodebInfo = &entities.NodebInfo{
+               RanName:                      gnbNodebRanName,
+               AssociatedE2TInstanceAddress: e2tInstanceFullAddress,
+               ConnectionStatus:             entities.ConnectionStatus_CONNECTED,
+               NodeType:                     entities.Node_GNB,
+               Configuration:                &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{}},
+       }
+       oldNbIdentity := &entities.NbIdentity{InventoryName: gnbNodebRanName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}}
+       readerMock.On("GetListNodebIds").Return([]*entities.NbIdentity{oldNbIdentity}, nil)
+       err := ranListManager.InitNbIdentityMap()
+       if err != nil {
+               t.Errorf("Error cannot init identity")
+       }
 
-func TestE2SetupRequestNotificationHandler_HandleAssociationError(t *testing.T) {
-       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
+       gnb := nodebInfo.GetGnb()
+       gnb.RanFunctions = []*entities.RanFunction{{RanFunctionId: 2, RanFunctionRevision: 2}}
+       gnb.NodeConfigs = []*entities.E2NodeComponentConfig{{
+               E2NodeComponentID: &entities.E2NodeComponentConfig_E2NodeComponentInterfaceTypeNG{
+                       E2NodeComponentInterfaceTypeNG: &entities.E2NodeComponentInterfaceNG{
+                               AmfName: "nginterf",
+                       },
+               },
+               E2NodeComponentInterfaceType: entities.E2NodeComponentInterfaceType_ng,
+               E2NodeComponentRequestPart:   []byte("72 65 73 70 61 72 74"),
+               E2NodeComponentResponsePart:  []byte("72 65 73 70 61 72 74"),
+       }}
 
-       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
-       readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
-       e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil)
-       var gnb *entities.NodebInfo
-       readerMock.On("GetNodeb", mock.Anything).Return(gnb, common.NewResourceNotFoundError("Not found"))
-       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)}
-       nodebInfo := getExpectedNodebForNewRan(notificationRequest.Payload)
-       writerMock.On("SaveNodeb", mock.Anything, nodebInfo).Return(nil)
-       updatedNodebInfo := *nodebInfo
-       updatedNodebInfo.ConnectionStatus = entities.ConnectionStatus_CONNECTED
-       writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNodebInfo, StateChangeMessageChannel, nodebRanName+"_CONNECTED").Return(nil)
-       writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil)
-       e2tInstancesManagerMock.On("AddRansToInstance", mock.Anything, mock.Anything).Return(nil)
+       readerMock.On("GetNodeb", gnbNodebRanName).Return(nodebInfo, nil)
        routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(errors.New("association error"))
-       updatedNodebInfo2 := *nodebInfo
-       updatedNodebInfo2.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
-       writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNodebInfo2, StateChangeMessageChannel, nodebRanName+"_DISCONNECTED").Return(nil)
+
+       notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)}
+       gnbToUpdate := getExpectedNodebForExistingRan(nodebInfo, notificationRequest.Payload)
+
+       gnbToUpdate2 := *gnbToUpdate
+       gnbToUpdate2.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
+       gnbToUpdate2.SetupFromNetwork = true
+       writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &gnbToUpdate2, gnbNodebRanName+"_DISCONNECTED").Return(nil)
+
+       newNbIdentity := &entities.NbIdentity{InventoryName: gnbNodebRanName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}}
+       writerMock.On("UpdateNbIdentities", gnbToUpdate2.GetNodeType(), []*entities.NbIdentity{oldNbIdentity}, []*entities.NbIdentity{newNbIdentity}).Return(nil)
        var errEmpty error
-       mbuf := getMbuf(rmrCgo.RIC_E2_SETUP_FAILURE, E2SetupFailureResponseWithTransportCause, notificationRequest)
-       rmrMessengerMock.On("WhSendMsg", mbuf, true).Return(&rmrCgo.MBuf{}, errEmpty)
+       rmrMessengerMock.On("WhSendMsg", mock.Anything, true).Return(&rmrCgo.MBuf{}, errEmpty)
        handler.Handle(notificationRequest)
-       readerMock.AssertCalled(t, "GetNodeb", mock.Anything)
-       e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceFullAddress)
-       writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, mock.Anything)
-       routingManagerClientMock.AssertCalled(t, "AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything)
-       e2tInstancesManagerMock.AssertNotCalled(t, "AddRansToInstance", mock.Anything, mock.Anything)
-       rmrMessengerMock.AssertCalled(t, "WhSendMsg", mbuf, true)
+       readerMock.AssertExpectations(t)
+       writerMock.AssertExpectations(t)
+       e2tInstancesManagerMock.AssertExpectations(t)
+       rmrMessengerMock.AssertCalled(t, "WhSendMsg", mock.Anything, true)
 }
 
-func TestE2SetupRequestNotificationHandler_ConvertTo20BitStringError(t *testing.T) {
-       xmlEnGnb := readXmlFile(t, EnGnbSetupRequestXmlPath)
-       logger := tests.InitLog(t)
-       config := &configuration.Configuration{
-               RnibRetryIntervalMs:       10,
-               MaxRnibConnectionAttempts: 3,
-               StateChangeMessageChannel: StateChangeMessageChannel,
-               GlobalRicId: struct {
-                       RicId string
-                       Mcc   string
-                       Mnc   string
-               }{Mcc: "327", Mnc: "94", RicId: "10011001101010101011"}}
-       rmrMessengerMock := &mocks.RmrMessengerMock{}
-       rmrSender := tests.InitRmrSender(rmrMessengerMock, logger)
-       readerMock := &mocks.RnibReaderMock{}
-       writerMock := &mocks.RnibWriterMock{}
-       routingManagerClientMock := &mocks.RoutingManagerClientMock{}
-       rnibDataService := services.NewRnibDataService(logger, config, readerMock, writerMock)
-       e2tInstancesManagerMock := &mocks.E2TInstancesManagerMock{}
-       ranListManager := managers.NewRanListManager(logger)
-       ranAlarmService := services.NewRanAlarmService(logger, config)
-       ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(logger, rnibDataService, ranListManager, ranAlarmService)
-
-       e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManagerMock, routingManagerClientMock, ranConnectStatusChangeManager)
-       handler := NewE2SetupRequestNotificationHandler(logger, config, e2tInstancesManagerMock, rmrSender, rnibDataService, e2tAssociationManager, ranConnectStatusChangeManager)
+func TestE2SetupRequestNotificationHandler_HandleExistingGnbInvalidConnectionStatusError(t *testing.T) {
+       xmlGnb := utils.ReadXmlFile(t, GnbSetupRequestXmlPath)
+       handler, readerMock, writerMock, _, e2tInstancesManagerMock, rmrMessengerMock, _ := initMocks(t)
+       var gnb = &entities.NodebInfo{RanName: gnbNodebRanName, ConnectionStatus: entities.ConnectionStatus_SHUTTING_DOWN}
+       readerMock.On("GetNodeb", gnbNodebRanName).Return(gnb, nil)
        readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
        e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil)
-       var gnb *entities.NodebInfo
-       readerMock.On("GetNodeb", mock.Anything).Return(gnb, common.NewResourceNotFoundError("Not found"))
-       writerMock.On("SaveNodeb", mock.Anything, mock.Anything).Return(nil)
-       writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, StateChangeMessageChannel, mock.Anything).Return(nil)
-       routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil)
-       writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil)
-       e2tInstancesManagerMock.On("AddRansToInstance", mock.Anything, mock.Anything).Return(nil)
-       var errEmpty error
-       rmrMessage := &rmrCgo.MBuf{}
-       rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(rmrMessage, errEmpty)
        prefBytes := []byte(e2SetupMsgPrefix)
-       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlEnGnb...)}
+       notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append(prefBytes, xmlGnb...)}
        handler.Handle(notificationRequest)
-       readerMock.AssertCalled(t, "GetNodeb", mock.Anything)
-       e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceFullAddress)
-       writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, mock.Anything)
-       routingManagerClientMock.AssertCalled(t, "AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything)
-       writerMock.AssertCalled(t, "UpdateNodebInfo", mock.Anything)
-       e2tInstancesManagerMock.AssertCalled(t, "AddRansToInstance", mock.Anything, mock.Anything)
+       readerMock.AssertExpectations(t)
+       writerMock.AssertExpectations(t)
+       e2tInstancesManagerMock.AssertExpectations(t)
        rmrMessengerMock.AssertNotCalled(t, "SendMsg", mock.Anything, mock.Anything)
 }
 
-func TestE2SetupRequestNotificationHandler_HandleExistingGnbInvalidStatusError(t *testing.T) {
-       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
-       handler, readerMock, writerMock, routingManagerClientMock, e2tInstancesManagerMock, rmrMessengerMock := initMocks(t)
-       var gnb = &entities.NodebInfo{RanName: nodebRanName, ConnectionStatus: entities.ConnectionStatus_SHUTTING_DOWN}
-       readerMock.On("GetNodeb", mock.Anything).Return(gnb, nil)
+func TestE2SetupRequestNotificationHandler_HandleExistingConnectedGnbWithoutFunctionsSuccess(t *testing.T) {
+       testE2SetupRequestNotificationHandler_HandleExistingConnectedGnbSuccess(t, false, GnbWithoutFunctionsSetupRequestXmlPath)
+}
+
+func TestE2SetupRequestNotificationHandler_HandleExistingConnectedGnbWithFunctionsSuccess(t *testing.T) {
+       testE2SetupRequestNotificationHandler_HandleExistingConnectedGnbSuccess(t, true, GnbSetupRequestXmlPath)
+}
+
+func TestE2SetupRequestNotificationHandler_HandleExistingConnectedGnbWithZeroFunctionsSuccess(t *testing.T) {
+       testE2SetupRequestNotificationHandler_HandleExistingConnectedGnbSuccess(t, true, GnbWithZeroFunctionsSetupRequestXmlPath)
+}
+
+func TestE2SetupRequestNotificationHandler_HandleExistingDisconnectedGnbSuccess(t *testing.T) {
+       xmlGnb := utils.ReadXmlFile(t, GnbSetupRequestXmlPath)
+       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock, ranListManager := initMocks(t)
+       oldNbIdentity := &entities.NbIdentity{InventoryName: gnbNodebRanName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}}
+       readerMock.On("GetListNodebIds").Return([]*entities.NbIdentity{oldNbIdentity}, nil)
+       err := ranListManager.InitNbIdentityMap()
+       if err != nil {
+               t.Errorf("Error cannot init identity")
+       }
+
        readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil)
        e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil)
-       prefBytes := []byte(e2SetupMsgPrefix)
-       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlGnb...)}
+       var nodebInfo = &entities.NodebInfo{
+               RanName:                      gnbNodebRanName,
+               AssociatedE2TInstanceAddress: e2tInstanceFullAddress,
+               ConnectionStatus:             entities.ConnectionStatus_DISCONNECTED,
+               NodeType:                     entities.Node_GNB,
+               Configuration:                &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{}},
+       }
+
+       readerMock.On("GetNodeb", gnbNodebRanName).Return(nodebInfo, nil)
+       routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil)
+
+       notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)}
+       gnbToUpdate := getExpectedNodebForExistingRan(nodebInfo, notificationRequest.Payload)
+       gnbToUpdate2 := *gnbToUpdate
+       gnbToUpdate2.ConnectionStatus = entities.ConnectionStatus_CONNECTED
+       gnbToUpdate2.SetupFromNetwork = true
+       writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &gnbToUpdate2, gnbNodebRanName+"_CONNECTED").Return(nil)
+       gnbToUpdate3 := *gnbToUpdate
+       gnbToUpdate3.ConnectionStatus = entities.ConnectionStatus_CONNECTED
+       gnbToUpdate3.SetupFromNetwork = true
+       gnbToUpdate3.AssociatedE2TInstanceAddress = e2tInstanceFullAddress
+       writerMock.On("UpdateNodebInfo", &gnbToUpdate3).Return(nil)
+
+       newNbIdentity := &entities.NbIdentity{InventoryName: gnbNodebRanName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}}
+       writerMock.On("UpdateNbIdentities", gnbToUpdate3.GetNodeType(), []*entities.NbIdentity{oldNbIdentity}, []*entities.NbIdentity{newNbIdentity}).Return(nil)
+
+       e2tInstancesManagerMock.On("AddRansToInstance", e2tInstanceFullAddress, []string{gnbNodebRanName}).Return(nil)
+       var errEmpty error
+       rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(&rmrCgo.MBuf{}, errEmpty)
        handler.Handle(notificationRequest)
-       readerMock.AssertCalled(t, "GetNodeb", mock.Anything)
-       e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceFullAddress)
-       writerMock.AssertNotCalled(t, "SaveNodeb", mock.Anything, mock.Anything)
-       routingManagerClientMock.AssertNotCalled(t, "AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything)
-       writerMock.AssertNotCalled(t, "UpdateNodebInfo", mock.Anything)
-       e2tInstancesManagerMock.AssertNotCalled(t, "AddRansToInstance", mock.Anything, mock.Anything)
-       rmrMessengerMock.AssertNotCalled(t, "SendMsg", mock.Anything, mock.Anything)
+       readerMock.AssertExpectations(t)
+       writerMock.AssertExpectations(t)
+       e2tInstancesManagerMock.AssertExpectations(t)
 }
 
-func initMocks(t *testing.T) (*E2SetupRequestNotificationHandler, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.RmrMessengerMock, *mocks.E2TInstancesManagerMock, *mocks.RoutingManagerClientMock) {
-       logger := tests.InitLog(t)
-       config := &configuration.Configuration{
-               RnibRetryIntervalMs:       10,
-               MaxRnibConnectionAttempts: 3,
-               StateChangeMessageChannel: StateChangeMessageChannel,
-               GlobalRicId: struct {
-                       RicId string
-                       Mcc   string
-                       Mnc   string
-               }{Mcc: "327", Mnc: "94", RicId: "AACCE"}}
-       rmrMessengerMock := &mocks.RmrMessengerMock{}
-       rmrSender := tests.InitRmrSender(rmrMessengerMock, logger)
-       readerMock := &mocks.RnibReaderMock{}
-       writerMock := &mocks.RnibWriterMock{}
-       routingManagerClientMock := &mocks.RoutingManagerClientMock{}
-       rnibDataService := services.NewRnibDataService(logger, config, readerMock, writerMock)
-       e2tInstancesManagerMock := &mocks.E2TInstancesManagerMock{}
-       ranListManager := managers.NewRanListManager(logger)
-       ranAlarmService := services.NewRanAlarmService(logger, config)
-       ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(logger, rnibDataService, ranListManager, ranAlarmService)
-       e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManagerMock, routingManagerClientMock, ranConnectStatusChangeManager)
-       handler := NewE2SetupRequestNotificationHandler(logger, config, e2tInstancesManagerMock, rmrSender, rnibDataService, e2tAssociationManager, ranConnectStatusChangeManager)
-       return handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock
-}
+/* Existing Ran UTs - END */