X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=E2Manager%2Fhandlers%2Fhttpmsghandlers%2Fx2_reset_request_handler_test.go;h=870385b1c93ce670306d45c2ecf0ad1bf05e1b23;hb=de19068aaa1f3d2b415cd960106121ceb167aaa9;hp=864e8243916e855d69e2aae877f9c10795cc72bb;hpb=33f84e1a0998af025880be3e8eb087fac34af731;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler_test.go b/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler_test.go
index 864e824..870385b 100644
--- a/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler_test.go
+++ b/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler_test.go
@@ -1,25 +1,24 @@
 package httpmsghandlers
 
 import (
+	"e2mgr/configuration"
 	"e2mgr/e2managererrors"
 	"e2mgr/mocks"
 	"e2mgr/models"
 	"e2mgr/rNibWriter"
 	"e2mgr/rmrCgo"
+	"e2mgr/services"
 	"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"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
 	"testing"
 )
 
-func TestHandleSuccessfulDefaultCause(t *testing.T) {
+func setupX2ResetRequestHandlerTest(t *testing.T) (*X2ResetRequestHandler, *mocks.RmrMessengerMock, *mocks.RnibReaderMock) {
 	log := initLog(t)
-
-	ranName := "test1"
-
+	config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3}
 	readerMock := &mocks.RnibReaderMock{}
 	readerProvider := func() reader.RNibReader {
 		return readerMock
@@ -28,189 +27,112 @@ func TestHandleSuccessfulDefaultCause(t *testing.T) {
 	writerProvider := func() rNibWriter.RNibWriter {
 		return writerMock
 	}
+	rnibDataService := services.NewRnibDataService(log, config, readerProvider, writerProvider)
+	rmrMessengerMock := &mocks.RmrMessengerMock{}
+	rmrSender := getRmrSender(rmrMessengerMock, log)
+	handler := NewX2ResetRequestHandler(log, rmrSender, rnibDataService)
+
+	return handler, rmrMessengerMock, readerMock
+}
+func TestHandleSuccessfulDefaultCause(t *testing.T) {
+	handler, rmrMessengerMock, readerMock := setupX2ResetRequestHandlerTest(t)
+
+	ranName := "test1"
 	// o&m intervention
 	payload := []byte{0x00, 0x07, 0x00, 0x08, 0x00, 0x00, 0x01, 0x00, 0x05, 0x40, 0x01, 0x64}
 	xaction := []byte(ranName)
 	msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xaction)
-	rmrMessengerMock := &mocks.RmrMessengerMock{}
-	rmrMessengerMock.On("SendMsg", msg, mock.Anything).Return(msg, nil)
 
-	rmrService := getRmrService(rmrMessengerMock, log)
-	handler := NewX2ResetRequestHandler(log, rmrService, writerProvider, readerProvider)
+	rmrMessengerMock.On("SendMsg", msg).Return(msg, nil)
 
 	var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED}
 	readerMock.On("GetNodeb", ranName).Return(nodeb, nil)
 
-	actual := handler.Handle(models.ResetRequest{RanName: ranName})
+	_, actual := handler.Handle(models.ResetRequest{RanName: ranName})
 
 	assert.Nil(t, actual)
 }
 
 func TestHandleSuccessfulRequestedCause(t *testing.T) {
-	log := initLog(t)
+	handler, rmrMessengerMock, readerMock := setupX2ResetRequestHandlerTest(t)
 
 	ranName := "test1"
-
-	readerMock := &mocks.RnibReaderMock{}
-	readerProvider := func() reader.RNibReader {
-		return readerMock
-	}
-	writerMock := &mocks.RnibWriterMock{}
-	writerProvider := func() rNibWriter.RNibWriter {
-		return writerMock
-	}
-
 	payload := []byte{0x00, 0x07, 0x00, 0x08, 0x00, 0x00, 0x01, 0x00, 0x05, 0x40, 0x01, 0x40}
 	xaction := []byte(ranName)
 	msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xaction)
-	rmrMessengerMock := &mocks.RmrMessengerMock{}
-	rmrMessengerMock.On("SendMsg", msg, mock.Anything).Return(msg, nil)
-
-	rmrService := getRmrService(rmrMessengerMock, log)
-	handler := NewX2ResetRequestHandler(log, rmrService, writerProvider, readerProvider)
+	rmrMessengerMock.On("SendMsg", msg).Return(msg, nil)
 
 	var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED}
 	readerMock.On("GetNodeb", ranName).Return(nodeb, nil)
 
-	actual := handler.Handle(models.ResetRequest{RanName: ranName, Cause: "protocol:transfer-syntax-error"})
+	_, actual := handler.Handle(models.ResetRequest{RanName: ranName, Cause: "protocol:transfer-syntax-error"})
 
 	assert.Nil(t, actual)
 }
 
 func TestHandleFailureUnknownCause(t *testing.T) {
-	log := initLog(t)
+	handler, _, readerMock := setupX2ResetRequestHandlerTest(t)
 
 	ranName := "test1"
-
-	readerMock := &mocks.RnibReaderMock{}
-	readerProvider := func() reader.RNibReader {
-		return readerMock
-	}
-	writerMock := &mocks.RnibWriterMock{}
-	writerProvider := func() rNibWriter.RNibWriter {
-		return writerMock
-	}
-
-	rmrMessengerMock := &mocks.RmrMessengerMock{}
-
-	rmrService := getRmrService(rmrMessengerMock, log)
-	handler := NewX2ResetRequestHandler(log, rmrService, writerProvider, readerProvider)
-	
 	var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED}
 	readerMock.On("GetNodeb", ranName).Return(nodeb, nil)
 
-	actual := handler.Handle(models.ResetRequest{RanName: ranName, Cause: "XXX"})
+	_, actual := handler.Handle(models.ResetRequest{RanName: ranName, Cause: "XXX"})
 
 	assert.IsType(t, e2managererrors.NewRequestValidationError(), actual)
 
 }
 
 func TestHandleFailureWrongState(t *testing.T) {
-	log := initLog(t)
+	handler, _, readerMock := setupX2ResetRequestHandlerTest(t)
 
 	ranName := "test1"
-
-	readerMock := &mocks.RnibReaderMock{}
-	readerProvider := func() reader.RNibReader {
-		return readerMock
-	}
-	writerMock := &mocks.RnibWriterMock{}
-	writerProvider := func() rNibWriter.RNibWriter {
-		return writerMock
-	}
-
-	rmrMessengerMock := &mocks.RmrMessengerMock{}
-
-	rmrService := getRmrService(rmrMessengerMock, log)
-	handler := NewX2ResetRequestHandler(log, rmrService, writerProvider, readerProvider)
-
 	var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED}
 	readerMock.On("GetNodeb", ranName).Return(nodeb, nil)
 
-	actual := handler.Handle(models.ResetRequest{RanName: ranName})
+	_, actual := handler.Handle(models.ResetRequest{RanName: ranName})
 
 	assert.IsType(t, e2managererrors.NewWrongStateError(X2_RESET_ACTIVITY_NAME, entities.ConnectionStatus_name[int32(nodeb.ConnectionStatus)]), actual)
 }
 
 func TestHandleFailureRanNotFound(t *testing.T) {
-	log := initLog(t)
+	handler, _, readerMock := setupX2ResetRequestHandlerTest(t)
 
 	ranName := "test1"
 
-	readerMock := &mocks.RnibReaderMock{}
-	readerProvider := func() reader.RNibReader {
-		return readerMock
-	}
-	writerMock := &mocks.RnibWriterMock{}
-	writerProvider := func() rNibWriter.RNibWriter {
-		return writerMock
-	}
-
-	rmrMessengerMock := &mocks.RmrMessengerMock{}
-
-	rmrService := getRmrService(rmrMessengerMock, log)
-	handler := NewX2ResetRequestHandler(log, rmrService, writerProvider, readerProvider)
-
 	readerMock.On("GetNodeb", ranName).Return(&entities.NodebInfo{}, common.NewResourceNotFoundError("nodeb not found"))
 
-	actual := handler.Handle(models.ResetRequest{RanName: ranName})
+	_, actual := handler.Handle(models.ResetRequest{RanName: ranName})
 
 	assert.IsType(t, e2managererrors.NewResourceNotFoundError(), actual)
 }
 
 func TestHandleFailureRnibError(t *testing.T) {
-	log := initLog(t)
+	handler, _, readerMock := setupX2ResetRequestHandlerTest(t)
 
 	ranName := "test1"
 
-	readerMock := &mocks.RnibReaderMock{}
-	readerProvider := func() reader.RNibReader {
-		return readerMock
-	}
-	writerMock := &mocks.RnibWriterMock{}
-	writerProvider := func() rNibWriter.RNibWriter {
-		return writerMock
-	}
-
-	rmrMessengerMock := &mocks.RmrMessengerMock{}
-
-	rmrService := getRmrService(rmrMessengerMock, log)
-	handler := NewX2ResetRequestHandler(log, rmrService, writerProvider, readerProvider)
-
 	readerMock.On("GetNodeb", ranName).Return(&entities.NodebInfo{}, common.NewInternalError(fmt.Errorf("internal error")))
 
-	actual := handler.Handle(models.ResetRequest{RanName: ranName})
+	_, actual := handler.Handle(models.ResetRequest{RanName: ranName})
 
 	assert.IsType(t, e2managererrors.NewRnibDbError(), actual)
 }
 
 func TestHandleFailureRmrError(t *testing.T) {
-	log := initLog(t)
+	handler, rmrMessengerMock, readerMock := setupX2ResetRequestHandlerTest(t)
 
 	ranName := "test1"
-
-	readerMock := &mocks.RnibReaderMock{}
-	readerProvider := func() reader.RNibReader {
-		return readerMock
-	}
-	writerMock := &mocks.RnibWriterMock{}
-	writerProvider := func() rNibWriter.RNibWriter {
-		return writerMock
-	}
 	// o&m intervention
 	payload := []byte{0x00, 0x07, 0x00, 0x08, 0x00, 0x00, 0x01, 0x00, 0x05, 0x40, 0x01, 0x64}
 	xaction := []byte(ranName)
 	msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xaction)
-	rmrMessengerMock := &mocks.RmrMessengerMock{}
-	rmrMessengerMock.On("SendMsg", msg, mock.Anything).Return(&rmrCgo.MBuf{}, fmt.Errorf("rmr error"))
-
-	rmrService := getRmrService(rmrMessengerMock, log)
-	handler := NewX2ResetRequestHandler(log, rmrService, writerProvider, readerProvider)
+	rmrMessengerMock.On("SendMsg", msg).Return(&rmrCgo.MBuf{}, fmt.Errorf("rmr error"))
 
 	var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED}
 	readerMock.On("GetNodeb", ranName).Return(nodeb, nil)
 
-	actual := handler.Handle(models.ResetRequest{RanName: ranName})
+	_, actual := handler.Handle(models.ResetRequest{RanName: ranName})
 
 	assert.IsType(t, e2managererrors.NewRmrError(), actual)
 }