[RICPLT-2146] Remove E2Sessions......

Change-Id: Iacacd9b0eb1c94c99b198e7a951fa386ab1eb417
Signed-off-by: is005q <idan.shalom@intl.att.com>

diff --git a/.gitignore b/.gitignore
index 816688e..e9acc5f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,11 @@
-/.idea/e2mgr.iml
-/.idea/encodings.xml
-/.idea/misc.xml
-/.idea/modules.xml
-/.idea/vcs.xml
-/.idea/workspace.xml
+/.idea/*
 .vscode/launch.json
-/.idea/sonarIssues.xml
 *.o
 *.a
 E2Manager/asn1codec/e2ap_engine/converter-example
 E2Manager/asn1codec/tests/
 E2Manager/cp.out
-/Automation/Tests/ConfigurationUpdate/__pycache__/verifylogs.cpython-36.pyc
-/Automation/Tests/Get-All-Nodes/__pycache__/getnodes.cpython-36.pyc
-/Automation/Tests/LoadInfomation/__pycache__/Loadinformation_adding_data_and_overwrite.robot
-/Automation/Tests/LoadInfomation/__pycache__/Loadinformation_verify_saving.robot
-/Automation/Tests/LoadInfomation/__pycache__/__init__.robot
-/Automation/Tests/LoadInfomation/__pycache__/config.py
-/Automation/Tests/LoadInfomation/__pycache__/loadscripts.py
-/Automation/Tests/Resource/__pycache__/config.cpython-36.pyc
-/Automation/Tests/Resource/__pycache__/scripts.cpython-36.pyc
+__pycache__/ 
+*.html
+*.log
+

diff --git a/E2Manager/controllers/controller_test.go b/E2Manager/controllers/controller_test.go
index 9a31d53..fe833cf 100644 (file)
--- a/E2Manager/controllers/controller_test.go
+++ b/E2Manager/controllers/controller_test.go
@@ -363,10 +363,6 @@ func TestX2ResetHandleFailureInvalidBody(t *testing.T) {
 
        controller.X2ResetHandler(writer, req)
        assert.Equal(t, http.StatusBadRequest, writer.Result().StatusCode)
-
-       _, ok := rmrService.E2sessions[ranName]
-       assert.False(t, ok)
-
 }
 
 func TestHandleErrorResponse(t *testing.T) {

diff --git a/E2Manager/controllers/nodeb_controller.go b/E2Manager/controllers/nodeb_controller.go
index fdfebe0..cdb76a9 100644 (file)
--- a/E2Manager/controllers/nodeb_controller.go
+++ b/E2Manager/controllers/nodeb_controller.go
@@ -22,7 +22,6 @@ import (
        "e2mgr/models"
        "e2mgr/rNibWriter"
        "e2mgr/services"
-       "e2mgr/sessions"
        "e2mgr/utils"
        "encoding/json"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
@@ -42,8 +41,6 @@ const (
        internalErrorMessage          = "Internal Server Error. Please try again later"
 )
 
-var E2Sessions = make(sessions.E2Sessions)
-
 var messageChannel chan *models.E2RequestMessage
 var errorChannel chan error
 

diff --git a/E2Manager/controllers/nodeb_controller_test.go b/E2Manager/controllers/nodeb_controller_test.go
index 8334968..812d7dc 100644 (file)
--- a/E2Manager/controllers/nodeb_controller_test.go
+++ b/E2Manager/controllers/nodeb_controller_test.go
@@ -24,7 +24,6 @@ import (
        "e2mgr/rNibWriter"
        "e2mgr/rmrCgo"
        "e2mgr/services"
-       "e2mgr/sessions"
        "e2mgr/tests"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
@@ -60,7 +59,7 @@ func getRmrService(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger)
        rmrMessenger := rmrCgo.RmrMessenger(rmrMessengerMock)
        messageChannel := make(chan *models.NotificationResponse)
        rmrMessengerMock.On("Init", tests.GetPort(), tests.MaxMsgSize, tests.Flags, log).Return(&rmrMessenger)
-       return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, make(sessions.E2Sessions), messageChannel)
+       return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, messageChannel)
 }
 
 func executeGetNodeb(logger *logger.Logger, writer *httptest.ResponseRecorder, rnibReaderProvider func() reader.RNibReader) {
@@ -140,7 +139,7 @@ func TestNodebController_GetNodeb_InternalError(t *testing.T) {
 
 func executeGetNodebIdList(logger *logger.Logger, writer *httptest.ResponseRecorder, rnibReaderProvider func() reader.RNibReader) {
        req, _ := http.NewRequest("GET", "/nodeb-ids", nil)
-       NewNodebController(logger, nil, rnibReaderProvider, nil ).GetNodebIdList(writer,req)
+       NewNodebController(logger, nil, rnibReaderProvider, nil).GetNodebIdList(writer, req)
 }
 
 func TestNodebController_GetNodebIdList_Success(t *testing.T) {
@@ -156,9 +155,9 @@ func TestNodebController_GetNodebIdList_Success(t *testing.T) {
        var rnibError error
 
        nbList := []*entities.NbIdentity{
-               {InventoryName:"test1", GlobalNbId: &entities.GlobalNbId{PlmnId:"plmnId1",NbId: "nbId1"}},
-               {InventoryName:"test2", GlobalNbId: &entities.GlobalNbId{PlmnId:"plmnId2",NbId: "nbId2"}},
-               {InventoryName:"test3", GlobalNbId: &entities.GlobalNbId{PlmnId:"",NbId: ""}},
+               {InventoryName: "test1", GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}},
+               {InventoryName: "test2", GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId2", NbId: "nbId2"}},
+               {InventoryName: "test3", GlobalNbId: &entities.GlobalNbId{PlmnId: "", NbId: ""}},
        }
        rnibReaderMock.On("GetListNodebIds").Return(nbList, rnibError)
 
@@ -169,7 +168,7 @@ func TestNodebController_GetNodebIdList_Success(t *testing.T) {
        executeGetNodebIdList(logger, writer, rnibReaderProvider)
        assert.Equal(t, writer.Result().StatusCode, http.StatusOK)
        bodyBytes, err := ioutil.ReadAll(writer.Body)
-       assert.Equal(t, "[{\"inventoryName\":\"test1\",\"globalNbId\":{\"plmnId\":\"plmnId1\",\"nbId\":\"nbId1\"}},{\"inventoryName\":\"test2\",\"globalNbId\":{\"plmnId\":\"plmnId2\",\"nbId\":\"nbId2\"}},{\"inventoryName\":\"test3\",\"globalNbId\":{}}]",string(bodyBytes) )
+       assert.Equal(t, "[{\"inventoryName\":\"test1\",\"globalNbId\":{\"plmnId\":\"plmnId1\",\"nbId\":\"nbId1\"}},{\"inventoryName\":\"test2\",\"globalNbId\":{\"plmnId\":\"plmnId2\",\"nbId\":\"nbId2\"}},{\"inventoryName\":\"test3\",\"globalNbId\":{}}]", string(bodyBytes))
 }
 
 func TestNodebController_GetNodebIdList_EmptyList(t *testing.T) {
@@ -187,7 +186,6 @@ func TestNodebController_GetNodebIdList_EmptyList(t *testing.T) {
        nbList := []*entities.NbIdentity{}
        rnibReaderMock.On("GetListNodebIds").Return(nbList, rnibError)
 
-
        rnibReaderProvider := func() reader.RNibReader {
                return &rnibReaderMock
        }
@@ -220,4 +218,4 @@ func TestNodebController_GetNodebIdList_InternalError(t *testing.T) {
 
        executeGetNodebIdList(logger, writer, rnibReaderProvider)
        assert.Equal(t, writer.Result().StatusCode, http.StatusInternalServerError)
-}
\ No newline at end of file
+}

diff --git a/E2Manager/handlers/httpmsghandlers/delete_all_request_handler_test.go b/E2Manager/handlers/httpmsghandlers/delete_all_request_handler_test.go
index ffd428e..be1cd25 100644 (file)
--- a/E2Manager/handlers/httpmsghandlers/delete_all_request_handler_test.go
+++ b/E2Manager/handlers/httpmsghandlers/delete_all_request_handler_test.go
@@ -26,7 +26,6 @@ import (
        "e2mgr/rNibWriter"
        "e2mgr/rmrCgo"
        "e2mgr/services"
-       "e2mgr/sessions"
        "e2mgr/tests"
        "fmt"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
@@ -466,5 +465,5 @@ func getRmrService(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger)
        rmrMessenger := rmrCgo.RmrMessenger(rmrMessengerMock)
        messageChannel := make(chan *models.NotificationResponse)
        rmrMessengerMock.On("Init", tests.GetPort(), tests.MaxMsgSize, tests.Flags, log).Return(&rmrMessenger)
-       return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, make(sessions.E2Sessions), messageChannel)
+       return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, messageChannel)
 }

diff --git a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go
index 86bf3f2..73e86bd 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler.go
@@ -21,7 +21,6 @@ import (
        "e2mgr/logger"
        "e2mgr/managers"
        "e2mgr/models"
-       "e2mgr/sessions"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
 )
@@ -38,7 +37,7 @@ func NewE2TermInitNotificationHandler(ranReconnectionManager *managers.RanReconn
        }
 }
 
-func (handler E2TermInitNotificationHandler) Handle(logger *logger.Logger, e2Sessions sessions.E2Sessions, request *models.NotificationRequest, messageChannel chan<- *models.NotificationResponse) {
+func (handler E2TermInitNotificationHandler) Handle(logger *logger.Logger, request *models.NotificationRequest, messageChannel chan<- *models.NotificationResponse) {
 
 logger.Infof("#E2TermInitNotificationHandler.Handle - Handling E2_TERM_INIT")
 

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 51827f4..8bb8a05 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go
@@ -10,7 +10,6 @@ import (
        "e2mgr/rNibWriter"
        "e2mgr/rmrCgo"
        "e2mgr/services"
-       "e2mgr/sessions"
        "e2mgr/tests"
        "fmt"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
@@ -35,7 +34,7 @@ func initRanLostConnectionTest(t *testing.T) (*logger.Logger, *mocks.RnibReaderM
        rnibWriterProvider := func() rNibWriter.RNibWriter {
                return writerMock
        }
-       ranSetupManager := managers.NewRanSetupManager(logger,rmrService, rnibWriterProvider)
+       ranSetupManager := managers.NewRanSetupManager(logger, rmrService, rnibWriterProvider)
        ranReconnectionManager := managers.NewRanReconnectionManager(logger, configuration.ParseConfiguration(), rnibReaderProvider, rnibWriterProvider, ranSetupManager)
        return logger, readerMock, writerMock, rmrMessengerMock, ranReconnectionManager
 }
@@ -64,7 +63,7 @@ func TestE2TerminInitHandlerSuccessOneRan(t *testing.T) {
        rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg, nil)
 
        handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-       handler.Handle(log, nil, nil, nil)
+       handler.Handle(log, nil, nil)
 
        writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 1)
        rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 1)
@@ -96,7 +95,7 @@ func TestE2TerminInitHandlerSuccessTwoRans(t *testing.T) {
        rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg, nil)
 
        handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-       handler.Handle(log, nil, nil, nil)
+       handler.Handle(log, nil, nil)
 
        writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2)
        rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 2)
@@ -137,7 +136,7 @@ func TestE2TerminInitHandlerSuccessThreeRansFirstRmrFailure(t *testing.T) {
        rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg0, fmt.Errorf("RMR Error"))
 
        handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-       handler.Handle(log, nil, nil, nil)
+       handler.Handle(log, nil, nil)
 
        //test1 (before send +1, after failure +1), test2 (0) test3 (0)
        writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 2)
@@ -185,7 +184,7 @@ func TestE2TerminInitHandlerSuccessThreeRansSecondNotFoundFailure(t *testing.T)
        rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg0, nil)
 
        handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-       handler.Handle(log, nil, nil, nil)
+       handler.Handle(log, nil, nil)
 
        readerMock.AssertNumberOfCalls(t, "GetNodeb", 3)
        //test1 (+1), test2 failure (0) test3 (+1)
@@ -234,7 +233,7 @@ func TestE2TerminInitHandlerSuccessThreeRansSecondRnibInternalErrorFailure(t *te
        rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg0, nil)
 
        handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-       handler.Handle(log, nil, nil, nil)
+       handler.Handle(log, nil, nil)
 
        readerMock.AssertNumberOfCalls(t, "GetNodeb", 2)
        //test1 (+1), test2 failure (0) test3 (0)
@@ -254,7 +253,7 @@ func TestE2TerminInitHandlerSuccessZeroRans(t *testing.T) {
        readerMock.On("GetListNodebIds").Return([]*entities.NbIdentity{}, rnibErr)
 
        handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-       handler.Handle(log, nil, nil, nil)
+       handler.Handle(log, nil, nil)
 
        writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 0)
        rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 0)
@@ -270,7 +269,7 @@ func TestE2TerminInitHandlerFailureGetListNodebIds(t *testing.T) {
        readerMock.On("GetListNodebIds").Return([]*entities.NbIdentity{}, common.NewInternalError(fmt.Errorf("internal error")))
 
        handler := NewE2TermInitNotificationHandler(ranReconnectMgr, readerProvider)
-       handler.Handle(log, nil, nil, nil)
+       handler.Handle(log, nil, nil)
 
        writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 0)
        rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 0)
@@ -281,7 +280,7 @@ func getRmrService(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger)
        rmrMessenger := rmrCgo.RmrMessenger(rmrMessengerMock)
        messageChannel := make(chan *models.NotificationResponse)
        rmrMessengerMock.On("Init", tests.GetPort(), tests.MaxMsgSize, tests.Flags, log).Return(&rmrMessenger)
-       return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, make(sessions.E2Sessions), messageChannel)
+       return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, messageChannel)
 }
 
 // TODO: extract to test_utils

diff --git a/E2Manager/handlers/rmrmsghandlers/enb_load_information_notification_handler.go b/E2Manager/handlers/rmrmsghandlers/enb_load_information_notification_handler.go
index ceee190..2185e2b 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/enb_load_information_notification_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/enb_load_information_notification_handler.go
@@ -7,7 +7,6 @@ import (
        "e2mgr/logger"
        "e2mgr/models"
        "e2mgr/rNibWriter"
-       "e2mgr/sessions"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
        "time"
 )
@@ -26,7 +25,7 @@ func elapsed(startTime time.Time) float64 {
        return float64(time.Since(startTime)) / float64(time.Millisecond)
 }
 
-func (src EnbLoadInformationNotificationHandler) Handle(logger *logger.Logger, e2Sessions sessions.E2Sessions, request *models.NotificationRequest, messageChannel chan<- *models.NotificationResponse) {
+func (src EnbLoadInformationNotificationHandler) Handle(logger *logger.Logger, request *models.NotificationRequest, messageChannel chan<- *models.NotificationResponse) {
 
        pdu, err := converters.UnpackX2apPdu(logger, e2pdus.MaxAsn1CodecAllocationBufferSize, request.Len, request.Payload, e2pdus.MaxAsn1CodecMessageBufferSize)
 

diff --git a/E2Manager/handlers/rmrmsghandlers/enb_load_information_notification_handler_test.go b/E2Manager/handlers/rmrmsghandlers/enb_load_information_notification_handler_test.go
index c507ec3..fb1fb4e 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/enb_load_information_notification_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/enb_load_information_notification_handler_test.go
@@ -20,7 +20,6 @@ package rmrmsghandlers
 import (
        "e2mgr/logger"
        "e2mgr/models"
-       "e2mgr/sessions"
        "fmt"
        "time"
 )
@@ -52,7 +51,7 @@ func createNotificationRequestAndHandle(log *logger.Logger, ranName string, tran
                return err
        }
 
-       loadInformationHandler.Handle(log, sessions.E2Sessions{}, notificationRequest, nil)
+       loadInformationHandler.Handle(log, notificationRequest, nil)
        return nil
 }
 
@@ -77,7 +76,7 @@ func createNotificationRequestAndHandle(log *logger.Logger, ranName string, tran
 //     var packedExampleByteSlice []byte
 //     _, err = fmt.Sscanf(FullUperPdu, "%x", &packedExampleByteSlice)
 //     notificationRequest := models.NewNotificationRequest(inventoryName, packedExampleByteSlice, time.Now(), " 881828026419")
-//     loadInformationHandler.Handle(log, sessions.E2Sessions{}, notificationRequest, nil)
+//     loadInformationHandler.Handle(log, notificationRequest, nil)
 //
 //     writerMock.AssertNumberOfCalls(t, "SaveRanLoadInformation", 1)
 //}
@@ -103,7 +102,7 @@ func createNotificationRequestAndHandle(log *logger.Logger, ranName string, tran
 //     var packedExampleByteSlice []byte
 //     _, err = fmt.Sscanf(GarbagePdu, "%x", &packedExampleByteSlice)
 //     notificationRequest := models.NewNotificationRequest(inventoryName, packedExampleByteSlice, time.Now(), " 881828026419")
-//     loadInformationHandler.Handle(log, sessions.E2Sessions{}, notificationRequest, nil)
+//     loadInformationHandler.Handle(log, notificationRequest, nil)
 //
 //     writerMock.AssertNumberOfCalls(t, "SaveRanLoadInformation", 0)
 //}

diff --git a/E2Manager/handlers/rmrmsghandlers/endc_configuration_update_handler.go b/E2Manager/handlers/rmrmsghandlers/endc_configuration_update_handler.go
index ea8c000..2baa3f6 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/endc_configuration_update_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/endc_configuration_update_handler.go
@@ -28,7 +28,6 @@ import (
        "e2mgr/logger"
        "e2mgr/models"
        "e2mgr/rmrCgo"
-       "e2mgr/sessions"
        "unsafe"
 )
 
@@ -38,8 +37,7 @@ func NewEndcConfigurationUpdateHandler() EndcConfigurationUpdateHandler {
        return EndcConfigurationUpdateHandler{}
 }
 
-func (src EndcConfigurationUpdateHandler) Handle(logger *logger.Logger, e2Sessions sessions.E2Sessions, request *models.NotificationRequest,
-       messageChannel chan<- *models.NotificationResponse) {
+func (src EndcConfigurationUpdateHandler) Handle(logger *logger.Logger, request *models.NotificationRequest, messageChannel chan<- *models.NotificationResponse) {
 
        var payloadSize C.ulong
        payloadSize = e2pdus.MaxAsn1PackedBufferSize

diff --git a/E2Manager/handlers/rmrmsghandlers/endc_configuration_update_handler_test.go b/E2Manager/handlers/rmrmsghandlers/endc_configuration_update_handler_test.go
index 450ac8d..9005924 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/endc_configuration_update_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/endc_configuration_update_handler_test.go
@@ -20,48 +20,45 @@ import (
        "e2mgr/logger"
        "e2mgr/models"
        "e2mgr/rmrCgo"
-       "e2mgr/sessions"
        "e2mgr/tests"
        "github.com/stretchr/testify/assert"
        "testing"
        "time"
 )
 
-func TestHandleSuccessEndcConfigUpdate(t *testing.T){
-/*     log, err := logger.InitLogger(logger.InfoLevel)
-       if err!=nil{
-               t.Errorf("#endc_configuration_update_handler_test.TestHandleSuccessEndcConfigUpdate - failed to initialize logger, error: %s", err)
-       }
-       h := EndcConfigurationUpdateHandler{}
-       E2Sessions := make(sessions.E2Sessions)
+func TestHandleSuccessEndcConfigUpdate(t *testing.T) {
+       /*      log, err := logger.InitLogger(logger.InfoLevel)
+               if err!=nil{
+                       t.Errorf("#endc_configuration_update_handler_test.TestHandleSuccessEndcConfigUpdate - failed to initialize logger, error: %s", err)
+               }
+               h := EndcConfigurationUpdateHandler{}
 
-       payload := tests.GetPackedPayload(t)
-       mBuf := rmrCgo.NewMBuf(10370, len(payload),"RanName", &payload, &tests.DummyXAction)
-       notificationRequest := models.NotificationRequest{RanName: mBuf.Meid, Len: mBuf.Len, Payload: *mBuf.Payload, StartTime: time.Now()}
-       messageChannel := make(chan *models.NotificationResponse)
+               payload := tests.GetPackedPayload(t)
+               mBuf := rmrCgo.NewMBuf(10370, len(payload),"RanName", &payload, &tests.DummyXAction)
+               notificationRequest := models.NotificationRequest{RanName: mBuf.Meid, Len: mBuf.Len, Payload: *mBuf.Payload, StartTime: time.Now()}
+               messageChannel := make(chan *models.NotificationResponse)
 
-       go h.Handle(log, E2Sessions, &notificationRequest, messageChannel)
+               go h.Handle(log, &notificationRequest, messageChannel)
 
-       response := <-messageChannel
+               response := <-messageChannel
 
-       assert.NotEmpty(t, response)
-       assert.EqualValues(t, 10371, response.MgsType)
-       assert.True(t, len(response.Payload) > 0)*/
+               assert.NotEmpty(t, response)
+               assert.EqualValues(t, 10371, response.MgsType)
+               assert.True(t, len(response.Payload) > 0)*/
 }
 
-func TestHandleFailureEndcConfigUpdate(t *testing.T){
+func TestHandleFailureEndcConfigUpdate(t *testing.T) {
        log, err := logger.InitLogger(logger.InfoLevel)
-       if err!=nil{
+       if err != nil {
                t.Errorf("#endc_configuration_update_handler_test.TestHandleFailureEndcConfigUpdate - failed to initialize logger, error: %s", err)
        }
        h := EndcConfigurationUpdateHandler{}
-       E2Sessions := make(sessions.E2Sessions)
 
-       mBuf := rmrCgo.NewMBuf(tests.MessageType, 4,"RanName", &tests.DummyPayload, &tests.DummyXAction)
+       mBuf := rmrCgo.NewMBuf(tests.MessageType, 4, "RanName", &tests.DummyPayload, &tests.DummyXAction)
        notificationRequest := models.NotificationRequest{RanName: mBuf.Meid, Len: mBuf.Len, Payload: *mBuf.Payload, StartTime: time.Now()}
        messageChannel := make(chan *models.NotificationResponse)
 
-       go h.Handle(log, E2Sessions, &notificationRequest, messageChannel)
+       go h.Handle(log, &notificationRequest, messageChannel)
 
        response := <-messageChannel
 

diff --git a/E2Manager/handlers/rmrmsghandlers/notification_handler.go b/E2Manager/handlers/rmrmsghandlers/notification_handler.go
index ae25dde..51fa2d3 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/notification_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/notification_handler.go
@@ -20,12 +20,11 @@ package rmrmsghandlers
 import (
        "e2mgr/logger"
        "e2mgr/models"
-       "e2mgr/sessions"
        "time"
 )
 
 type NotificationHandler interface {
-       Handle(*logger.Logger, sessions.E2Sessions, *models.NotificationRequest, chan<- *models.NotificationResponse)
+       Handle(*logger.Logger, *models.NotificationRequest, chan<- *models.NotificationResponse)
 }
 
 //TODO: remove that

diff --git a/E2Manager/handlers/rmrmsghandlers/ran_lost_connection_handler.go b/E2Manager/handlers/rmrmsghandlers/ran_lost_connection_handler.go
index 7933963..e6ba81e 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/ran_lost_connection_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/ran_lost_connection_handler.go
@@ -21,7 +21,6 @@ import (
        "e2mgr/logger"
        "e2mgr/managers"
        "e2mgr/models"
-       "e2mgr/sessions"
 )
 
 type RanLostConnectionHandler struct {
@@ -33,7 +32,7 @@ func NewRanLostConnectionHandler(ranReconnectionManager managers.IRanReconnectio
                ranReconnectionManager: ranReconnectionManager,
        }
 }
-func (handler RanLostConnectionHandler) Handle(logger *logger.Logger, e2Sessions sessions.E2Sessions, request *models.NotificationRequest, messageChannel chan<- *models.NotificationResponse) {
+func (handler RanLostConnectionHandler) Handle(logger *logger.Logger, request *models.NotificationRequest, messageChannel chan<- *models.NotificationResponse) {
 
        ranName := request.RanName
 

diff --git a/E2Manager/handlers/rmrmsghandlers/ran_lost_connection_handler_test.go b/E2Manager/handlers/rmrmsghandlers/ran_lost_connection_handler_test.go
index 8e1464f..176d901 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/ran_lost_connection_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/ran_lost_connection_handler_test.go
@@ -20,7 +20,6 @@ import (
        "e2mgr/logger"
        "e2mgr/mocks"
        "e2mgr/models"
-       "e2mgr/sessions"
        "github.com/pkg/errors"
        "testing"
 )
@@ -32,7 +31,7 @@ func TestLostConnectionHandlerSuccess(t *testing.T) {
        ranReconnectionManagerMock := &mocks.RanReconnectionManagerMock{}
        ranReconnectionManagerMock.On("ReconnectRan", ranName).Return(nil)
        handler := NewRanLostConnectionHandler(ranReconnectionManagerMock)
-       handler.Handle(logger, make(sessions.E2Sessions), &notificationRequest, nil)
+       handler.Handle(logger, &notificationRequest, nil)
        ranReconnectionManagerMock.AssertCalled(t, "ReconnectRan", ranName)
 }
 
@@ -43,6 +42,6 @@ func TestLostConnectionHandlerFailure(t *testing.T) {
        ranReconnectionManagerMock := &mocks.RanReconnectionManagerMock{}
        ranReconnectionManagerMock.On("ReconnectRan", ranName).Return(errors.New("error"))
        handler := NewRanLostConnectionHandler(ranReconnectionManagerMock)
-       handler.Handle(logger, make(sessions.E2Sessions), &notificationRequest, nil)
+       handler.Handle(logger, &notificationRequest, nil)
        ranReconnectionManagerMock.AssertCalled(t, "ReconnectRan", ranName)
 }
\ No newline at end of file

diff --git a/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go b/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go
index 99329ff..fc21cc7 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go
@@ -21,7 +21,6 @@ import (
        "e2mgr/managers"
        "e2mgr/models"
        "e2mgr/rNibWriter"
-       "e2mgr/sessions"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
 )
@@ -42,7 +41,7 @@ func NewSetupResponseNotificationHandler(rnibReaderProvider func() reader.RNibRe
        }
 }
 
-func (h SetupResponseNotificationHandler) Handle(logger *logger.Logger, e2Sessions sessions.E2Sessions, request *models.NotificationRequest, messageChannel chan<- *models.NotificationResponse) {
+func (h SetupResponseNotificationHandler) Handle(logger *logger.Logger, request *models.NotificationRequest, messageChannel chan<- *models.NotificationResponse) {
        logger.Infof("#SetupResponseNotificationHandler - RAN name: %s - Received %s notification", request.RanName, h.notificationType)
 
        inventoryName := request.RanName

diff --git a/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler_test.go b/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler_test.go
index 3898eb4..e94a36a 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler_test.go
@@ -57,7 +57,7 @@ func TestSetupResponseGetNodebFailure(t *testing.T) {
        testContext := NewSetupResponseTestContext(nil)
        handler := NewSetupResponseNotificationHandler(testContext.rnibReaderProvider, testContext.rnibWriterProvider, &managers.X2SetupResponseManager{}, "X2 Setup Response")
        testContext.readerMock.On("GetNodeb", RanName).Return(&entities.NodebInfo{}, common.NewInternalError(errors.New("Error")))
-       handler.Handle(testContext.logger, nil, &notificationRequest, nil)
+       handler.Handle(testContext.logger, &notificationRequest, nil)
        testContext.readerMock.AssertCalled(t, "GetNodeb", RanName)
        testContext.writerMock.AssertNotCalled(t, "SaveNodeb")
 }
@@ -69,7 +69,7 @@ func TestSetupResponseInvalidConnectionStatus(t *testing.T) {
        handler := NewSetupResponseNotificationHandler(testContext.rnibReaderProvider, testContext.rnibWriterProvider, &managers.X2SetupResponseManager{}, "X2 Setup Response")
        var rnibErr error
        testContext.readerMock.On("GetNodeb", ranName).Return(&entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_SHUT_DOWN}, rnibErr)
-       handler.Handle(testContext.logger, nil, &notificationRequest, nil)
+       handler.Handle(testContext.logger, &notificationRequest, nil)
        testContext.readerMock.AssertCalled(t, "GetNodeb", ranName)
        testContext.writerMock.AssertNotCalled(t, "SaveNodeb")
 }
@@ -98,7 +98,7 @@ func executeHandleSuccessSetupResponse(t *testing.T, packedPdu string, setupResp
 
        testContext.readerMock.On("GetNodeb", RanName).Return(nodebInfo, rnibErr)
        testContext.writerMock.On("SaveNodeb", mock.Anything, mock.Anything).Return(saveNodebMockReturnValue)
-       handler.Handle(testContext.logger, nil, &notificationRequest, nil)
+       handler.Handle(testContext.logger, &notificationRequest, nil)
 
        return testContext, nodebInfo
 }
@@ -159,14 +159,14 @@ func TestSetupResponseInvalidPayload(t *testing.T) {
        handler := NewSetupResponseNotificationHandler(testContext.rnibReaderProvider, testContext.rnibWriterProvider, &managers.X2SetupResponseManager{}, "X2 Setup Response")
        var rnibErr error
        testContext.readerMock.On("GetNodeb", ranName).Return(&entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, ConnectionAttempts: 1}, rnibErr)
-       handler.Handle(testContext.logger, nil, &notificationRequest, nil)
+       handler.Handle(testContext.logger, &notificationRequest, nil)
        testContext.readerMock.AssertCalled(t, "GetNodeb", ranName)
        testContext.writerMock.AssertNotCalled(t, "SaveNodeb")
 }
 
 func TestSetupResponseSaveNodebFailure(t *testing.T) {
        rnibErr := common.NewInternalError(errors.New("Error"))
-       testContext, nodebInfo := executeHandleSuccessSetupResponse(t, X2SetupResponsePackedPdu, &managers.X2SetupResponseManager{},"X2 Setup Response", rnibErr)
+       testContext, nodebInfo := executeHandleSuccessSetupResponse(t, X2SetupResponsePackedPdu, &managers.X2SetupResponseManager{}, "X2 Setup Response", rnibErr)
        testContext.readerMock.AssertCalled(t, "GetNodeb", RanName)
        testContext.writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, nodebInfo)
-}
\ No newline at end of file
+}

diff --git a/E2Manager/handlers/rmrmsghandlers/x2_reset_request_notification_handler.go b/E2Manager/handlers/rmrmsghandlers/x2_reset_request_notification_handler.go
index 367b936..e1f6841 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/x2_reset_request_notification_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/x2_reset_request_notification_handler.go
@@ -27,7 +27,6 @@ import (
        "e2mgr/logger"
        "e2mgr/models"
        "e2mgr/rmrCgo"
-       "e2mgr/sessions"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
        "unsafe"
@@ -43,7 +42,7 @@ func NewX2ResetRequestNotificationHandler(rnibReaderProvider func() reader.RNibR
        }
 }
 
-func (src X2ResetRequestNotificationHandler) Handle(logger *logger.Logger, e2Sessions sessions.E2Sessions, request *models.NotificationRequest, messageChannel chan<- *models.NotificationResponse) {
+func (src X2ResetRequestNotificationHandler) Handle(logger *logger.Logger, request *models.NotificationRequest, messageChannel chan<- *models.NotificationResponse) {
 
        logger.Debugf("#X2ResetRequestNotificationHandler.Handle - Ran name: %s", request.RanName)
 

diff --git a/E2Manager/handlers/rmrmsghandlers/x2_reset_request_notification_handler_test.go b/E2Manager/handlers/rmrmsghandlers/x2_reset_request_notification_handler_test.go
index 998330b..3e32c36 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/x2_reset_request_notification_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/x2_reset_request_notification_handler_test.go
@@ -41,17 +41,17 @@ func TestX2ResetRequestNotifSuccess(t *testing.T) {
        h := NewX2ResetRequestNotificationHandler(readerProvider)
 
        xaction := []byte("RanName")
-       mBuf := rmrCgo.NewMBuf(tests.MessageType, len(payload),"RanName", &payload, &xaction)
+       mBuf := rmrCgo.NewMBuf(tests.MessageType, len(payload), "RanName", &payload, &xaction)
        notificationRequest := models.NotificationRequest{RanName: mBuf.Meid, Len: mBuf.Len, Payload: *mBuf.Payload,
                StartTime: time.Now(), TransactionId: string(xaction)}
 
-       nb := &entities.NodebInfo{RanName:mBuf.Meid, ConnectionStatus:entities.ConnectionStatus_CONNECTED,}
+       nb := &entities.NodebInfo{RanName: mBuf.Meid, ConnectionStatus: entities.ConnectionStatus_CONNECTED,}
        var rnibErr error
        readerMock.On("GetNodeb", mBuf.Meid).Return(nb, rnibErr)
 
        messageChannel := make(chan *models.NotificationResponse)
 
-       go h.Handle(log,nil, &notificationRequest, messageChannel)
+       go h.Handle(log, &notificationRequest, messageChannel)
 
        result := <-messageChannel
        assert.Equal(t, result.RanName, mBuf.Meid)
@@ -69,16 +69,16 @@ func TestHandleX2ResetRequestNotifShuttingDownStatus(t *testing.T) {
        h := NewX2ResetRequestNotificationHandler(readerProvider)
 
        xaction := []byte("RanName")
-       mBuf := rmrCgo.NewMBuf(tests.MessageType, len(payload),"RanName", &payload, &xaction)
+       mBuf := rmrCgo.NewMBuf(tests.MessageType, len(payload), "RanName", &payload, &xaction)
        notificationRequest := models.NotificationRequest{RanName: mBuf.Meid, Len: mBuf.Len, Payload: *mBuf.Payload,
                StartTime: time.Now(), TransactionId: string(xaction)}
 
-       nb := &entities.NodebInfo{RanName:mBuf.Meid, ConnectionStatus:entities.ConnectionStatus_SHUTTING_DOWN,}
+       nb := &entities.NodebInfo{RanName: mBuf.Meid, ConnectionStatus: entities.ConnectionStatus_SHUTTING_DOWN,}
        var rnibErr error
 
        readerMock.On("GetNodeb", mBuf.Meid).Return(nb, rnibErr)
 
-       h.Handle(log,nil, &notificationRequest, nil)
+       h.Handle(log, &notificationRequest, nil)
 }
 
 func TestHandleX2ResetRequestNotifDisconnectStatus(t *testing.T) {
@@ -92,19 +92,19 @@ func TestHandleX2ResetRequestNotifDisconnectStatus(t *testing.T) {
        h := NewX2ResetRequestNotificationHandler(readerProvider)
 
        xaction := []byte("RanName")
-       mBuf := rmrCgo.NewMBuf(tests.MessageType, len(payload),"RanName", &payload, &xaction)
+       mBuf := rmrCgo.NewMBuf(tests.MessageType, len(payload), "RanName", &payload, &xaction)
        notificationRequest := models.NotificationRequest{RanName: mBuf.Meid, Len: mBuf.Len, Payload: *mBuf.Payload,
                StartTime: time.Now(), TransactionId: string(xaction)}
 
-       nb := &entities.NodebInfo{RanName:mBuf.Meid, ConnectionStatus:entities.ConnectionStatus_DISCONNECTED,}
+       nb := &entities.NodebInfo{RanName: mBuf.Meid, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED,}
        var rnibErr error
 
        readerMock.On("GetNodeb", mBuf.Meid).Return(nb, rnibErr)
 
-       h.Handle(log,nil, &notificationRequest, nil)
+       h.Handle(log, &notificationRequest, nil)
 }
 
-func TestHandleX2ResetRequestNotifGetNodebFailed(t *testing.T){
+func TestHandleX2ResetRequestNotifGetNodebFailed(t *testing.T) {
 
        log := initLog(t)
        var payload []byte
@@ -115,13 +115,13 @@ func TestHandleX2ResetRequestNotifGetNodebFailed(t *testing.T){
 
        h := NewX2ResetRequestNotificationHandler(readerProvider)
        xaction := []byte("RanName")
-       mBuf := rmrCgo.NewMBuf(tests.MessageType, len(payload),"RanName", &payload, &xaction)
+       mBuf := rmrCgo.NewMBuf(tests.MessageType, len(payload), "RanName", &payload, &xaction)
        notificationRequest := models.NotificationRequest{RanName: mBuf.Meid, Len: mBuf.Len, Payload: *mBuf.Payload,
                StartTime: time.Now(), TransactionId: string(xaction)}
 
        var nb *entities.NodebInfo
-       rnibErr  := &common.ResourceNotFoundError{}
+       rnibErr := &common.ResourceNotFoundError{}
        readerMock.On("GetNodeb", mBuf.Meid).Return(nb, rnibErr)
 
-       h.Handle(log,nil, &notificationRequest, nil)
-}
\ No newline at end of file
+       h.Handle(log, &notificationRequest, nil)
+}

diff --git a/E2Manager/handlers/rmrmsghandlers/x2_reset_response_handler.go b/E2Manager/handlers/rmrmsghandlers/x2_reset_response_handler.go
index 96b1186..cd1556d 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/x2_reset_response_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/x2_reset_response_handler.go
@@ -26,7 +26,6 @@ import (
        "e2mgr/e2pdus"
        "e2mgr/logger"
        "e2mgr/models"
-       "e2mgr/sessions"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
 )
 
@@ -40,8 +39,7 @@ func NewX2ResetResponseHandler(rnibReaderProvider func() reader.RNibReader) X2Re
        }
 }
 
-func (src X2ResetResponseHandler) Handle(logger *logger.Logger, e2Sessions sessions.E2Sessions,
-       request *models.NotificationRequest, messageChannel chan<- *models.NotificationResponse) {
+func (src X2ResetResponseHandler) Handle(logger *logger.Logger, request *models.NotificationRequest, messageChannel chan<- *models.NotificationResponse) {
 
        logger.Infof("#x2ResetResponseHandler.Handle - received reset response. Payload: %x", request.Payload)
 

diff --git a/E2Manager/handlers/rmrmsghandlers/x2_reset_response_handler_test.go b/E2Manager/handlers/rmrmsghandlers/x2_reset_response_handler_test.go
index 513596f..0134399 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/x2_reset_response_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/x2_reset_response_handler_test.go
@@ -22,7 +22,6 @@ import (
        "e2mgr/mocks"
        "e2mgr/models"
        "e2mgr/rmrCgo"
-       "e2mgr/sessions"
        "e2mgr/tests"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
@@ -46,10 +45,7 @@ func TestX2ResetResponseSuccess(t *testing.T) {
        }
 
        h := NewX2ResetResponseHandler(rnibReaderProvider)
-       e2Sessions := make(sessions.E2Sessions)
-       //xaction := []byte(fmt.Sprintf("%32s", "1234"))
        xaction := []byte("RanName")
-       e2Sessions[string(xaction)] = sessions.E2SessionDetails{SessionStart: time.Now()}
        mBuf := rmrCgo.NewMBuf(tests.MessageType, len(payload),"RanName", &payload, &xaction)
        notificationRequest := models.NotificationRequest{RanName: mBuf.Meid, Len: mBuf.Len, Payload: *mBuf.Payload,
                StartTime: time.Now(), TransactionId: string(xaction)}
@@ -59,7 +55,7 @@ func TestX2ResetResponseSuccess(t *testing.T) {
        var rnibErr error
        readerMock.On("GetNodeb", mBuf.Meid).Return(nb, rnibErr)
 
-       h.Handle(log,e2Sessions, &notificationRequest, messageChannel)
+       h.Handle(log, &notificationRequest, messageChannel)
 
        //TODO:Nothing to verify
 }
@@ -76,10 +72,7 @@ func TestX2ResetResponseReaderFailure(t *testing.T) {
        }
 
        h := NewX2ResetResponseHandler(rnibReaderProvider)
-       e2Sessions := make(sessions.E2Sessions)
-       //xaction = []byte(fmt.Sprintf("%32s", "1234"))
        xaction := []byte("RanName")
-       e2Sessions[string(xaction)] = sessions.E2SessionDetails{SessionStart: time.Now()}
        mBuf := rmrCgo.NewMBuf(tests.MessageType, len(payload),"RanName", &payload, &xaction)
        notificationRequest := models.NotificationRequest{RanName: mBuf.Meid, Len: mBuf.Len, Payload: *mBuf.Payload,
                StartTime: time.Now(), TransactionId: string(xaction)}
@@ -89,7 +82,7 @@ func TestX2ResetResponseReaderFailure(t *testing.T) {
        rnibErr  := common.NewResourceNotFoundError("nodeb not found")
        readerMock.On("GetNodeb", mBuf.Meid).Return(nb, rnibErr)
 
-       h.Handle(log,e2Sessions, &notificationRequest, messageChannel)
+       h.Handle(log, &notificationRequest, messageChannel)
 
        //TODO:Nothing to verify
 }
@@ -106,10 +99,7 @@ func TestX2ResetResponseUnpackFailure(t *testing.T) {
        }
 
        h := NewX2ResetResponseHandler(rnibReaderProvider)
-       e2Sessions := make(sessions.E2Sessions)
-       //xaction := []byte(fmt.Sprintf("%32s", "1234"))
        xaction := []byte("RanName")
-       e2Sessions[string(xaction)] = sessions.E2SessionDetails{SessionStart: time.Now()}
        mBuf := rmrCgo.NewMBuf(tests.MessageType, len(payload),"RanName", &payload, &xaction)
        notificationRequest := models.NotificationRequest{RanName: mBuf.Meid, Len: mBuf.Len, Payload: *mBuf.Payload,
                StartTime: time.Now(), TransactionId: string(xaction)}
@@ -119,7 +109,7 @@ func TestX2ResetResponseUnpackFailure(t *testing.T) {
        var rnibErr error
        readerMock.On("GetNodeb", mBuf.Meid).Return(nb, rnibErr)
 
-       h.Handle(log,e2Sessions, &notificationRequest, messageChannel)
+       h.Handle(log, &notificationRequest, messageChannel)
 
        //TODO:Nothing to verify
 }

diff --git a/E2Manager/handlers/rmrmsghandlers/x2enb_configuration_update_handler.go b/E2Manager/handlers/rmrmsghandlers/x2enb_configuration_update_handler.go
index e95e871..2f35925 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/x2enb_configuration_update_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/x2enb_configuration_update_handler.go
@@ -28,7 +28,6 @@ import (
        "e2mgr/logger"
        "e2mgr/models"
        "e2mgr/rmrCgo"
-       "e2mgr/sessions"
        "unsafe"
 )
 
@@ -38,7 +37,7 @@ func NewX2EnbConfigurationUpdateHandler() X2EnbConfigurationUpdateHandler {
        return X2EnbConfigurationUpdateHandler{}
 }
 
-func (src X2EnbConfigurationUpdateHandler) Handle(logger *logger.Logger, e2Sessions sessions.E2Sessions, request *models.NotificationRequest,
+func (src X2EnbConfigurationUpdateHandler) Handle(logger *logger.Logger, request *models.NotificationRequest,
        messageChannel chan<- *models.NotificationResponse) {
 
        var payloadSize C.ulong

diff --git a/E2Manager/handlers/rmrmsghandlers/x2enb_configuration_update_handler_test.go b/E2Manager/handlers/rmrmsghandlers/x2enb_configuration_update_handler_test.go
index e0e22dd..7cb6b7d 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/x2enb_configuration_update_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/x2enb_configuration_update_handler_test.go
@@ -20,7 +20,6 @@ import (
        "e2mgr/logger"
        "e2mgr/models"
        "e2mgr/rmrCgo"
-       "e2mgr/sessions"
        "e2mgr/tests"
        "github.com/stretchr/testify/assert"
        "testing"
@@ -33,14 +32,13 @@ func TestHandleSuccessEnbConfigUpdate(t *testing.T){
                        t.Errorf("#endc_configuration_update_handler_test.TestHandleSuccessEndcConfigUpdate - failed to initialize logger, error: %s", err)
                }
                h := X2EnbConfigurationUpdateHandler{}
-               E2Sessions := make(sessions.E2Sessions)
 
                payload := tests.GetPackedPayload(t)
                mBuf := rmrCgo.NewMBuf(10370, len(payload),"RanName", &payload, &tests.DummyXAction)
                notificationRequest := models.NotificationRequest{RanName: mBuf.Meid, Len: mBuf.Len, Payload: *mBuf.Payload, StartTime: time.Now()}
                messageChannel := make(chan *models.NotificationResponse)
 
-               go h.Handle(log, E2Sessions, &notificationRequest, messageChannel)
+               go h.Handle(log, &notificationRequest, messageChannel)
 
                response := <-messageChannel
 
@@ -55,13 +53,12 @@ func TestHandleFailureEnbConfigUpdate(t *testing.T){
                t.Errorf("#endc_configuration_update_handler_test.TestHandleFailureEndcConfigUpdate - failed to initialize logger, error: %s", err)
        }
        h := X2EnbConfigurationUpdateHandler{}
-       E2Sessions := make(sessions.E2Sessions)
 
        mBuf := rmrCgo.NewMBuf(tests.MessageType, 4,"RanName", &tests.DummyPayload, &tests.DummyXAction)
        notificationRequest := models.NotificationRequest{RanName: mBuf.Meid, Len: mBuf.Len, Payload: *mBuf.Payload, StartTime: time.Now()}
        messageChannel := make(chan *models.NotificationResponse)
 
-       go h.Handle(log, E2Sessions, &notificationRequest, messageChannel)
+       go h.Handle(log, &notificationRequest, messageChannel)
 
        response := <-messageChannel
 

diff --git a/E2Manager/main/http_server.go b/E2Manager/main/http_server.go
index d644598..cbad8ce 100644 (file)
--- a/E2Manager/main/http_server.go
+++ b/E2Manager/main/http_server.go
@@ -54,7 +54,7 @@ func main() {
        defer reader.Close()
 
        rmrResponseChannel := make(chan *models.NotificationResponse, config.NotificationResponseBuffer)
-       rmrService := services.NewRmrService(rmrConfig, msgImpl, controllers.E2Sessions, rmrResponseChannel)
+       rmrService := services.NewRmrService(rmrConfig, msgImpl, rmrResponseChannel)
        var ranSetupManager = managers.NewRanSetupManager(logger, rmrService, rNibWriter.GetRNibWriter)
        var ranReconnectionManager = managers.NewRanReconnectionManager(logger, config, reader.GetRNibReader, rNibWriter.GetRNibWriter, ranSetupManager)
        var nManager = notificationmanager.NewNotificationManager(reader.GetRNibReader, rNibWriter.GetRNibWriter, ranReconnectionManager)

diff --git a/E2Manager/managers/notificationmanager/notification_manager.go b/E2Manager/managers/notificationmanager/notification_manager.go
index 7955245..319dde7 100644 (file)
--- a/E2Manager/managers/notificationmanager/notification_manager.go
+++ b/E2Manager/managers/notificationmanager/notification_manager.go
@@ -24,7 +24,6 @@ import (
        "e2mgr/providers/rmrmsghandlerprovider"
        "e2mgr/rNibWriter"
        "e2mgr/rmrCgo"
-       "e2mgr/sessions"
        "fmt"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
        "time"
@@ -43,7 +42,7 @@ func NewNotificationManager(rnibReaderProvider func() reader.RNibReader, rnibWri
 }
 
 //TODO add NEWHandler with log
-func (m NotificationManager) HandleMessage(logger *logger.Logger, e2Sessions sessions.E2Sessions, mbuf *rmrCgo.MBuf, responseChannel chan<- *models.NotificationResponse) {
+func (m NotificationManager) HandleMessage(logger *logger.Logger, mbuf *rmrCgo.MBuf, responseChannel chan<- *models.NotificationResponse) {
 
        notificationHandler, err := m.notificationHandlerProvider.GetNotificationHandler(mbuf.MType)
 
@@ -53,5 +52,5 @@ func (m NotificationManager) HandleMessage(logger *logger.Logger, e2Sessions ses
        }
 
        notificationRequest := models.NewNotificationRequest(mbuf.Meid, *mbuf.Payload, time.Now(), string(*mbuf.XAction))
-       go notificationHandler.Handle(logger, e2Sessions, notificationRequest, responseChannel)
+       go notificationHandler.Handle(logger, notificationRequest, responseChannel)
 }

diff --git a/E2Manager/managers/ran_reconnection_manager_test.go b/E2Manager/managers/ran_reconnection_manager_test.go
index 95221c0..7679473 100644 (file)
--- a/E2Manager/managers/ran_reconnection_manager_test.go
+++ b/E2Manager/managers/ran_reconnection_manager_test.go
@@ -25,7 +25,6 @@ import (
        "e2mgr/rNibWriter"
        "e2mgr/rmrCgo"
        "e2mgr/services"
-       "e2mgr/sessions"
        "e2mgr/tests"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
@@ -36,7 +35,7 @@ import (
        "testing"
 )
 
-func initRanLostConnectionTest(t *testing.T) (*logger.Logger,*mocks.RmrMessengerMock, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *RanReconnectionManager) {
+func initRanLostConnectionTest(t *testing.T) (*logger.Logger, *mocks.RmrMessengerMock, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *RanReconnectionManager) {
        logger, err := logger.InitLogger(logger.DebugLevel)
        if err != nil {
                t.Errorf("#... - failed to initialize logger, error: %s", err)
@@ -53,13 +52,13 @@ func initRanLostConnectionTest(t *testing.T) (*logger.Logger,*mocks.RmrMessenger
        rnibWriterProvider := func() rNibWriter.RNibWriter {
                return writerMock
        }
-       ranSetupManager := NewRanSetupManager(logger,rmrService, rnibWriterProvider)
+       ranSetupManager := NewRanSetupManager(logger, rmrService, rnibWriterProvider)
        ranReconnectionManager := NewRanReconnectionManager(logger, configuration.ParseConfiguration(), rnibReaderProvider, rnibWriterProvider, ranSetupManager)
-       return logger,rmrMessengerMock, readerMock, writerMock, ranReconnectionManager
+       return logger, rmrMessengerMock, readerMock, writerMock, ranReconnectionManager
 }
 
 func TestRanReconnectionGetNodebFailure(t *testing.T) {
-       _,_, readerMock, writerMock, ranReconnectionManager := initRanLostConnectionTest(t)
+       _, _, readerMock, writerMock, ranReconnectionManager := initRanLostConnectionTest(t)
        ranName := "test"
        var nodebInfo *entities.NodebInfo
        readerMock.On("GetNodeb", ranName).Return(nodebInfo, common.NewInternalError(errors.New("Error")))
@@ -70,7 +69,7 @@ func TestRanReconnectionGetNodebFailure(t *testing.T) {
 }
 
 func TestShutdownRanReconnection(t *testing.T) {
-       _,_, readerMock, writerMock, ranReconnectionManager := initRanLostConnectionTest(t)
+       _, _, readerMock, writerMock, ranReconnectionManager := initRanLostConnectionTest(t)
        ranName := "test"
        origNodebInfo := &entities.NodebInfo{RanName: ranName, GlobalNbId: &entities.GlobalNbId{PlmnId: "xxx", NbId: "yyy"}, ConnectionStatus: entities.ConnectionStatus_SHUT_DOWN}
        var rnibErr error
@@ -82,7 +81,7 @@ func TestShutdownRanReconnection(t *testing.T) {
 }
 
 func TestShuttingdownRanReconnection(t *testing.T) {
-       _,_, readerMock, writerMock, ranReconnectionManager := initRanLostConnectionTest(t)
+       _, _, readerMock, writerMock, ranReconnectionManager := initRanLostConnectionTest(t)
        ranName := "test"
        origNodebInfo := &entities.NodebInfo{RanName: ranName, GlobalNbId: &entities.GlobalNbId{PlmnId: "xxx", NbId: "yyy"}, ConnectionStatus: entities.ConnectionStatus_SHUTTING_DOWN}
        var rnibErr error
@@ -97,7 +96,7 @@ func TestShuttingdownRanReconnection(t *testing.T) {
 }
 
 func TestConnectingRanWithMaxAttemptsReconnection(t *testing.T) {
-       _,_, readerMock, writerMock, ranReconnectionManager := initRanLostConnectionTest(t)
+       _, _, readerMock, writerMock, ranReconnectionManager := initRanLostConnectionTest(t)
        ranName := "test"
        origNodebInfo := &entities.NodebInfo{RanName: ranName, GlobalNbId: &entities.GlobalNbId{PlmnId: "xxx", NbId: "yyy"}, ConnectionStatus: entities.ConnectionStatus_CONNECTING, ConnectionAttempts: 20}
        var rnibErr error
@@ -112,7 +111,7 @@ func TestConnectingRanWithMaxAttemptsReconnection(t *testing.T) {
 }
 
 func TestUnconnectableRanUpdateNodebInfoFailure(t *testing.T) {
-       _,_, readerMock, writerMock, ranReconnectionManager := initRanLostConnectionTest(t)
+       _, _, readerMock, writerMock, ranReconnectionManager := initRanLostConnectionTest(t)
        ranName := "test"
        origNodebInfo := &entities.NodebInfo{RanName: ranName, GlobalNbId: &entities.GlobalNbId{PlmnId: "xxx", NbId: "yyy"}, ConnectionStatus: entities.ConnectionStatus_SHUTTING_DOWN}
        var rnibErr error
@@ -127,16 +126,16 @@ func TestUnconnectableRanUpdateNodebInfoFailure(t *testing.T) {
 }
 
 func TestConnectedRanExecuteSetupSuccess(t *testing.T) {
-       _,rmrMessengerMock, readerMock, writerMock, ranReconnectionManager := initRanLostConnectionTest(t)
+       _, rmrMessengerMock, readerMock, writerMock, ranReconnectionManager := initRanLostConnectionTest(t)
        ranName := "test"
-       origNodebInfo := &entities.NodebInfo{RanName: ranName, GlobalNbId: &entities.GlobalNbId{PlmnId: "xxx", NbId: "yyy"}, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol:entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST}
+       origNodebInfo := &entities.NodebInfo{RanName: ranName, GlobalNbId: &entities.GlobalNbId{PlmnId: "xxx", NbId: "yyy"}, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST}
        var rnibErr error
        readerMock.On("GetNodeb", ranName).Return(origNodebInfo, rnibErr)
        updatedNodebInfo := *origNodebInfo
        updatedNodebInfo.ConnectionStatus = entities.ConnectionStatus_CONNECTING
        updatedNodebInfo.ConnectionAttempts++
        writerMock.On("UpdateNodebInfo", &updatedNodebInfo).Return(nil)
-       rmrMessengerMock.On("SendMsg",mock.Anything, mock.AnythingOfType("int")).Return(&rmrCgo.MBuf{},nil)
+       rmrMessengerMock.On("SendMsg", mock.Anything, mock.AnythingOfType("int")).Return(&rmrCgo.MBuf{}, nil)
        err := ranReconnectionManager.ReconnectRan(ranName)
        assert.Nil(t, err)
        readerMock.AssertCalled(t, "GetNodeb", ranName)
@@ -145,7 +144,7 @@ func TestConnectedRanExecuteSetupSuccess(t *testing.T) {
 }
 
 func TestConnectedRanExecuteSetupFailure(t *testing.T) {
-       _,_, readerMock, writerMock, ranReconnectionManager := initRanLostConnectionTest(t)
+       _, _, readerMock, writerMock, ranReconnectionManager := initRanLostConnectionTest(t)
        ranName := "test"
        origNodebInfo := &entities.NodebInfo{RanName: ranName, GlobalNbId: &entities.GlobalNbId{PlmnId: "xxx", NbId: "yyy"}, ConnectionStatus: entities.ConnectionStatus_CONNECTED}
        var rnibErr error
@@ -165,5 +164,5 @@ func getRmrService(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger)
        rmrMessenger := rmrCgo.RmrMessenger(rmrMessengerMock)
        messageChannel := make(chan *models.NotificationResponse)
        rmrMessengerMock.On("Init", tests.GetPort(), tests.MaxMsgSize, tests.Flags, log).Return(&rmrMessenger)
-       return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, make(sessions.E2Sessions), messageChannel)
+       return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, messageChannel)
 }

diff --git a/E2Manager/managers/ran_setup_manager.go b/E2Manager/managers/ran_setup_manager.go
index 9329411..89bdcc8 100644 (file)
--- a/E2Manager/managers/ran_setup_manager.go
+++ b/E2Manager/managers/ran_setup_manager.go
@@ -25,9 +25,7 @@ import (
        "e2mgr/rNibWriter"
        "e2mgr/rmrCgo"
        "e2mgr/services"
-       "e2mgr/sessions"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
-       "time"
 )
 
 type RanSetupManager struct {
@@ -92,20 +90,14 @@ func (m *RanSetupManager) prepareSetupRequest(nodebInfo *entities.NodebInfo) (in
 // ExecuteSetup updates the connection status and number of attempts in the nodebInfo and send an endc/x2 setup request to establish a connection with the RAN
 func (m *RanSetupManager) ExecuteSetup(nodebInfo *entities.NodebInfo, status entities.ConnectionStatus) error {
 
-       //Fill details for the response handler
-       requestDetails := models.SetupRequest{RanName: nodebInfo.RanName, RanPort: uint16(nodebInfo.Port), RanIp: nodebInfo.Ip}
-       m.rmrService.E2sessions[nodebInfo.RanName] = sessions.E2SessionDetails{SessionStart: time.Now(), Request: &requestDetails}
-
        // Update retries and connection status
        if err := m.updateConnectionStatus(nodebInfo, status); err != nil {
-               delete(m.rmrService.E2sessions, nodebInfo.RanName)
                return e2managererrors.NewRnibDbError()
        }
 
        // Build the endc/x2 setup request
        rmrMsgType, request, err := m.prepareSetupRequest(nodebInfo)
        if err != nil {
-               delete(m.rmrService.E2sessions, nodebInfo.RanName)
                return err
        }
 
@@ -114,8 +106,6 @@ func (m *RanSetupManager) ExecuteSetup(nodebInfo *entities.NodebInfo, status ent
        if err := m.rmrService.SendRmrMessage(response); err != nil {
                m.logger.Errorf("#RanSetupManager.ExecuteSetup - failed sending setup request to RMR: %s", err)
 
-               delete(m.rmrService.E2sessions, nodebInfo.RanName)
-
                // Decrement retries and connection status (disconnected)
                if err := m.updateConnectionStatusDisconnected(nodebInfo); err != nil {
                        return e2managererrors.NewRnibDbError()

diff --git a/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go b/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go
index 91abb0e..d0e13f3 100644 (file)
--- a/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go
+++ b/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go
@@ -28,7 +28,6 @@ import (
        "e2mgr/rNibWriter"
        "e2mgr/rmrCgo"
        "e2mgr/services"
-       "e2mgr/sessions"
        "e2mgr/tests"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
        "github.com/stretchr/testify/assert"
@@ -40,7 +39,7 @@ func getRmrService(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger)
        rmrMessenger := rmrCgo.RmrMessenger(rmrMessengerMock)
        messageChannel := make(chan *models.NotificationResponse)
        rmrMessengerMock.On("Init", tests.GetPort(), tests.MaxMsgSize, tests.Flags, log).Return(&rmrMessenger)
-       return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, make(sessions.E2Sessions), messageChannel)
+       return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, messageChannel)
 }
 
 func TestNewIncomingRequestHandlerProvider(t *testing.T) {
@@ -54,7 +53,7 @@ func TestNewIncomingRequestHandlerProvider(t *testing.T) {
                return &mocks.RnibWriterMock{}
        }
        ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
-       provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider,ranSetupManager)
+       provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider, ranSetupManager)
 
        assert.NotNil(t, provider)
 }
@@ -71,7 +70,7 @@ func TestShutdownRequestHandler(t *testing.T) {
        }
 
        ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
-       provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider,ranSetupManager)
+       provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider, ranSetupManager)
 
        handler, err := provider.GetHandler(ShutdownRequest)
 
@@ -95,7 +94,7 @@ func TestX2SetupRequestHandler(t *testing.T) {
        }
 
        ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
-       provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider,ranSetupManager)
+       provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider, ranSetupManager)
 
        handler, err := provider.GetHandler(X2SetupRequest)
 
@@ -119,7 +118,7 @@ func TestEndcSetupRequestHandler(t *testing.T) {
        }
 
        ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
-       provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider,ranSetupManager)
+       provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider, ranSetupManager)
 
        handler, err := provider.GetHandler(EndcSetupRequest)
 

diff --git a/E2Manager/providers/rmrmsghandlerprovider/notification_handler_provider_test.go b/E2Manager/providers/rmrmsghandlerprovider/notification_handler_provider_test.go
index 6d3c0e6..b3e7c24 100644 (file)
--- a/E2Manager/providers/rmrmsghandlerprovider/notification_handler_provider_test.go
+++ b/E2Manager/providers/rmrmsghandlerprovider/notification_handler_provider_test.go
@@ -26,7 +26,6 @@ import (
        "e2mgr/models"
        "e2mgr/rNibWriter"
        "e2mgr/services"
-       "e2mgr/sessions"
        "e2mgr/tests"
        "fmt"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
@@ -60,9 +59,9 @@ func TestGetNotificationHandlerSuccess(t *testing.T) {
                handler rmrmsghandlers.NotificationHandler
        }{
                {rmrCgo.RIC_X2_SETUP_RESP, rmrmsghandlers.NewSetupResponseNotificationHandler(rnibReaderProvider, rnibWriterProvider, managers.NewX2SetupResponseManager(), "X2 Setup Response")},
-               {rmrCgo.RIC_X2_SETUP_FAILURE, rmrmsghandlers.NewSetupResponseNotificationHandler(rnibReaderProvider, rnibWriterProvider, managers.NewX2SetupFailureResponseManager(),"X2 Setup Failure Response")},
-               {rmrCgo.RIC_ENDC_X2_SETUP_RESP, rmrmsghandlers.NewSetupResponseNotificationHandler(rnibReaderProvider, rnibWriterProvider, managers.NewEndcSetupResponseManager(),"ENDC Setup Response")},
-               {rmrCgo.RIC_ENDC_X2_SETUP_FAILURE, rmrmsghandlers.NewSetupResponseNotificationHandler(rnibReaderProvider, rnibWriterProvider, managers.NewEndcSetupFailureResponseManager(),"ENDC Setup Failure Response"),},
+               {rmrCgo.RIC_X2_SETUP_FAILURE, rmrmsghandlers.NewSetupResponseNotificationHandler(rnibReaderProvider, rnibWriterProvider, managers.NewX2SetupFailureResponseManager(), "X2 Setup Failure Response")},
+               {rmrCgo.RIC_ENDC_X2_SETUP_RESP, rmrmsghandlers.NewSetupResponseNotificationHandler(rnibReaderProvider, rnibWriterProvider, managers.NewEndcSetupResponseManager(), "ENDC Setup Response")},
+               {rmrCgo.RIC_ENDC_X2_SETUP_FAILURE, rmrmsghandlers.NewSetupResponseNotificationHandler(rnibReaderProvider, rnibWriterProvider, managers.NewEndcSetupFailureResponseManager(), "ENDC Setup Failure Response"),},
                {rmrCgo.RIC_SCTP_CONNECTION_FAILURE, rmrmsghandlers.NewRanLostConnectionHandler(ranReconnectionManager)},
                {rmrCgo.RIC_ENB_LOAD_INFORMATION, rmrmsghandlers.NewEnbLoadInformationNotificationHandler(rnibWriterProvider)},
                {rmrCgo.RIC_ENB_CONF_UPDATE, rmrmsghandlers.X2EnbConfigurationUpdateHandler{}},
@@ -132,7 +131,7 @@ func getRmrService(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger)
        rmrMessenger := rmrCgo.RmrMessenger(rmrMessengerMock)
        messageChannel := make(chan *models.NotificationResponse)
        rmrMessengerMock.On("Init", tests.GetPort(), tests.MaxMsgSize, tests.Flags, log).Return(&rmrMessenger)
-       return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, make(sessions.E2Sessions), messageChannel)
+       return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, messageChannel)
 }
 
 // TODO: extract to test_utils

diff --git a/E2Manager/services/receivers/rmr_service_receiver.go b/E2Manager/services/receivers/rmr_service_receiver.go
index 6dcc01e..7ffceb4 100644 (file)
--- a/E2Manager/services/receivers/rmr_service_receiver.go
+++ b/E2Manager/services/receivers/rmr_service_receiver.go
@@ -49,6 +49,6 @@ func (r *RmrServiceReceiver) ListenAndHandle() {
                        continue //TODO log error
                }
 
-               r.nManager.HandleMessage(r.Config.Logger, r.E2sessions, mbuf, r.RmrResponse)
+               r.nManager.HandleMessage(r.Config.Logger, mbuf, r.RmrResponse)
        }
 }

diff --git a/E2Manager/services/receivers/rmr_service_receiver_test.go b/E2Manager/services/receivers/rmr_service_receiver_test.go
index 715a337..15e9857 100644 (file)
--- a/E2Manager/services/receivers/rmr_service_receiver_test.go
+++ b/E2Manager/services/receivers/rmr_service_receiver_test.go
@@ -27,7 +27,6 @@ import (
        "e2mgr/rNibWriter"
        "e2mgr/rmrCgo"
        "e2mgr/services"
-       "e2mgr/sessions"
        "e2mgr/tests"
        "fmt"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
@@ -55,7 +54,7 @@ func getRmrService(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger)
        rmrMessenger := rmrCgo.RmrMessenger(rmrMessengerMock)
        messageChannel := make(chan *models.NotificationResponse)
        rmrMessengerMock.On("Init", tests.GetPort(), tests.MaxMsgSize, tests.Flags, log).Return(&rmrMessenger)
-       return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, make(sessions.E2Sessions), messageChannel)
+       return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, messageChannel)
 }
 
 func getRmrServiceReceiver(rmrMessengerMock *mocks.RmrMessengerMock, logger *logger.Logger) *RmrServiceReceiver {

diff --git a/E2Manager/services/rmr_service.go b/E2Manager/services/rmr_service.go
index dc35dfb..860f5da 100644 (file)
--- a/E2Manager/services/rmr_service.go
+++ b/E2Manager/services/rmr_service.go
@@ -21,7 +21,6 @@ import (
        "e2mgr/logger"
        "e2mgr/models"
        "e2mgr/rmrCgo"
-       "e2mgr/sessions"
        "strconv"
        "sync"
 )
@@ -41,17 +40,15 @@ func NewRmrConfig(port int, maxMsgSize int, flags int, logger *logger.Logger) *R
 type RmrService struct {
        Config      *RmrConfig
        Messenger   *rmrCgo.RmrMessenger
-       E2sessions  sessions.E2Sessions
        RmrResponse chan *models.NotificationResponse
 }
 
 // NewRmrService instantiates a new Rmr service instance
-func NewRmrService(rmrConfig *RmrConfig, msrImpl rmrCgo.RmrMessenger, e2sessions sessions.E2Sessions, rmrResponse chan *models.NotificationResponse) *RmrService {
+func NewRmrService(rmrConfig *RmrConfig, msrImpl rmrCgo.RmrMessenger, rmrResponse chan *models.NotificationResponse) *RmrService {
 
        return &RmrService{
                Config:      rmrConfig,
                Messenger:   msrImpl.Init("tcp:"+strconv.Itoa(rmrConfig.Port), rmrConfig.MaxMsgSize, rmrConfig.Flags, rmrConfig.Logger),
-               E2sessions:  e2sessions,
                RmrResponse: rmrResponse,
        }
 }

diff --git a/E2Manager/services/rmr_service_test.go b/E2Manager/services/rmr_service_test.go
index 3e0a5be..b4165db 100644 (file)
--- a/E2Manager/services/rmr_service_test.go
+++ b/E2Manager/services/rmr_service_test.go
@@ -22,7 +22,6 @@ import (
        "e2mgr/mocks"
        "e2mgr/models"
        "e2mgr/rmrCgo"
-       "e2mgr/sessions"
        "e2mgr/tests"
        "fmt"
        "github.com/stretchr/testify/assert"
@@ -75,5 +74,5 @@ func getRmrService(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger)
        rmrMessenger := rmrCgo.RmrMessenger(rmrMessengerMock)
        messageChannel := make(chan *models.NotificationResponse)
        rmrMessengerMock.On("Init", tests.GetPort(), tests.MaxMsgSize, tests.Flags, log).Return(&rmrMessenger)
-       return NewRmrService(NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger,  make(sessions.E2Sessions), messageChannel)
+       return NewRmrService(NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger,  messageChannel)
 }

diff --git a/E2Manager/sessions/e2session.go b/E2Manager/sessions/e2session.go
deleted file mode 100644 (file)
index 48563c6..0000000
--- a/E2Manager/sessions/e2session.go
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// 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.
-//
-
-package sessions
-
-import "time"
-import "e2mgr/models"
-/*
- * Container for session data
- * Note:
- * - If this is the only item in the session data, we should eliminate this session manager
- *   and just send the start time as part of the xaction field in the RMR message.
- */
-type E2SessionDetails struct {
-       SessionStart time.Time
-       Request *models.SetupRequest
-}
-
-/*
- * Map of session id to session details.
- * Notes:
- * - Since the transaction id is the CellId, there is no
- *   need to delete the entry when a response is received nor
- *   provide a mechanism for removing stale entries (no response received).
- *   Having said that, deleting the entry on a successful flow may still be a good idea
- *   in order to avoid pinning large amount of memory (help the GC).
- *
- * TODO:
- *  - Synchronize access.
- */
-type E2Sessions map[string]E2SessionDetails