RIC-475 - E2M E2T init unit tests

Change-Id: Ib1b6b74a288a280001d36e3c7f0c6e7e23558ba5
Signed-off-by: Irina <ib565x@intl.att.com>

diff --git a/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler_test.go b/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler_test.go
index 9cddbe2..199d7e1 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler_test.go
@@ -159,6 +159,26 @@ func TestE2SetupRequestNotificationHandler_EnableRicFalse(t *testing.T) {
        writerMock.AssertNotCalled(t, "SaveNodeb")
 }
 
+
+func TestE2SetupRequestNotificationHandler_HandleNewRanError(t *testing.T) {
+       xml := 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(common.NewInternalError(errors.New("error")))
+
+       handler.Handle(notificationRequest)
+
+       readerMock.AssertExpectations(t)
+       writerMock.AssertExpectations(t)
+       e2tInstancesManagerMock.AssertExpectations(t)
+}
+
 func testE2SetupRequestNotificationHandler_HandleNewRanSuccess(t *testing.T, xmlPath string) {
        xml := readXmlFile(t, xmlPath)
        handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
@@ -180,7 +200,9 @@ func testE2SetupRequestNotificationHandler_HandleNewRanSuccess(t *testing.T, xml
        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)
+
        handler.Handle(notificationRequest)
+
        readerMock.AssertExpectations(t)
        writerMock.AssertExpectations(t)
        e2tInstancesManagerMock.AssertExpectations(t)

diff --git a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go
index befb3b2..a4c2312 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go
@@ -1,482 +1,475 @@
-////
-//// Copyright 2019 AT&T Intellectual Property
-//// Copyright 2019 Nokia
-////
-//// Licensed under the Apache License, Version 2.0 (the "License");
-//// you may not use this file except in compliance with the License.
-//// You may obtain a copy of the License at
-////
-////      http://www.apache.org/licenses/LICENSE-2.0
-////
-//// Unless required by applicable law or agreed to in writing, software
-//// distributed under the License is distributed on an "AS IS" BASIS,
-//// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//// See the License for the specific language governing permissions and
-//// limitations under the License.
-////
 //
-////  This source code is part of the near-RT RIC (RAN Intelligent Controller)
-////  platform project (RICP).
+// Copyright 2019 AT&T Intellectual Property
+// Copyright 2019 Nokia
 //
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+//  This source code is part of the near-RT RIC (RAN Intelligent Controller)
+//  platform project (RICP).
+
 package rmrmsghandlers
 
 import (
+       "bytes"
+       "e2mgr/clients"
+       "e2mgr/configuration"
        "e2mgr/logger"
+       "e2mgr/managers"
        "e2mgr/mocks"
+       "e2mgr/models"
        "e2mgr/rmrCgo"
+       "e2mgr/services"
        "e2mgr/services/rmrsender"
        "e2mgr/tests"
+       "fmt"
+       "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/pkg/errors"
+       "github.com/stretchr/testify/mock"
+       "io/ioutil"
+       "net/http"
        "testing"
 )
 
-//
-//import (
-//     "bytes"
-//     "e2mgr/clients"
-//     "e2mgr/configuration"
-//     "e2mgr/managers"
-//     "e2mgr/mocks"
-//     "e2mgr/models"
-//     "e2mgr/rmrCgo"
-//     "e2mgr/services"
-//     "e2mgr/services/rmrsender"
-//     "e2mgr/tests"
-//     "fmt"
-//     "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/pkg/errors"
-//     "github.com/stretchr/testify/mock"
-//     "io/ioutil"
-//     "net/http"
-//     "testing"
-//)
-//
-//const (
-//     e2tInitPayload = "{\"address\":\"10.0.2.15\", \"fqdn\":\"\"}"
-//     e2tInstanceAddress = "10.0.2.15"
-//     podName = "podNAme_test"
-//)
-//
-//func initRanLostConnectionTest(t *testing.T) (*logger.Logger, E2TermInitNotificationHandler, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.E2TInstancesManagerMock, *mocks.RoutingManagerClientMock) {
-//
-//     logger := initLog(t)
-//     config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3}
-//
-//     readerMock := &mocks.RnibReaderMock{}
-//
-//     writerMock := &mocks.RnibWriterMock{}
-//
-//     routingManagerClientMock := &mocks.RoutingManagerClientMock{}
-//
-//     rnibDataService := services.NewRnibDataService(logger, config, readerMock, writerMock)
-//
-//     e2tInstancesManagerMock := &mocks.E2TInstancesManagerMock{}
-//
-//     ranListManager := &mocks.RanListManagerMock{}
-//     ranAlarmService := &mocks.RanAlarmServiceMock{}
-//     ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(logger, rnibDataService,ranListManager, ranAlarmService)
-//     e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManagerMock, routingManagerClientMock, ranConnectStatusChangeManager)
-//
-//     ranDisconnectionManager := managers.NewRanDisconnectionManager(logger, configuration.ParseConfiguration(), rnibDataService, e2tAssociationManager, ranConnectStatusChangeManager)
-//     handler := NewE2TermInitNotificationHandler(logger, ranDisconnectionManager, e2tInstancesManagerMock, routingManagerClientMock)
-//
-//     return logger, handler, readerMock, writerMock, e2tInstancesManagerMock, routingManagerClientMock
-//}
-//
-//func initRanLostConnectionTestWithRealE2tInstanceManager(t *testing.T) (*logger.Logger, *configuration.Configuration, E2TermInitNotificationHandler, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.HttpClientMock) {
-//
-//     logger := initLog(t)
-//     config := configuration.ParseConfiguration()
-//
-//     readerMock := &mocks.RnibReaderMock{}
-//
-//     writerMock := &mocks.RnibWriterMock{}
-//     httpClientMock := &mocks.HttpClientMock{}
-//
-//     routingManagerClient := clients.NewRoutingManagerClient(logger, config, httpClientMock)
-//     rnibDataService := services.NewRnibDataService(logger, config, readerMock, writerMock)
-//
-//     e2tInstancesManager := managers.NewE2TInstancesManager(rnibDataService, logger)
-//     ranListManager := managers.NewRanListManager(logger)
-//     ranAlarmService := services.NewRanAlarmService(logger, config)
-//     ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(logger, rnibDataService,ranListManager, ranAlarmService)
-//     e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManager, routingManagerClient, ranConnectStatusChangeManager)
-//     ranDisconnectionManager := managers.NewRanDisconnectionManager(logger, configuration.ParseConfiguration(), rnibDataService, e2tAssociationManager, ranConnectStatusChangeManager)
-//     handler := NewE2TermInitNotificationHandler(logger, ranDisconnectionManager, e2tInstancesManager, routingManagerClient)
-//     return logger, config, handler, readerMock, writerMock, httpClientMock
-//}
-//
-//func TestE2TermInitUnmarshalPayloadFailure(t *testing.T) {
-//     _, handler, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t)
-//     notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte("asd")}
-//     handler.Handle(notificationRequest)
-//     e2tInstancesManagerMock.AssertNotCalled(t, "GetE2TInstance")
-//     e2tInstancesManagerMock.AssertNotCalled(t, "AddE2TInstance")
-//}
-//
-//func TestE2TermInitEmptyE2TAddress(t *testing.T) {
-//     _, handler, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t)
-//     notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte("{\"address\":\"\"}")}
-//     handler.Handle(notificationRequest)
-//     e2tInstancesManagerMock.AssertNotCalled(t, "GetE2TInstance")
-//     e2tInstancesManagerMock.AssertNotCalled(t, "AddE2TInstance")
-//}
-//
-//func TestE2TermInitGetE2TInstanceFailure(t *testing.T) {
-//     _, handler, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t)
-//     var e2tInstance *entities.E2TInstance
-//     e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, common.NewInternalError(fmt.Errorf("internal error")))
-//     notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
-//     handler.Handle(notificationRequest)
-//     e2tInstancesManagerMock.AssertNotCalled(t, "AddE2TInstance")
-//}
-//
-//func TestE2TermInitGetE2TInstanceDbFailure(t *testing.T) {
-//     _, _, handler, readerMock, writerMock, _ := initRanLostConnectionTestWithRealE2tInstanceManager(t)
-//     var e2tInstance *entities.E2TInstance
-//     readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, common.NewInternalError(fmt.Errorf("internal error")))
-//     notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
-//     handler.Handle(notificationRequest)
-//     writerMock.AssertNotCalled(t, "UpdateNodebInfo")
-//}
-//
-//func TestE2TermInitNewE2TInstance(t *testing.T) {
-//     _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t)
-//     var e2tInstance *entities.E2TInstance
-//
-//     readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, common.NewResourceNotFoundError("not found"))
-//     writerMock.On("SaveE2TInstance", mock.Anything).Return(nil)
-//
-//     respBody := ioutil.NopCloser(bytes.NewBufferString(""))
-//     url := config.RoutingManager.BaseUrl + clients.AddE2TInstanceApiSuffix
-//     httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{StatusCode: http.StatusCreated, Body: respBody}, nil)
-//
-//     e2tAddresses := []string{}
-//     readerMock.On("GetE2TAddresses").Return(e2tAddresses, common.NewResourceNotFoundError(""))
-//
-//     e2tAddresses = append(e2tAddresses, e2tInstanceAddress)
-//     writerMock.On("SaveE2TAddresses", e2tAddresses).Return(nil)
-//
-//     notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
-//     handler.Handle(notificationRequest)
-//
-//     httpClientMock.AssertCalled(t, "Post", url, mock.Anything, mock.Anything)
-//     writerMock.AssertCalled(t, "SaveE2TInstance", mock.Anything)
-//     writerMock.AssertCalled(t, "SaveE2TAddresses", e2tAddresses)
-//}
-//
-//func TestE2TermInitNewE2TInstance__RoutingManagerError(t *testing.T) {
-//     _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t)
-//
-//     var e2tInstance *entities.E2TInstance
-//
-//     readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, common.NewResourceNotFoundError("not found"))
-//
-//     url := config.RoutingManager.BaseUrl + clients.AddE2TInstanceApiSuffix
-//     httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{}, errors.New("error"))
-//
-//     notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
-//     handler.Handle(notificationRequest)
-//
-//     writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 0)
-//}
-//
-//func TestE2TermInitExistingE2TInstanceNoAssociatedRans(t *testing.T) {
-//     _, handler, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t)
-//     e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
-//     e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil)
-//     notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
-//     handler.Handle(notificationRequest)
-//     e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceAddress)
-//}
-//
-//func TestE2TermInitHandlerSuccessOneRan(t *testing.T) {
-//     _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t)
-//
-//     var rnibErr error
-//     var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     readerMock.On("GetNodeb", RanName).Return(initialNodeb, rnibErr)
-//
-//     var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
-//
-//     var disconnectedNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     readerMock.On("GetNodeb", RanName).Return(disconnectedNodeb, rnibErr)
-//
-//     var updatedNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: ""}
-//     writerMock.On("UpdateNodebInfo", updatedNodeb).Return(rnibErr)
-//
-//     e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
-//     e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName)
-//     readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil)
-//     writerMock.On("SaveE2TInstance", mock.Anything).Return(nil)
-//
-//     respBody := ioutil.NopCloser(bytes.NewBufferString(""))
-//     url := config.RoutingManager.BaseUrl + clients.DissociateRanE2TInstanceApiSuffix
-//     httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{StatusCode: http.StatusCreated, Body: respBody}, nil)
-//
-//     notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
-//
-//     handler.Handle(notificationRequest)
-//
-//     writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2)
-//     writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 1)
-//     httpClientMock.AssertNumberOfCalls(t, "Post", 1)
-//}
-//
-//func TestE2TermInitHandlerSuccessOneRan_RoutingManagerError(t *testing.T) {
-//     _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t)
-//
-//     var rnibErr error
-//     var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     readerMock.On("GetNodeb", RanName).Return(initialNodeb, rnibErr)
-//
-//     var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
-//
-//     var disconnectedNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     readerMock.On("GetNodeb", RanName).Return(disconnectedNodeb, rnibErr)
-//
-//     var updatedNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: ""}
-//     writerMock.On("UpdateNodebInfo", updatedNodeb).Return(rnibErr)
-//
-//     e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
-//     e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName)
-//     readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil)
-//     writerMock.On("SaveE2TInstance", mock.Anything).Return(nil)
-//
-//     url := config.RoutingManager.BaseUrl + clients.DissociateRanE2TInstanceApiSuffix
-//     httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{}, errors.New("error"))
-//
-//     notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
-//
-//     handler.Handle(notificationRequest)
-//
-//     writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2)
-//     writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 1)
-//     httpClientMock.AssertNumberOfCalls(t, "Post", 1)
-//}
-//
-//func TestE2TermInitHandlerSuccessOneRanShuttingdown(t *testing.T) {
-//     _, _, handler, readerMock, writerMock, _ := initRanLostConnectionTestWithRealE2tInstanceManager(t)
-//     var rnibErr error
-//
-//     var initialNodeb = &entities.NodebInfo{RanName: RanName, ConnectionStatus: entities.ConnectionStatus_SHUTTING_DOWN, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
-//     readerMock.On("GetNodeb", RanName).Return(initialNodeb, rnibErr)
-//
-//     var argNodeb = &entities.NodebInfo{RanName: RanName, ConnectionStatus: entities.ConnectionStatus_SHUT_DOWN, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
-//     writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
-//
-//     e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
-//     e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName)
-//     readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil)
-//     notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
-//
-//     handler.Handle(notificationRequest)
-//
-//     writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 1)
-//}
-//
-//func TestE2TermInitHandlerSuccessOneRan_ToBeDeleted(t *testing.T) {
-//     _, _, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t)
-//     var rnibErr error
-//
-//     var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
-//     readerMock.On("GetNodeb", RanName).Return(initialNodeb, rnibErr)
-//
-//     var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
-//     writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
-//
-//     e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
-//     e2tInstance.State = entities.ToBeDeleted
-//     e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName)
-//
-//     readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil)
-//     notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
-//
-//     handler.Handle(notificationRequest)
-//
-//     httpClientMock.AssertNotCalled(t, "Post", mock.Anything, mock.Anything, mock.Anything)
-//     writerMock.AssertNotCalled(t, "UpdateNodebInfo")
-//}
-//
-//func TestE2TermInitHandlerSuccessTwoRans(t *testing.T) {
-//
-//     _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t)
-//
-//     var rnibErr error
-//     test2 := "test2"
-//
-//     //First RAN
-//     var firstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     var disconnectedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     readerMock.On("GetNodeb", RanName).Return(firstRan, rnibErr).Return(disconnectedFirstRan, rnibErr)
-//
-//     var updatedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     writerMock.On("UpdateNodebInfo", updatedFirstRan).Return(rnibErr)
-//
-//     var updatedDisconnectedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: ""}
-//     writerMock.On("UpdateNodebInfo", updatedDisconnectedFirstRan).Return(rnibErr)
-//
-//     //Second RAN
-//     var secondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     var disconnectedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     readerMock.On("GetNodeb", test2).Return(secondRan, rnibErr).Return(disconnectedSecondRan, rnibErr)
-//
-//     var updatedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     writerMock.On("UpdateNodebInfo", updatedSecondRan).Return(rnibErr)
-//
-//     var updatedDisconnectedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: ""}
-//     writerMock.On("UpdateNodebInfo", updatedDisconnectedSecondRan).Return(rnibErr)
-//
-//     e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
-//     e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName)
-//     e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, test2)
-//     readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil)
-//     writerMock.On("SaveE2TInstance", mock.Anything).Return(nil)
-//
-//     respBody := ioutil.NopCloser(bytes.NewBufferString(""))
-//     url := config.RoutingManager.BaseUrl + clients.DissociateRanE2TInstanceApiSuffix
-//     httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{StatusCode: http.StatusCreated, Body: respBody}, nil)
-//
-//     notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
-//
-//     handler.Handle(notificationRequest)
-//
-//     writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 4)
-//     writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 2)
-//     httpClientMock.AssertNumberOfCalls(t, "Post", 2)
-//}
-//
-//func TestE2TermInitHandlerSuccessTwoRansSecondRanShutdown(t *testing.T) {
-//     _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t)
-//
-//     var rnibErr error
-//     test2 := "test2"
-//
-//     //First RAN
-//     var firstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     var disconnectedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     readerMock.On("GetNodeb", RanName).Return(firstRan, rnibErr).Return(disconnectedFirstRan, rnibErr)
-//
-//     var updatedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     writerMock.On("UpdateNodebInfo", updatedFirstRan).Return(rnibErr)
-//
-//     var updatedDisconnectedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: ""}
-//     writerMock.On("UpdateNodebInfo", updatedDisconnectedFirstRan).Return(rnibErr)
-//
-//     //Second RAN
-//     var secondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_SHUT_DOWN, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     readerMock.On("GetNodeb", test2).Return(secondRan, rnibErr)
-//
-//     e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
-//     e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName)
-//     readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil)
-//     writerMock.On("SaveE2TInstance", mock.Anything).Return(nil)
-//
-//     respBody := ioutil.NopCloser(bytes.NewBufferString(""))
-//     url := config.RoutingManager.BaseUrl + clients.DissociateRanE2TInstanceApiSuffix
-//     httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{StatusCode: http.StatusCreated, Body: respBody}, nil)
-//
-//     notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
-//
-//     handler.Handle(notificationRequest)
-//
-//     writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2)
-//     writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 1)
-//     httpClientMock.AssertNumberOfCalls(t, "Post", 1)
-//}
-//
-//func TestE2TermInitHandlerSuccessTwoRansFirstNotFoundFailure(t *testing.T) {
-//     _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t)
-//
-//     var rnibErr error
-//     test2 := "test2"
-//
-//     //First RAN
-//     var firstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     readerMock.On("GetNodeb", RanName).Return(firstRan, common.NewResourceNotFoundError("not found"))
-//
-//     //Second RAN
-//     var secondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     var disconnectedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     readerMock.On("GetNodeb", test2).Return(secondRan, rnibErr).Return(disconnectedSecondRan, rnibErr)
-//
-//     var updatedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     writerMock.On("UpdateNodebInfo", updatedSecondRan).Return(rnibErr)
-//
-//     var updatedDisconnectedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: ""}
-//     writerMock.On("UpdateNodebInfo", updatedDisconnectedSecondRan).Return(rnibErr)
-//
-//     e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
-//     e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName)
-//     e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, test2)
-//     readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil)
-//     writerMock.On("SaveE2TInstance", mock.Anything).Return(nil)
-//
-//     respBody := ioutil.NopCloser(bytes.NewBufferString(""))
-//     url := config.RoutingManager.BaseUrl + clients.DissociateRanE2TInstanceApiSuffix
-//     httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{StatusCode: http.StatusCreated, Body: respBody}, nil)
-//
-//     notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
-//
-//     handler.Handle(notificationRequest)
-//
-//     writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2)
-//     writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 1)
-//     httpClientMock.AssertNumberOfCalls(t, "Post", 1)
-//}
-//
-//func TestE2TermInitHandlerSuccessTwoRansFirstRnibInternalErrorFailure(t *testing.T) {
-//     _, _, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t)
-//
-//     test2 := "test2"
-//
-//     //First RAN
-//     var firstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
-//     readerMock.On("GetNodeb", RanName).Return(firstRan, common.NewInternalError(fmt.Errorf("internal error")))
-//
-//     e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
-//     e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName)
-//     e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, test2)
-//     readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil)
-//
-//     notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
-//
-//     handler.Handle(notificationRequest)
-//
-//     writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 0)
-//     writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 0)
-//     httpClientMock.AssertNumberOfCalls(t, "Post", 0)
-//}
-//
-//func TestE2TermInitHandlerSuccessZeroRans(t *testing.T) {
-//     _, handler, _, writerMock, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t)
-//
-//     e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
-//     e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil)
-//     notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
-//
-//     handler.Handle(notificationRequest)
-//
-//     writerMock.AssertNotCalled(t, "UpdateNodebInfo")
-//}
-//
-//func TestE2TermInitHandlerFailureGetNodebInternalError(t *testing.T) {
-//     _, handler, readerMock, writerMock, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t)
-//
-//     var nodebInfo *entities.NodebInfo
-//     readerMock.On("GetNodeb", "test1").Return(nodebInfo, common.NewInternalError(fmt.Errorf("internal error")))
-//
-//     e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
-//     e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, "test1")
-//     e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil)
-//     notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
-//     handler.Handle(notificationRequest)
-//
-//     writerMock.AssertNotCalled(t, "UpdateNodebInfo")
-//}
-//
+const (
+       e2tInitPayload = "{\"address\":\"10.0.2.15\", \"fqdn\":\"\"}"
+       e2tInstanceAddress = "10.0.2.15"
+       podName = "podNAme_test"
+)
+
+func initRanLostConnectionTest(t *testing.T) (*logger.Logger, E2TermInitNotificationHandler, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.E2TInstancesManagerMock, *mocks.RoutingManagerClientMock) {
+
+       logger := initLog(t)
+       config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3}
+
+       readerMock := &mocks.RnibReaderMock{}
+
+       writerMock := &mocks.RnibWriterMock{}
+
+       routingManagerClientMock := &mocks.RoutingManagerClientMock{}
+
+       rnibDataService := services.NewRnibDataService(logger, config, readerMock, writerMock)
+
+       e2tInstancesManagerMock := &mocks.E2TInstancesManagerMock{}
+
+       ranListManager := &mocks.RanListManagerMock{}
+       ranAlarmService := &mocks.RanAlarmServiceMock{}
+       ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(logger, rnibDataService,ranListManager, ranAlarmService)
+       e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManagerMock, routingManagerClientMock, ranConnectStatusChangeManager)
+
+       ranDisconnectionManager := managers.NewRanDisconnectionManager(logger, configuration.ParseConfiguration(), rnibDataService, e2tAssociationManager, ranConnectStatusChangeManager)
+       handler := NewE2TermInitNotificationHandler(logger, ranDisconnectionManager, e2tInstancesManagerMock, routingManagerClientMock)
+
+       return logger, handler, readerMock, writerMock, e2tInstancesManagerMock, routingManagerClientMock
+}
+
+func initRanLostConnectionTestWithRealE2tInstanceManager(t *testing.T) (*logger.Logger, *configuration.Configuration, E2TermInitNotificationHandler, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.HttpClientMock) {
+
+       logger := initLog(t)
+       config := configuration.ParseConfiguration()
+
+       readerMock := &mocks.RnibReaderMock{}
+
+       writerMock := &mocks.RnibWriterMock{}
+       httpClientMock := &mocks.HttpClientMock{}
+
+       routingManagerClient := clients.NewRoutingManagerClient(logger, config, httpClientMock)
+       rnibDataService := services.NewRnibDataService(logger, config, readerMock, writerMock)
+
+       e2tInstancesManager := managers.NewE2TInstancesManager(rnibDataService, logger)
+       ranListManager := managers.NewRanListManager(logger)
+       ranAlarmService := services.NewRanAlarmService(logger, config)
+       ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(logger, rnibDataService,ranListManager, ranAlarmService)
+       e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManager, routingManagerClient, ranConnectStatusChangeManager)
+       ranDisconnectionManager := managers.NewRanDisconnectionManager(logger, configuration.ParseConfiguration(), rnibDataService, e2tAssociationManager, ranConnectStatusChangeManager)
+       handler := NewE2TermInitNotificationHandler(logger, ranDisconnectionManager, e2tInstancesManager, routingManagerClient)
+       return logger, config, handler, readerMock, writerMock, httpClientMock
+}
+
+func TestE2TermInitUnmarshalPayloadFailure(t *testing.T) {
+       _, handler, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t)
+       notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte("asd")}
+       handler.Handle(notificationRequest)
+       e2tInstancesManagerMock.AssertNotCalled(t, "GetE2TInstance")
+       e2tInstancesManagerMock.AssertNotCalled(t, "AddE2TInstance")
+}
+
+func TestE2TermInitEmptyE2TAddress(t *testing.T) {
+       _, handler, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t)
+       notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte("{\"address\":\"\"}")}
+       handler.Handle(notificationRequest)
+       e2tInstancesManagerMock.AssertNotCalled(t, "GetE2TInstance")
+       e2tInstancesManagerMock.AssertNotCalled(t, "AddE2TInstance")
+}
+
+func TestE2TermInitGetE2TInstanceFailure(t *testing.T) {
+       _, handler, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t)
+       var e2tInstance *entities.E2TInstance
+       e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, common.NewInternalError(fmt.Errorf("internal error")))
+       notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
+       handler.Handle(notificationRequest)
+       e2tInstancesManagerMock.AssertNotCalled(t, "AddE2TInstance")
+}
+
+func TestE2TermInitGetE2TInstanceDbFailure(t *testing.T) {
+       _, _, handler, readerMock, writerMock, _ := initRanLostConnectionTestWithRealE2tInstanceManager(t)
+       var e2tInstance *entities.E2TInstance
+       readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, common.NewInternalError(fmt.Errorf("internal error")))
+       notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
+       handler.Handle(notificationRequest)
+       writerMock.AssertNotCalled(t, "UpdateNodebInfo")
+}
+
+func TestE2TermInitNewE2TInstance(t *testing.T) {
+       _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t)
+       var e2tInstance *entities.E2TInstance
+
+       readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, common.NewResourceNotFoundError("not found"))
+       writerMock.On("SaveE2TInstance", mock.Anything).Return(nil)
+
+       respBody := ioutil.NopCloser(bytes.NewBufferString(""))
+       url := config.RoutingManager.BaseUrl + clients.AddE2TInstanceApiSuffix
+       httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{StatusCode: http.StatusCreated, Body: respBody}, nil)
+
+       e2tAddresses := []string{}
+       readerMock.On("GetE2TAddresses").Return(e2tAddresses, common.NewResourceNotFoundError(""))
+
+       e2tAddresses = append(e2tAddresses, e2tInstanceAddress)
+       writerMock.On("SaveE2TAddresses", e2tAddresses).Return(nil)
+
+       notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
+       handler.Handle(notificationRequest)
+
+       httpClientMock.AssertCalled(t, "Post", url, mock.Anything, mock.Anything)
+       writerMock.AssertCalled(t, "SaveE2TInstance", mock.Anything)
+       writerMock.AssertCalled(t, "SaveE2TAddresses", e2tAddresses)
+}
+
+func TestE2TermInitNewE2TInstance__RoutingManagerError(t *testing.T) {
+       _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t)
+
+       var e2tInstance *entities.E2TInstance
+
+       readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, common.NewResourceNotFoundError("not found"))
+
+       url := config.RoutingManager.BaseUrl + clients.AddE2TInstanceApiSuffix
+       httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{}, errors.New("error"))
+
+       notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
+       handler.Handle(notificationRequest)
+
+       writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 0)
+}
+
+func TestE2TermInitExistingE2TInstanceNoAssociatedRans(t *testing.T) {
+       _, handler, _, _, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t)
+       e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
+       e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil)
+       notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
+       handler.Handle(notificationRequest)
+       e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceAddress)
+}
+
+func TestE2TermInitHandlerSuccessOneRan(t *testing.T) {
+       _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t)
+
+       var rnibErr error
+       var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       readerMock.On("GetNodeb", RanName).Return(initialNodeb, rnibErr)
+
+       var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", argNodeb, "RAN_CONNECTION_STATUS_CHANGE", "test_DISCONNECTED").Return(nil)
+
+       var disconnectedNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       readerMock.On("GetNodeb", RanName).Return(disconnectedNodeb, rnibErr)
+
+       var updatedNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: ""}
+       writerMock.On("UpdateNodebInfo", updatedNodeb).Return(rnibErr)
+
+       e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
+       e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName)
+       readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil)
+       writerMock.On("SaveE2TInstance", mock.Anything).Return(nil)
+
+       respBody := ioutil.NopCloser(bytes.NewBufferString(""))
+       url := config.RoutingManager.BaseUrl + clients.DissociateRanE2TInstanceApiSuffix
+       httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{StatusCode: http.StatusCreated, Body: respBody}, nil)
+
+       notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
+
+       handler.Handle(notificationRequest)
+
+       writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 1)
+       writerMock.AssertNumberOfCalls(t, "UpdateNodebInfoOnConnectionStatusInversion", 1)
+       writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 1)
+       httpClientMock.AssertNumberOfCalls(t, "Post", 1)
+}
+
+func TestE2TermInitHandlerSuccessOneRan_RoutingManagerError(t *testing.T) {
+       _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t)
+
+       var rnibErr error
+       var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       readerMock.On("GetNodeb", RanName).Return(initialNodeb, rnibErr)
+
+       var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", argNodeb, "RAN_CONNECTION_STATUS_CHANGE", "test_DISCONNECTED").Return(nil)
+
+       var disconnectedNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       readerMock.On("GetNodeb", RanName).Return(disconnectedNodeb, rnibErr)
+
+       var updatedNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: ""}
+       writerMock.On("UpdateNodebInfo", updatedNodeb).Return(rnibErr)
+
+       e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
+       e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName)
+       readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil)
+       writerMock.On("SaveE2TInstance", mock.Anything).Return(nil)
+
+       url := config.RoutingManager.BaseUrl + clients.DissociateRanE2TInstanceApiSuffix
+       httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{}, errors.New("error"))
+
+       notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
+
+       handler.Handle(notificationRequest)
+
+       writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 1)
+       writerMock.AssertNumberOfCalls(t, "UpdateNodebInfoOnConnectionStatusInversion", 1)
+       writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 1)
+       httpClientMock.AssertNumberOfCalls(t, "Post", 1)
+}
+
+func TestE2TermInitHandlerSuccessOneRanShuttingdown(t *testing.T) {
+       _, _, handler, readerMock, writerMock, _ := initRanLostConnectionTestWithRealE2tInstanceManager(t)
+       var rnibErr error
+
+       var initialNodeb = &entities.NodebInfo{RanName: RanName, ConnectionStatus: entities.ConnectionStatus_SHUTTING_DOWN, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
+       readerMock.On("GetNodeb", RanName).Return(initialNodeb, rnibErr)
+
+       var argNodeb = &entities.NodebInfo{RanName: RanName, ConnectionStatus: entities.ConnectionStatus_SHUT_DOWN, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
+       writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
+
+       e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
+       e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName)
+       readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil)
+       notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
+
+       handler.Handle(notificationRequest)
+
+       writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 1)
+}
+
+func TestE2TermInitHandlerSuccessOneRan_ToBeDeleted(t *testing.T) {
+       _, _, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t)
+       var rnibErr error
+
+       var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
+       readerMock.On("GetNodeb", RanName).Return(initialNodeb, rnibErr)
+
+       var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
+       writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
+
+       e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
+       e2tInstance.State = entities.ToBeDeleted
+       e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName)
+
+       readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil)
+       notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
+
+       handler.Handle(notificationRequest)
+
+       httpClientMock.AssertNotCalled(t, "Post", mock.Anything, mock.Anything, mock.Anything)
+       writerMock.AssertNotCalled(t, "UpdateNodebInfo")
+}
+
+func TestE2TermInitHandlerSuccessTwoRans(t *testing.T) {
+
+       _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t)
+
+       var rnibErr error
+       test2 := "test2"
+
+       //First RAN
+       var firstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       var disconnectedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       readerMock.On("GetNodeb", RanName).Return(firstRan, rnibErr).Return(disconnectedFirstRan, rnibErr)
+
+       var updatedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       writerMock.On("UpdateNodebInfo", updatedFirstRan).Return(rnibErr)
+
+       var updatedDisconnectedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: ""}
+       writerMock.On("UpdateNodebInfo", updatedDisconnectedFirstRan).Return(rnibErr)
+
+       //Second RAN
+       var secondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       var disconnectedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       readerMock.On("GetNodeb", test2).Return(secondRan, rnibErr).Return(disconnectedSecondRan, rnibErr)
+
+       var updatedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       writerMock.On("UpdateNodebInfo", updatedSecondRan).Return(rnibErr)
+
+       var updatedDisconnectedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: ""}
+       writerMock.On("UpdateNodebInfo", updatedDisconnectedSecondRan).Return(rnibErr)
+
+       e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
+       e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName)
+       e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, test2)
+       readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil)
+       writerMock.On("SaveE2TInstance", mock.Anything).Return(nil)
+
+       respBody := ioutil.NopCloser(bytes.NewBufferString(""))
+       url := config.RoutingManager.BaseUrl + clients.DissociateRanE2TInstanceApiSuffix
+       httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{StatusCode: http.StatusCreated, Body: respBody}, nil)
+
+       notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
+
+       handler.Handle(notificationRequest)
+
+       writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 4)
+       writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 2)
+       httpClientMock.AssertNumberOfCalls(t, "Post", 2)
+}
+
+func TestE2TermInitHandlerSuccessTwoRansSecondRanShutdown(t *testing.T) {
+       _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t)
+
+       var rnibErr error
+       test2 := "test2"
+
+       //First RAN
+       var firstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       var disconnectedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       readerMock.On("GetNodeb", RanName).Return(firstRan, rnibErr).Return(disconnectedFirstRan, rnibErr)
+
+       var updatedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       writerMock.On("UpdateNodebInfo", updatedFirstRan).Return(rnibErr)
+
+       var updatedDisconnectedFirstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: ""}
+       writerMock.On("UpdateNodebInfo", updatedDisconnectedFirstRan).Return(rnibErr)
+
+       //Second RAN
+       var secondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_SHUT_DOWN, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       readerMock.On("GetNodeb", test2).Return(secondRan, rnibErr)
+
+       e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
+       e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName)
+       readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil)
+       writerMock.On("SaveE2TInstance", mock.Anything).Return(nil)
+
+       respBody := ioutil.NopCloser(bytes.NewBufferString(""))
+       url := config.RoutingManager.BaseUrl + clients.DissociateRanE2TInstanceApiSuffix
+       httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{StatusCode: http.StatusCreated, Body: respBody}, nil)
+
+       notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
+
+       handler.Handle(notificationRequest)
+
+       writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2)
+       writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 1)
+       httpClientMock.AssertNumberOfCalls(t, "Post", 1)
+}
+
+func TestE2TermInitHandlerSuccessTwoRansFirstNotFoundFailure(t *testing.T) {
+       _, config, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t)
+
+       var rnibErr error
+       test2 := "test2"
+
+       //First RAN
+       var firstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       readerMock.On("GetNodeb", RanName).Return(firstRan, common.NewResourceNotFoundError("not found"))
+
+       //Second RAN
+       var secondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       var disconnectedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       readerMock.On("GetNodeb", test2).Return(secondRan, rnibErr).Return(disconnectedSecondRan, rnibErr)
+
+       var updatedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       writerMock.On("UpdateNodebInfo", updatedSecondRan).Return(rnibErr)
+
+       var updatedDisconnectedSecondRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, RanName: test2, AssociatedE2TInstanceAddress: ""}
+       writerMock.On("UpdateNodebInfo", updatedDisconnectedSecondRan).Return(rnibErr)
+
+       e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
+       e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName)
+       e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, test2)
+       readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil)
+       writerMock.On("SaveE2TInstance", mock.Anything).Return(nil)
+
+       respBody := ioutil.NopCloser(bytes.NewBufferString(""))
+       url := config.RoutingManager.BaseUrl + clients.DissociateRanE2TInstanceApiSuffix
+       httpClientMock.On("Post", url, mock.Anything, mock.Anything).Return(&http.Response{StatusCode: http.StatusCreated, Body: respBody}, nil)
+
+       notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
+
+       handler.Handle(notificationRequest)
+
+       writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2)
+       writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 1)
+       httpClientMock.AssertNumberOfCalls(t, "Post", 1)
+}
+
+func TestE2TermInitHandlerSuccessTwoRansFirstRnibInternalErrorFailure(t *testing.T) {
+       _, _, handler, readerMock, writerMock, httpClientMock := initRanLostConnectionTestWithRealE2tInstanceManager(t)
+
+       test2 := "test2"
+
+       //First RAN
+       var firstRan = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, RanName: RanName, AssociatedE2TInstanceAddress: "10.0.2.15"}
+       readerMock.On("GetNodeb", RanName).Return(firstRan, common.NewInternalError(fmt.Errorf("internal error")))
+
+       e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
+       e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName)
+       e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, test2)
+       readerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil).Return(e2tInstance, nil)
+
+       notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
+
+       handler.Handle(notificationRequest)
+
+       writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 0)
+       writerMock.AssertNumberOfCalls(t, "SaveE2TInstance", 0)
+       httpClientMock.AssertNumberOfCalls(t, "Post", 0)
+}
+
+func TestE2TermInitHandlerSuccessZeroRans(t *testing.T) {
+       _, handler, _, writerMock, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t)
+
+       e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
+       e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil)
+       notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
+
+       handler.Handle(notificationRequest)
+
+       writerMock.AssertNotCalled(t, "UpdateNodebInfo")
+}
+
+func TestE2TermInitHandlerFailureGetNodebInternalError(t *testing.T) {
+       _, handler, readerMock, writerMock, e2tInstancesManagerMock, _ := initRanLostConnectionTest(t)
+
+       var nodebInfo *entities.NodebInfo
+       readerMock.On("GetNodeb", "test1").Return(nodebInfo, common.NewInternalError(fmt.Errorf("internal error")))
+
+       e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
+       e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, "test1")
+       e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceAddress).Return(e2tInstance, nil)
+       notificationRequest := &models.NotificationRequest{RanName: RanName, Payload: []byte(e2tInitPayload)}
+       handler.Handle(notificationRequest)
+
+       writerMock.AssertNotCalled(t, "UpdateNodebInfo")
+}
+
 // TODO: extract to test_utils
 func initRmrSender(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger) *rmrsender.RmrSender {
        rmrMessenger := rmrCgo.RmrMessenger(rmrMessengerMock)

diff --git a/E2Manager/managers/e2t_association_manager_test.go b/E2Manager/managers/e2t_association_manager_test.go
index bfd7d0a..0e78b7d 100644 (file)
--- a/E2Manager/managers/e2t_association_manager_test.go
+++ b/E2Manager/managers/e2t_association_manager_test.go
@@ -28,6 +28,8 @@ import (
        "e2mgr/models"
        "e2mgr/services"
        "encoding/json"
+       "fmt"
+       "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/pkg/errors"
        "github.com/stretchr/testify/assert"
@@ -98,6 +100,23 @@ func TestAssociateRanSuccess(t *testing.T) {
        httpClientMock.AssertExpectations(t)
 }
 
+func TestAssociateRan_RnibError(t *testing.T) {
+       manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
+       mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true)
+       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""}
+       updatedNb := *nb
+       updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
+       writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNb, StateChangeMessageChannel, RanName+"_CONNECTED").Return(common.NewInternalError(fmt.Errorf("for tests")))
+
+       err := manager.AssociateRan(E2TAddress, nb)
+
+       assert.NotNil(t, err)
+       assert.IsType(t, &e2managererrors.RnibDbError{}, err)
+       readerMock.AssertExpectations(t)
+       writerMock.AssertExpectations(t)
+       httpClientMock.AssertExpectations(t)
+}
+
 func TestAssociateRanRoutingManagerError(t *testing.T) {
        manager, _, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
        mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, false)

diff --git a/E2Manager/managers/ran_disconnection_manager.go b/E2Manager/managers/ran_disconnection_manager.go
index aeb91bb..f07e8fd 100644 (file)
--- a/E2Manager/managers/ran_disconnection_manager.go
+++ b/E2Manager/managers/ran_disconnection_manager.go
@@ -77,17 +77,3 @@ func (m *RanDisconnectionManager) DisconnectRan(inventoryName string) error {
        e2tAddress := nodebInfo.AssociatedE2TInstanceAddress
        return m.e2tAssociationManager.DissociateRan(e2tAddress, nodebInfo.RanName)
 }
-
-func (m *RanDisconnectionManager) updateNodebInfo(nodebInfo *entities.NodebInfo, connectionStatus entities.ConnectionStatus) error {
-
-       nodebInfo.ConnectionStatus = connectionStatus
-       err := m.rnibDataService.UpdateNodebInfo(nodebInfo)
-
-       if err != nil {
-               m.logger.Errorf("#RanDisconnectionManager.updateNodebInfo - RAN name: %s - Failed updating RAN's connection status to %s in rNib. Error: %v", nodebInfo.RanName, connectionStatus, err)
-               return err
-       }
-
-       m.logger.Infof("#RanDisconnectionManager.updateNodebInfo - RAN name: %s - Successfully updated rNib. RAN's current connection status: %s", nodebInfo.RanName, nodebInfo.ConnectionStatus)
-       return nil
-}