X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Frmrmsghandlers%2Fe2_term_init_notification_handler_test.go;h=f649da28d92e42c159f354155583b21004772e77;hb=78f7c411678d2756ad076a71e6c093cd38cfca99;hp=d476b1fd3fe5a4450c858af897e0f670b03cfa07;hpb=78d25790b63bd8de394108e6d0211a671ea960c8;p=ric-plt%2Fe2mgr.git

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 d476b1f..f649da2 100644
--- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go
@@ -58,6 +58,22 @@ func initRanLostConnectionTest(t *testing.T) (*logger.Logger, E2TermInitNotifica
 	return logger, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock
 }
 
+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
@@ -87,7 +103,7 @@ func TestE2TermInitExistingE2TInstanceNoAssociatedRans(t *testing.T) {
 	e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceAddress)
 }
 
-func TestE2TerminInitHandlerSuccessOneRan(t *testing.T) {
+func TestE2TermInitHandlerSuccessOneRan(t *testing.T) {
 	_, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock := initRanLostConnectionTest(t)
 	var rnibErr error
 
@@ -101,7 +117,7 @@ func TestE2TerminInitHandlerSuccessOneRan(t *testing.T) {
 	xaction := []byte(RanName)
 	msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), RanName, &payload, &xaction)
 
-	rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg, nil)
+	rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg, nil)
 
 	e2tInstance := entities.NewE2TInstance(e2tInstanceAddress)
 	e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName)
@@ -114,11 +130,9 @@ func TestE2TerminInitHandlerSuccessOneRan(t *testing.T) {
 	rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 1)
 }
 
-func TestE2TerminInitHandlerSuccessTwoRans(t *testing.T) {
+func TestE2TermInitHandlerSuccessTwoRans(t *testing.T) {
 	_, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock := initRanLostConnectionTest(t)
 	var rnibErr error
-
-
 	var initialNodeb0 = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
 	var initialNodeb1 = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
 	readerMock.On("GetNodeb", RanName).Return(initialNodeb0, rnibErr)
@@ -131,7 +145,7 @@ func TestE2TerminInitHandlerSuccessTwoRans(t *testing.T) {
 	xaction := []byte(RanName)
 	msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), RanName, &payload, &xaction)
 
-	rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg, nil)
+	rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg, nil)
 
 	e2tInstance := entities.NewE2TInstance(e2tInstanceAddress)
 	e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName, "test2")
@@ -144,7 +158,7 @@ func TestE2TerminInitHandlerSuccessTwoRans(t *testing.T) {
 	rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 2)
 }
 
-func TestE2TerminInitHandlerSuccessThreeRansFirstRmrFailure(t *testing.T) {
+func TestE2TermInitHandlerSuccessThreeRansFirstRmrFailure(t *testing.T) {
 	log, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock := initRanLostConnectionTest(t)
 	var rnibErr error
 
@@ -171,7 +185,7 @@ func TestE2TerminInitHandlerSuccessThreeRansFirstRmrFailure(t *testing.T) {
 	//xaction = []byte(ids[1].InventoryName)
 	//msg1 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ids[1].InventoryName, &payload, &xaction)
 
-	rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg0, fmt.Errorf("RMR Error"))
+	rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg0, fmt.Errorf("RMR Error"))
 
 	e2tInstance := entities.NewE2TInstance(e2tInstanceAddress)
 	e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, "test1", "test2", "test3")
@@ -186,7 +200,7 @@ func TestE2TerminInitHandlerSuccessThreeRansFirstRmrFailure(t *testing.T) {
 	rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 1)
 }
 
-func TestE2TerminInitHandlerSuccessThreeRansSecondNotFoundFailure(t *testing.T) {
+func TestE2TermInitHandlerSuccessThreeRansSecondNotFoundFailure(t *testing.T) {
 	log, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock := initRanLostConnectionTest(t)
 	var rnibErr error
 
@@ -218,7 +232,7 @@ func TestE2TerminInitHandlerSuccessThreeRansSecondNotFoundFailure(t *testing.T)
 	//xaction = []byte(ids[1].InventoryName)
 	//msg1 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ids[1].InventoryName, &payload, &xaction)
 
-	rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg0, nil)
+	rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg0, nil)
 
 	e2tInstance := entities.NewE2TInstance(e2tInstanceAddress)
 	e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, "test1", "test2", "test3")
@@ -234,7 +248,7 @@ func TestE2TerminInitHandlerSuccessThreeRansSecondNotFoundFailure(t *testing.T)
 	rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 2)
 }
 
-func TestE2TerminInitHandlerSuccessThreeRansSecondRnibInternalErrorFailure(t *testing.T) {
+func TestE2TermInitHandlerSuccessThreeRansSecondRnibInternalErrorFailure(t *testing.T) {
 	log, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock := initRanLostConnectionTest(t)
 	var rnibErr error
 
@@ -266,7 +280,7 @@ func TestE2TerminInitHandlerSuccessThreeRansSecondRnibInternalErrorFailure(t *te
 	//xaction = []byte(ids[1].InventoryName)
 	//msg1 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ids[1].InventoryName, &payload, &xaction)
 
-	rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg0, nil)
+	rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg0, nil)
 
 	e2tInstance := entities.NewE2TInstance(e2tInstanceAddress)
 	e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, "test1", "test2", "test3")
@@ -282,7 +296,7 @@ func TestE2TerminInitHandlerSuccessThreeRansSecondRnibInternalErrorFailure(t *te
 	rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 1)
 }
 
-func TestE2TerminInitHandlerSuccessZeroRans(t *testing.T) {
+func TestE2TermInitHandlerSuccessZeroRans(t *testing.T) {
 	_, handler, _, writerMock, rmrMessengerMock, e2tInstancesManagerMock := initRanLostConnectionTest(t)
 
 	e2tInstance := entities.NewE2TInstance(e2tInstanceAddress)
@@ -295,7 +309,7 @@ func TestE2TerminInitHandlerSuccessZeroRans(t *testing.T) {
 	rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 0)
 }
 
-func TestE2TerminInitHandlerFailureGetListNodebIds(t *testing.T) {
+func TestE2TermInitHandlerFailureGetListNodebIds(t *testing.T) {
 	_, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock := initRanLostConnectionTest(t)
 
 	var nodebInfo *entities.NodebInfo