[RICPLT-2165] Add rnibDataService to support retries

[ric-plt/e2mgr.git] / E2Manager / handlers / rmrmsghandlers / x2_reset_response_handler_test.go

diff --git a/E2Manager/handlers/rmrmsghandlers/x2_reset_response_handler_test.go b/E2Manager/handlers/rmrmsghandlers/x2_reset_response_handler_test.go
index 513596f..26f0ade 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/x2_reset_response_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/x2_reset_response_handler_test.go
@@ -18,11 +18,12 @@
 package rmrmsghandlers
 
 import (
+       "e2mgr/configuration"
        "e2mgr/logger"
        "e2mgr/mocks"
        "e2mgr/models"
        "e2mgr/rmrCgo"
-       "e2mgr/sessions"
+       "e2mgr/services"
        "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"
@@ -31,12 +32,9 @@ import (
        "time"
 )
 
-func TestX2ResetResponseSuccess(t *testing.T) {
-       payload, err := tests.BuildPackedX2ResetResponse()
-       if err != nil {
-               t.Errorf("#x2_reset_response_handler_test.TestX2resetResponse - failed to build and pack X2ResetResponse. Error %x", err)
-       }
+func initX2ResetResponseHandlerTest(t *testing.T) (*logger.Logger, X2ResetResponseHandler, *mocks.RnibReaderMock) {
        log, err := logger.InitLogger(logger.DebugLevel)
+       config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3}
        if err!=nil{
                t.Errorf("#sctp_errors_notification_handler_test.TestHandleInSession - failed to initialize logger, error: %s", err)
        }
@@ -44,12 +42,21 @@ func TestX2ResetResponseSuccess(t *testing.T) {
        rnibReaderProvider := func() reader.RNibReader {
                return readerMock
        }
+       rnibDataService := services.NewRnibDataService(log, config, rnibReaderProvider, nil)
+
+       h := NewX2ResetResponseHandler(rnibDataService)
+       return log, h, readerMock
+}
+
+func TestX2ResetResponseSuccess(t *testing.T) {
+       log, h, readerMock := initX2ResetResponseHandlerTest(t)
+
+       payload, err := tests.BuildPackedX2ResetResponse()
+       if err != nil {
+               t.Errorf("#x2_reset_response_handler_test.TestX2resetResponse - failed to build and pack X2ResetResponse. Error %x", err)
+       }
 
-       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,27 +66,16 @@ 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
 }
 
 func TestX2ResetResponseReaderFailure(t *testing.T) {
-       var payload []byte
-       log, err := logger.InitLogger(logger.DebugLevel)
-       if err!=nil{
-               t.Errorf("#sctp_errors_notification_handler_test.TestX2ResetResponseReaderFailure - failed to initialize logger, error: %s", err)
-       }
-       readerMock :=&mocks.RnibReaderMock{}
-       rnibReaderProvider := func() reader.RNibReader {
-               return readerMock
-       }
+       log, h, readerMock := initX2ResetResponseHandlerTest(t)
 
-       h := NewX2ResetResponseHandler(rnibReaderProvider)
-       e2Sessions := make(sessions.E2Sessions)
-       //xaction = []byte(fmt.Sprintf("%32s", "1234"))
+       var payload []byte
        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,27 +85,16 @@ 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
 }
 
 func TestX2ResetResponseUnpackFailure(t *testing.T) {
-       payload := []byte("not valid payload")
-       log, err := logger.InitLogger(logger.DebugLevel)
-       if err!=nil{
-               t.Errorf("#sctp_errors_notification_handler_test.TestX2ResetResponseUnpackFailure - failed to initialize logger, error: %s", err)
-       }
-       readerMock :=&mocks.RnibReaderMock{}
-       rnibReaderProvider := func() reader.RNibReader {
-               return readerMock
-       }
+       log, h, readerMock := initX2ResetResponseHandlerTest(t)
 
-       h := NewX2ResetResponseHandler(rnibReaderProvider)
-       e2Sessions := make(sessions.E2Sessions)
-       //xaction := []byte(fmt.Sprintf("%32s", "1234"))
+       payload := []byte("not valid payload")
        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 +104,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
 }