X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Frmrmsghandlers%2Fe2_setup_request_notification_handler_test.go;h=77ffe7a8c9159d8def5002ec62f0aec8a080c6c2;hb=69f1211bf4b73c8b61ccaf10b75de53a2a6dbc65;hp=c689025013ee4ad43b6611f2a4bdf78f16775283;hpb=25ffe73b7261ce3f87c653062df79ed7d8aa2278;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler_test.go b/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler_test.go index c689025..77ffe7a 100644 --- a/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler_test.go +++ b/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler_test.go @@ -20,6 +20,7 @@ package rmrmsghandlers import ( + "bytes" "e2mgr/configuration" "e2mgr/managers" "e2mgr/mocks" @@ -27,6 +28,7 @@ import ( "e2mgr/rmrCgo" "e2mgr/services" "e2mgr/tests" + "encoding/xml" "errors" "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common" "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities" @@ -38,36 +40,76 @@ import ( ) const ( - prefix = "10.0.2.15:9999|" - e2tInstanceFullAddress = "10.0.2.15:9999" - nodebRanName = "gnb:310-410-b5c67788" + e2tInstanceFullAddress = "10.0.2.15:9999" + e2SetupMsgPrefix = e2tInstanceFullAddress + "|" + gnbNodebRanName = "gnb:310-410-b5c67788" + enbNodebRanName = "enB_macro:P310-410-b5c67788" + GnbSetupRequestXmlPath = "../../tests/resources/setupRequest_gnb.xml" + EnGnbSetupRequestXmlPath = "../../tests/resources/setupRequest_en-gNB.xml" + NgEnbSetupRequestXmlPath = "../../tests/resources/setupRequest_ng-eNB.xml" + EnbSetupRequestXmlPath = "../../tests/resources/setupRequest_enb.xml" + GnbWithoutFunctionsSetupRequestXmlPath = "../../tests/resources/setupRequest_gnb_without_functions.xml" + E2SetupFailureResponseWithMiscCause = "1131" + E2SetupFailureResponseWithTransportCause = "1131" + E2SetupFailureResponseWithRicCause = "1131" + StateChangeMessageChannel = "RAN_CONNECTION_STATUS_CHANGE" ) -func TestParseSetupRequest_Success(t *testing.T){ - path, err :=filepath.Abs("../../tests/resources/setupRequest_gnb.xml") +func readXmlFile(t *testing.T, xmlPath string) []byte { + path, err := filepath.Abs(xmlPath) if err != nil { t.Fatal(err) } - xmlGnb, err := ioutil.ReadFile(path) + xmlAsBytes, err := ioutil.ReadFile(path) if err != nil { t.Fatal(err) } + + return xmlAsBytes +} + +func TestParseGnbSetupRequest_Success(t *testing.T) { + xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath) handler, _, _, _, _, _ := initMocks(t) - prefBytes := []byte(prefix) + prefBytes := []byte(e2SetupMsgPrefix) request, _, err := handler.parseSetupRequest(append(prefBytes, xmlGnb...)) - assert.Equal(t, request.GetPlmnId(), "131014") - assert.Equal(t, request.GetNbId(), "10011001101010101011") + assert.Equal(t, "02F829", request.GetPlmnId()) + assert.Equal(t, "001100000011000000110000", request.GetNbId()) + assert.Nil(t, err) } -func TestParseSetupRequest_PipFailure(t *testing.T){ - path, err :=filepath.Abs("../../tests/resources/setupRequest_gnb.xml") - if err != nil { - t.Fatal(err) - } - xmlGnb, err := ioutil.ReadFile(path) - if err != nil { - t.Fatal(err) - } +func TestParseEnGnbSetupRequest_Success(t *testing.T) { + enGnbXml := readXmlFile(t, EnGnbSetupRequestXmlPath) + handler, _, _, _, _, _ := initMocks(t) + prefBytes := []byte(e2SetupMsgPrefix) + request, _, err := handler.parseSetupRequest(append(prefBytes, enGnbXml...)) + assert.Equal(t, "131014", request.GetPlmnId()) + assert.Equal(t, "11000101110001101100011111111000", request.GetNbId()) + assert.Nil(t, err) +} + +func TestParseNgEnbSetupRequest_Success(t *testing.T) { + ngEnbXml := readXmlFile(t, NgEnbSetupRequestXmlPath) + handler, _, _, _, _, _ := initMocks(t) + prefBytes := []byte(e2SetupMsgPrefix) + request, _, err := handler.parseSetupRequest(append(prefBytes, ngEnbXml...)) + assert.Equal(t, "131014", request.GetPlmnId()) + assert.Equal(t, "101010101010101010", request.GetNbId()) + assert.Nil(t, err) +} + +func TestParseEnbSetupRequest_Success(t *testing.T) { + enbXml := readXmlFile(t, EnbSetupRequestXmlPath) + handler, _, _, _, _, _ := initMocks(t) + prefBytes := []byte(e2SetupMsgPrefix) + request, _, err := handler.parseSetupRequest(append(prefBytes, enbXml...)) + assert.Equal(t, "6359AB", request.GetPlmnId()) + assert.Equal(t, "101010101010101010", request.GetNbId()) + assert.Nil(t, err) +} + +func TestParseSetupRequest_PipFailure(t *testing.T) { + xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath) handler, _, _, _, _, _ := initMocks(t) prefBytes := []byte("10.0.2.15:9999") request, _, err := handler.parseSetupRequest(append(prefBytes, xmlGnb...)) @@ -76,145 +118,327 @@ func TestParseSetupRequest_PipFailure(t *testing.T){ assert.EqualError(t, err, "#E2SetupRequestNotificationHandler.parseSetupRequest - Error parsing E2 Setup Request failed extract Payload: no | separator found") } -func TestParseSetupRequest_UnmarshalFailure(t *testing.T){ +func TestParseSetupRequest_UnmarshalFailure(t *testing.T) { handler, _, _, _, _, _ := initMocks(t) - prefBytes := []byte(prefix) - request, _, err := handler.parseSetupRequest(append(prefBytes, 1,2,3)) + prefBytes := []byte(e2SetupMsgPrefix) + request, _, err := handler.parseSetupRequest(append(prefBytes, 1, 2, 3)) assert.Nil(t, request) assert.NotNil(t, err) assert.EqualError(t, err, "#E2SetupRequestNotificationHandler.parseSetupRequest - Error unmarshalling E2 Setup Request payload: 31302e302e322e31353a393939397c010203") } -func TestE2SetupRequestNotificationHandler_HandleNewGnbSuccess(t *testing.T) { - path, err :=filepath.Abs("../../tests/resources/setupRequest_gnb.xml") - if err != nil { - t.Fatal(err) - } - xmlGnb, err := ioutil.ReadFile(path) - if err != nil { - t.Fatal(err) - } +func TestE2SetupRequestNotificationHandler_GetGeneralConfigurationFailure(t *testing.T) { + xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath) + handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t) + readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{}, common.NewInternalError(errors.New("some error"))) + notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)} + handler.Handle(notificationRequest) + rmrMessengerMock.AssertNotCalled(t, "SendMsg") + e2tInstancesManagerMock.AssertNotCalled(t, "GetE2TInstance") + routingManagerClientMock.AssertNotCalled(t, "AssociateRanToE2TInstance") + readerMock.AssertNotCalled(t, "GetNodeb") + writerMock.AssertNotCalled(t, "SaveNodeb") +} + +func getMbuf(ranName string, msgType int, payloadStr string, request *models.NotificationRequest) *rmrCgo.MBuf { + payload := []byte(payloadStr) + mbuf := rmrCgo.NewMBuf(msgType, len(payload), ranName, &payload, &request.TransactionId, request.GetMsgSrc()) + return mbuf +} +func TestE2SetupRequestNotificationHandler_EnableRicFalse(t *testing.T) { + xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath) handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t) - var e2tInstance = &entities.E2TInstance{} - e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(e2tInstance, nil) + readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: false}, nil) + notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)} + mbuf := getMbuf(gnbNodebRanName, rmrCgo.RIC_E2_SETUP_FAILURE, E2SetupFailureResponseWithMiscCause, notificationRequest) + rmrMessengerMock.On("WhSendMsg", mbuf, true).Return(&rmrCgo.MBuf{}, nil) + handler.Handle(notificationRequest) + rmrMessengerMock.AssertCalled(t, "WhSendMsg", mbuf, true) + e2tInstancesManagerMock.AssertNotCalled(t, "GetE2TInstance") + routingManagerClientMock.AssertNotCalled(t, "AssociateRanToE2TInstance") + readerMock.AssertNotCalled(t, "GetNodeb") + writerMock.AssertNotCalled(t, "SaveNodeb") +} + +func TestE2SetupRequestNotificationHandler_HandleNewRanSaveNodebFailure(t *testing.T) { + xml := readXmlFile(t, GnbSetupRequestXmlPath) + handler, readerMock, writerMock, _, e2tInstancesManagerMock, _ := initMocks(t) + readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil) + e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil) var gnb *entities.NodebInfo - readerMock.On("GetNodeb", mock.Anything).Return(gnb, common.NewResourceNotFoundError("Not found")) - writerMock.On("SaveNodeb", mock.Anything, mock.Anything).Return(nil) - routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil) - writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) - e2tInstancesManagerMock.On("AddRansToInstance", mock.Anything, mock.Anything).Return(nil) - var errEmpty error - rmrMessage := &rmrCgo.MBuf{} - rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(rmrMessage, errEmpty) - prefBytes := []byte(prefix) - notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlGnb...)} + readerMock.On("GetNodeb", gnbNodebRanName).Return(gnb, common.NewResourceNotFoundError("Not found")) + notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xml...)} + nodebInfo := getExpectedGnbNodebForNewRan(notificationRequest.Payload) + writerMock.On("SaveNodeb", nodebInfo).Return(common.NewInternalError(errors.New("error"))) handler.Handle(notificationRequest) - assertNewNodebSuccessCalls(readerMock, t, e2tInstancesManagerMock, writerMock, routingManagerClientMock, rmrMessengerMock) + + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) + e2tInstancesManagerMock.AssertExpectations(t) } -func TestE2SetupRequestNotificationHandler_HandleNewEnGnbSuccess(t *testing.T) { - path, err :=filepath.Abs("../../tests/resources/setupRequest_en-gNB.xml") - if err != nil { - t.Fatal(err) - } - xmlEnGnb, err := ioutil.ReadFile(path) - if err != nil { - t.Fatal(err) - } +func TestE2SetupRequestNotificationHandler_HandleNewRan_invalidRanName(t *testing.T) { + xml := readXmlFile(t, EnbSetupRequestXmlPath) + handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, _ := initMocks(t) + readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil) + e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil) + var enb *entities.NodebInfo + invalidEnbRanName := "enB-macro:P310-410-b5c67788" + readerMock.On("GetNodeb", invalidEnbRanName).Return(enb, common.NewResourceNotFoundError("Not found")) + notificationRequest := &models.NotificationRequest{RanName: invalidEnbRanName, Payload: append([]byte(e2SetupMsgPrefix), xml...)} + mbuf := getMbuf(invalidEnbRanName, rmrCgo.RIC_E2_SETUP_FAILURE, E2SetupFailureResponseWithRicCause, notificationRequest) + rmrMessengerMock.On("WhSendMsg", mbuf, true).Return(&rmrCgo.MBuf{}, nil) + handler.Handle(notificationRequest) + + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) + rmrMessengerMock.AssertCalled(t, "WhSendMsg", mbuf, true) + e2tInstancesManagerMock.AssertExpectations(t) +} + +func TestE2SetupRequestNotificationHandler_HandleNewRanAddNbIdentityFailure(t *testing.T) { + xml := readXmlFile(t, GnbSetupRequestXmlPath) + handler, readerMock, writerMock, _, e2tInstancesManagerMock, _ := initMocks(t) + readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil) + e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil) + var gnb *entities.NodebInfo + readerMock.On("GetNodeb", gnbNodebRanName).Return(gnb, common.NewResourceNotFoundError("Not found")) + notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xml...)} + nodebInfo := getExpectedGnbNodebForNewRan(notificationRequest.Payload) + writerMock.On("SaveNodeb", nodebInfo).Return(nil) + nbIdentity := &entities.NbIdentity{InventoryName: gnbNodebRanName, GlobalNbId: nodebInfo.GlobalNbId} + writerMock.On("AddNbIdentity", entities.Node_GNB, nbIdentity).Return(common.NewInternalError(errors.New("error"))) + handler.Handle(notificationRequest) + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) + e2tInstancesManagerMock.AssertExpectations(t) +} +func testE2SetupRequestNotificationHandler_HandleNewRanSuccess(t *testing.T, xmlPath string, nodeType entities.Node_Type) { + xml := readXmlFile(t, xmlPath) + var ranName string + if nodeType == entities.Node_GNB { + ranName = gnbNodebRanName + } else { + ranName = enbNodebRanName + } handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t) - var e2tInstance = &entities.E2TInstance{} - e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(e2tInstance, nil) + readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil) + e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil) var gnb *entities.NodebInfo - readerMock.On("GetNodeb", mock.Anything).Return(gnb, common.NewResourceNotFoundError("Not found")) - writerMock.On("SaveNodeb", mock.Anything, mock.Anything).Return(nil) + readerMock.On("GetNodeb", ranName).Return(gnb, common.NewResourceNotFoundError("Not found")) + notificationRequest := &models.NotificationRequest{RanName: ranName, Payload: append([]byte(e2SetupMsgPrefix), xml...)} + var expectedNodebInfo *entities.NodebInfo + if nodeType == entities.Node_GNB { + expectedNodebInfo = getExpectedGnbNodebForNewRan(notificationRequest.Payload) + } else { + expectedNodebInfo = getExpectedEnbNodebForNewRan(notificationRequest.Payload) + } + writerMock.On("SaveNodeb", expectedNodebInfo).Return(nil) + nbIdentity := &entities.NbIdentity{InventoryName: ranName, GlobalNbId: expectedNodebInfo.GlobalNbId} + writerMock.On("AddNbIdentity", nodeType, nbIdentity).Return(nil) + updatedNodebInfo := *expectedNodebInfo + updatedNodebInfo.ConnectionStatus = entities.ConnectionStatus_CONNECTED + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNodebInfo, ranName+"_CONNECTED").Return(nil) routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil) - writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) - e2tInstancesManagerMock.On("AddRansToInstance", mock.Anything, mock.Anything).Return(nil) - var errEmpty error - rmrMessage := &rmrCgo.MBuf{} - rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(rmrMessage, errEmpty) - prefBytes := []byte(prefix) - notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlEnGnb...)} + updatedNodebInfo2 := *expectedNodebInfo + updatedNodebInfo2.ConnectionStatus = entities.ConnectionStatus_CONNECTED + updatedNodebInfo2.AssociatedE2TInstanceAddress = e2tInstanceFullAddress + writerMock.On("UpdateNodebInfo", &updatedNodebInfo2).Return(nil) + e2tInstancesManagerMock.On("AddRansToInstance", e2tInstanceFullAddress, []string{ranName}).Return(nil) + rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(&rmrCgo.MBuf{}, nil) + handler.Handle(notificationRequest) - assertNewNodebSuccessCalls(readerMock, t, e2tInstancesManagerMock, writerMock, routingManagerClientMock, rmrMessengerMock) + + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) + e2tInstancesManagerMock.AssertExpectations(t) +} + +func TestE2SetupRequestNotificationHandler_HandleNewGnbSuccess(t *testing.T) { + testE2SetupRequestNotificationHandler_HandleNewRanSuccess(t, GnbSetupRequestXmlPath, entities.Node_GNB) +} + +func TestE2SetupRequestNotificationHandler_HandleNewGnbWithoutFunctionsSuccess(t *testing.T) { + testE2SetupRequestNotificationHandler_HandleNewRanSuccess(t, GnbWithoutFunctionsSetupRequestXmlPath, entities.Node_GNB) +} + +func TestE2SetupRequestNotificationHandler_HandleNewEnGnbSuccess(t *testing.T) { + testE2SetupRequestNotificationHandler_HandleNewRanSuccess(t, EnGnbSetupRequestXmlPath, entities.Node_GNB) } func TestE2SetupRequestNotificationHandler_HandleNewNgEnbSuccess(t *testing.T) { - path, err :=filepath.Abs("../../tests/resources/setupRequest_ng-eNB.xml") - if err != nil { - t.Fatal(err) + testE2SetupRequestNotificationHandler_HandleNewRanSuccess(t, NgEnbSetupRequestXmlPath, entities.Node_ENB) +} + +func TestExtractionOfNodeTypeFromRanName(t *testing.T) { + handler, _, _, _, _, _ := initMocks(t) + validRanNames := []string{"gnb_P310_410_b5c67788", "en_gnb_P310_410_b5c67788", "ng_enB_macro_P310_410_b5c67788", "ng_enB_shortmacro_P310_410_b5c67788", "ng_enB_longmacro_P310_410_b5c67788", "enB_macro_P310_410_b5c67788", "enB_home_P310_410_b5c67788", "enB_shortmacro_P310_410_b5c67788", "enB_longmacro_P310_410_b5c67788"} + for _, v := range validRanNames { + nodeb := &entities.NodebInfo{RanName: v} + err := handler.setNodeTypeAndConfiguration(nodeb) + assert.Nil(t, err) } - xmlEnGnb, err := ioutil.ReadFile(path) - if err != nil { - t.Fatal(err) + inValidRanNames := []string{"P310_410_b5c67788", "blabla_P310_410_b5c67788", "ng_enB-macro_P310_410_b5c67788", "ng_enb_shortmacro_P310_410_b5c67788", "ng_enB-longmacro_P310_410_b5c67788", "enB_new_macro_P310_410_b5c67788"} + for _, v := range inValidRanNames { + nodeb := &entities.NodebInfo{RanName: v} + err := handler.setNodeTypeAndConfiguration(nodeb) + assert.NotNil(t, err, v) } +} + +func testE2SetupRequestNotificationHandler_HandleExistingConnectedGnbSuccess(t *testing.T, withFunctions bool) { + var xmlGnb []byte + if withFunctions { + xmlGnb = readXmlFile(t, GnbSetupRequestXmlPath) + + } else { + xmlGnb = readXmlFile(t, GnbWithoutFunctionsSetupRequestXmlPath) + } handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t) - var e2tInstance = &entities.E2TInstance{} - e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(e2tInstance, nil) - var gnb *entities.NodebInfo - readerMock.On("GetNodeb", mock.Anything).Return(gnb, common.NewResourceNotFoundError("Not found")) - writerMock.On("SaveNodeb", mock.Anything, mock.Anything).Return(nil) + readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil) + e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil) + var nodebInfo = &entities.NodebInfo{ + RanName: gnbNodebRanName, + AssociatedE2TInstanceAddress: e2tInstanceFullAddress, + ConnectionStatus: entities.ConnectionStatus_CONNECTED, + NodeType: entities.Node_GNB, + Configuration: &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{}}, + } + + if withFunctions { + gnb := nodebInfo.GetGnb() + gnb.RanFunctions = []*entities.RanFunction{{RanFunctionId: 2, RanFunctionRevision: 2}} + } + + readerMock.On("GetNodeb", gnbNodebRanName).Return(nodebInfo, nil) routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil) - writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) - e2tInstancesManagerMock.On("AddRansToInstance", mock.Anything, mock.Anything).Return(nil) + + notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)} + gnbToUpdate := getExpectedNodebForExistingRan(*nodebInfo, notificationRequest.Payload) + + writerMock.On("UpdateNodebInfo", gnbToUpdate).Return(nil) + if withFunctions { + writerMock.On("UpdateNodebInfoAndPublish", gnbToUpdate).Return(nil) + } + e2tInstancesManagerMock.On("AddRansToInstance", e2tInstanceFullAddress, []string{gnbNodebRanName}).Return(nil) var errEmpty error - rmrMessage := &rmrCgo.MBuf{} - rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(rmrMessage, errEmpty) - prefBytes := []byte(prefix) - notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlEnGnb...)} + rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(&rmrCgo.MBuf{}, errEmpty) handler.Handle(notificationRequest) - assertNewNodebSuccessCalls(readerMock, t, e2tInstancesManagerMock, writerMock, routingManagerClientMock, rmrMessengerMock) + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) + e2tInstancesManagerMock.AssertExpectations(t) + rmrMessengerMock.AssertCalled(t, "SendMsg", mock.Anything, true) } -func TestE2SetupRequestNotificationHandler_HandleExistingGnbSuccess(t *testing.T) { - path, err :=filepath.Abs("../../tests/resources/setupRequest_gnb.xml") - if err != nil { - t.Fatal(err) - } - xmlGnb, err := ioutil.ReadFile(path) - if err != nil { - t.Fatal(err) - } +func TestE2SetupRequestNotificationHandler_HandleExistingConnectedGnbWithoutFunctionsSuccess(t *testing.T) { + testE2SetupRequestNotificationHandler_HandleExistingConnectedGnbSuccess(t, false) +} +func TestE2SetupRequestNotificationHandler_HandleExistingConnectedGnbWithFunctionsSuccess(t *testing.T) { + testE2SetupRequestNotificationHandler_HandleExistingConnectedGnbSuccess(t, true) +} + +func TestE2SetupRequestNotificationHandler_HandleExistingDisconnectedGnbSuccess(t *testing.T) { + xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath) handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t) - var e2tInstance = &entities.E2TInstance{} - e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(e2tInstance, nil) - var gnb = &entities.NodebInfo{ - RanName: nodebRanName, + readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil) + e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil) + var nodebInfo = &entities.NodebInfo{ + RanName: gnbNodebRanName, AssociatedE2TInstanceAddress: e2tInstanceFullAddress, - ConnectionStatus: entities.ConnectionStatus_CONNECTED, - NodeType: entities.Node_GNB, - Configuration: &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{}}, + ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, + NodeType: entities.Node_GNB, + Configuration: &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{}}, } - readerMock.On("GetNodeb", mock.Anything).Return(gnb, nil) + + readerMock.On("GetNodeb", gnbNodebRanName).Return(nodebInfo, nil) routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil) - writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) - e2tInstancesManagerMock.On("AddRansToInstance", mock.Anything, mock.Anything).Return(nil) + + notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)} + gnbToUpdate := getExpectedNodebForExistingRan(*nodebInfo, notificationRequest.Payload) + gnbToUpdate2 := *gnbToUpdate + gnbToUpdate2.ConnectionStatus = entities.ConnectionStatus_CONNECTED + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &gnbToUpdate2, gnbNodebRanName+"_CONNECTED").Return(nil) + gnbToUpdate3 := *gnbToUpdate + gnbToUpdate3.ConnectionStatus = entities.ConnectionStatus_CONNECTED + gnbToUpdate3.AssociatedE2TInstanceAddress = e2tInstanceFullAddress + writerMock.On("UpdateNodebInfo", &gnbToUpdate3).Return(nil) + e2tInstancesManagerMock.On("AddRansToInstance", e2tInstanceFullAddress, []string{gnbNodebRanName}).Return(nil) var errEmpty error - rmrMessage := &rmrCgo.MBuf{} - rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(rmrMessage, errEmpty) - prefBytes := []byte(prefix) - notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlGnb...)} + rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(&rmrCgo.MBuf{}, errEmpty) handler.Handle(notificationRequest) - assertExistingNodebSuccessCalls(readerMock, t, e2tInstancesManagerMock, writerMock, routingManagerClientMock, rmrMessengerMock) + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) + e2tInstancesManagerMock.AssertExpectations(t) } -func TestE2SetupRequestNotificationHandler_HandleParseError(t *testing.T) { - path, err :=filepath.Abs("../../tests/resources/setupRequest_gnb.xml") - if err != nil { - t.Fatal(err) +func getExpectedNodebForExistingRan(nodeb entities.NodebInfo, payload []byte) *entities.NodebInfo { + pipInd := bytes.IndexByte(payload, '|') + setupRequest := &models.E2SetupRequestMessage{} + _ = xml.Unmarshal(normalizeXml(payload[pipInd+1:]), &setupRequest.E2APPDU) + if ranFuncs := setupRequest.ExtractRanFunctionsList(); ranFuncs != nil { + nodeb.GetGnb().RanFunctions = ranFuncs } - xmlGnb, err := ioutil.ReadFile(path) - if err != nil { - t.Fatal(err) + return &nodeb +} + +func getExpectedGnbNodebForNewRan(payload []byte) *entities.NodebInfo { + pipInd := bytes.IndexByte(payload, '|') + setupRequest := &models.E2SetupRequestMessage{} + _ = xml.Unmarshal(normalizeXml(payload[pipInd+1:]), &setupRequest.E2APPDU) + + nodeb := &entities.NodebInfo{ + AssociatedE2TInstanceAddress: e2tInstanceFullAddress, + RanName: gnbNodebRanName, + SetupFromNetwork: true, + NodeType: entities.Node_GNB, + Configuration: &entities.NodebInfo_Gnb{ + Gnb: &entities.Gnb{ + GnbType: entities.GnbType_GNB, + RanFunctions: setupRequest.ExtractRanFunctionsList(), + }, + }, + GlobalNbId: &entities.GlobalNbId{ + PlmnId: setupRequest.GetPlmnId(), + NbId: setupRequest.GetNbId(), + }, + } + + return nodeb +} + +func getExpectedEnbNodebForNewRan(payload []byte) *entities.NodebInfo { + pipInd := bytes.IndexByte(payload, '|') + setupRequest := &models.E2SetupRequestMessage{} + _ = xml.Unmarshal(normalizeXml(payload[pipInd+1:]), &setupRequest.E2APPDU) + + nodeb := &entities.NodebInfo{ + AssociatedE2TInstanceAddress: e2tInstanceFullAddress, + RanName: enbNodebRanName, + SetupFromNetwork: true, + NodeType: entities.Node_ENB, + Configuration: &entities.NodebInfo_Enb{ + Enb: &entities.Enb{ + EnbType: entities.EnbType_MACRO_ENB, + }, + }, + GlobalNbId: &entities.GlobalNbId{ + PlmnId: setupRequest.GetPlmnId(), + NbId: setupRequest.GetNbId(), + }, } + return nodeb +} + +func TestE2SetupRequestNotificationHandler_HandleParseError(t *testing.T) { + xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath) handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t) - prefBytes := []byte("invalid_prefix") - notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlGnb...)} + readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil) + notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte("invalid_prefix"), xmlGnb...)} handler.Handle(notificationRequest) readerMock.AssertNotCalled(t, "GetNodeb", mock.Anything) writerMock.AssertNotCalled(t, "SaveNodeb", mock.Anything, mock.Anything) @@ -226,8 +450,8 @@ func TestE2SetupRequestNotificationHandler_HandleParseError(t *testing.T) { func TestE2SetupRequestNotificationHandler_HandleUnmarshalError(t *testing.T) { handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t) - prefBytes := []byte(prefix) - notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, "xmlGnb"...)} + readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil) + notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), "xmlGnb"...)} handler.Handle(notificationRequest) readerMock.AssertNotCalled(t, "GetNodeb", mock.Anything) writerMock.AssertNotCalled(t, "SaveNodeb", mock.Anything, mock.Anything) @@ -238,20 +462,12 @@ func TestE2SetupRequestNotificationHandler_HandleUnmarshalError(t *testing.T) { } func TestE2SetupRequestNotificationHandler_HandleGetE2TInstanceError(t *testing.T) { - path, err :=filepath.Abs("../../tests/resources/setupRequest_gnb.xml") - if err != nil { - t.Fatal(err) - } - xmlGnb, err := ioutil.ReadFile(path) - if err != nil { - t.Fatal(err) - } - + xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath) handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t) - var e2tInstance * entities.E2TInstance - e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(e2tInstance, common.NewResourceNotFoundError("Not found")) - prefBytes := []byte(prefix) - notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlGnb...)} + readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil) + e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, common.NewResourceNotFoundError("Not found")) + prefBytes := []byte(e2SetupMsgPrefix) + notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append(prefBytes, xmlGnb...)} handler.Handle(notificationRequest) e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceFullAddress) readerMock.AssertNotCalled(t, "GetNodeb", mock.Anything) @@ -263,21 +479,13 @@ func TestE2SetupRequestNotificationHandler_HandleGetE2TInstanceError(t *testing. } func TestE2SetupRequestNotificationHandler_HandleGetNodebError(t *testing.T) { - path, err :=filepath.Abs("../../tests/resources/setupRequest_gnb.xml") - if err != nil { - t.Fatal(err) - } - xmlGnb, err := ioutil.ReadFile(path) - if err != nil { - t.Fatal(err) - } + xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath) handler, readerMock, writerMock, routingManagerClientMock, e2tInstancesManagerMock, rmrMessengerMock := initMocks(t) - var e2tInstance = &entities.E2TInstance{} - e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(e2tInstance, nil) + readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil) + e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil) var gnb *entities.NodebInfo readerMock.On("GetNodeb", mock.Anything).Return(gnb, common.NewInternalError(errors.New("some error"))) - prefBytes := []byte(prefix) - notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlGnb...)} + notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)} handler.Handle(notificationRequest) e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceFullAddress) readerMock.AssertCalled(t, "GetNodeb", mock.Anything) @@ -289,56 +497,53 @@ func TestE2SetupRequestNotificationHandler_HandleGetNodebError(t *testing.T) { } func TestE2SetupRequestNotificationHandler_HandleAssociationError(t *testing.T) { - path, err :=filepath.Abs("../../tests/resources/setupRequest_gnb.xml") - if err != nil { - t.Fatal(err) - } - xmlGnb, err := ioutil.ReadFile(path) - if err != nil { - t.Fatal(err) - } + xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath) handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t) - var e2tInstance = &entities.E2TInstance{} - e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(e2tInstance, nil) + readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil) + e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil) var gnb *entities.NodebInfo readerMock.On("GetNodeb", mock.Anything).Return(gnb, common.NewResourceNotFoundError("Not found")) - writerMock.On("SaveNodeb", mock.Anything, mock.Anything).Return(nil) + notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)} + nodebInfo := getExpectedGnbNodebForNewRan(notificationRequest.Payload) + writerMock.On("SaveNodeb", nodebInfo).Return(nil) + nbIdentity := &entities.NbIdentity{InventoryName: gnbNodebRanName, GlobalNbId: nodebInfo.GlobalNbId} + writerMock.On("AddNbIdentity", entities.Node_GNB, nbIdentity).Return(nil) + updatedNodebInfo := *nodebInfo + updatedNodebInfo.ConnectionStatus = entities.ConnectionStatus_CONNECTED + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNodebInfo, gnbNodebRanName+"_CONNECTED").Return(nil) writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) e2tInstancesManagerMock.On("AddRansToInstance", mock.Anything, mock.Anything).Return(nil) routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(errors.New("association error")) + updatedNodebInfo2 := *nodebInfo + updatedNodebInfo2.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNodebInfo2, gnbNodebRanName+"_DISCONNECTED").Return(nil) var errEmpty error - rmrMessage := &rmrCgo.MBuf{} - rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(rmrMessage, errEmpty) - - prefBytes := []byte(prefix) - notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlGnb...)} + mbuf := getMbuf(gnbNodebRanName, rmrCgo.RIC_E2_SETUP_FAILURE, E2SetupFailureResponseWithTransportCause, notificationRequest) + rmrMessengerMock.On("WhSendMsg", mbuf, true).Return(&rmrCgo.MBuf{}, errEmpty) handler.Handle(notificationRequest) readerMock.AssertCalled(t, "GetNodeb", mock.Anything) e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceFullAddress) writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, mock.Anything) routingManagerClientMock.AssertCalled(t, "AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything) - writerMock.AssertCalled(t, "UpdateNodebInfo", mock.Anything) - e2tInstancesManagerMock.AssertCalled(t, "AddRansToInstance", mock.Anything, mock.Anything) - rmrMessengerMock.AssertCalled(t, "SendMsg", mock.Anything, mock.Anything) + e2tInstancesManagerMock.AssertNotCalled(t, "AddRansToInstance", mock.Anything, mock.Anything) + rmrMessengerMock.AssertCalled(t, "WhSendMsg", mbuf, true) } - -func TestE2SetupRequestNotificationHandler_ConvertTo20BitStringError(t *testing.T){ - - path, err :=filepath.Abs("../../tests/resources/setupRequest_en-gNB.xml") - if err != nil { - t.Fatal(err) - } - xmlEnGnb, err := ioutil.ReadFile(path) - if err != nil { - t.Fatal(err) - } +func TestE2SetupRequestNotificationHandler_ConvertTo20BitStringError(t *testing.T) { + xmlEnGnb := readXmlFile(t, EnGnbSetupRequestXmlPath) logger := tests.InitLog(t) - config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3, GlobalRicId: struct { - PlmnId string - RicNearRtId string - }{PlmnId : "131014", RicNearRtId: "10011001101010101011"}} + config := &configuration.Configuration{ + RnibRetryIntervalMs: 10, + MaxRnibConnectionAttempts: 3, + RnibWriter: configuration.RnibWriterConfig{ + StateChangeMessageChannel: StateChangeMessageChannel, + }, + GlobalRicId: struct { + RicId string + Mcc string + Mnc string + }{Mcc: "327", Mnc: "94", RicId: "10011001101010101011"}} rmrMessengerMock := &mocks.RmrMessengerMock{} rmrSender := tests.InitRmrSender(rmrMessengerMock, logger) readerMock := &mocks.RnibReaderMock{} @@ -346,22 +551,27 @@ func TestE2SetupRequestNotificationHandler_ConvertTo20BitStringError(t *testing. routingManagerClientMock := &mocks.RoutingManagerClientMock{} rnibDataService := services.NewRnibDataService(logger, config, readerMock, writerMock) e2tInstancesManagerMock := &mocks.E2TInstancesManagerMock{} - e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManagerMock, routingManagerClientMock) - handler := NewE2SetupRequestNotificationHandler(logger, config, e2tInstancesManagerMock, rmrSender, rnibDataService, e2tAssociationManager) - - var e2tInstance = &entities.E2TInstance{} - e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(e2tInstance, nil) + ranListManager := managers.NewRanListManager(logger, rnibDataService) + ranAlarmService := services.NewRanAlarmService(logger, config) + ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(logger, rnibDataService, ranListManager, ranAlarmService) + + e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManagerMock, routingManagerClientMock, ranConnectStatusChangeManager) + handler := NewE2SetupRequestNotificationHandler(logger, config, e2tInstancesManagerMock, rmrSender, rnibDataService, e2tAssociationManager, ranConnectStatusChangeManager, ranListManager) + readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil) + e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil) var gnb *entities.NodebInfo readerMock.On("GetNodeb", mock.Anything).Return(gnb, common.NewResourceNotFoundError("Not found")) writerMock.On("SaveNodeb", mock.Anything, mock.Anything).Return(nil) + writerMock.On("AddNbIdentity", entities.Node_GNB, mock.Anything).Return(nil) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, mock.Anything).Return(nil) routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil) writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) e2tInstancesManagerMock.On("AddRansToInstance", mock.Anything, mock.Anything).Return(nil) var errEmpty error rmrMessage := &rmrCgo.MBuf{} rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(rmrMessage, errEmpty) - prefBytes := []byte(prefix) - notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlEnGnb...)} + prefBytes := []byte(e2SetupMsgPrefix) + notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append(prefBytes, xmlEnGnb...)} handler.Handle(notificationRequest) readerMock.AssertCalled(t, "GetNodeb", mock.Anything) e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceFullAddress) @@ -373,22 +583,14 @@ func TestE2SetupRequestNotificationHandler_ConvertTo20BitStringError(t *testing. } func TestE2SetupRequestNotificationHandler_HandleExistingGnbInvalidStatusError(t *testing.T) { - path, err :=filepath.Abs("../../tests/resources/setupRequest_gnb.xml") - if err != nil { - t.Fatal(err) - } - xmlGnb, err := ioutil.ReadFile(path) - if err != nil { - t.Fatal(err) - } - + xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath) handler, readerMock, writerMock, routingManagerClientMock, e2tInstancesManagerMock, rmrMessengerMock := initMocks(t) - var gnb = &entities.NodebInfo{RanName: nodebRanName, ConnectionStatus:entities.ConnectionStatus_SHUTTING_DOWN} + var gnb = &entities.NodebInfo{RanName: gnbNodebRanName, ConnectionStatus: entities.ConnectionStatus_SHUTTING_DOWN} readerMock.On("GetNodeb", mock.Anything).Return(gnb, nil) - var e2tInstance = &entities.E2TInstance{} - e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(e2tInstance, nil) - prefBytes := []byte(prefix) - notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlGnb...)} + readerMock.On("GetGeneralConfiguration").Return(&entities.GeneralConfiguration{EnableRic: true}, nil) + e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(&entities.E2TInstance{}, nil) + prefBytes := []byte(e2SetupMsgPrefix) + notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append(prefBytes, xmlGnb...)} handler.Handle(notificationRequest) readerMock.AssertCalled(t, "GetNodeb", mock.Anything) e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceFullAddress) @@ -399,12 +601,19 @@ func TestE2SetupRequestNotificationHandler_HandleExistingGnbInvalidStatusError(t rmrMessengerMock.AssertNotCalled(t, "SendMsg", mock.Anything, mock.Anything) } -func initMocks(t *testing.T) (E2SetupRequestNotificationHandler, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.RmrMessengerMock, *mocks.E2TInstancesManagerMock, *mocks.RoutingManagerClientMock) { +func initMocks(t *testing.T) (*E2SetupRequestNotificationHandler, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.RmrMessengerMock, *mocks.E2TInstancesManagerMock, *mocks.RoutingManagerClientMock) { logger := tests.InitLog(t) - config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3, GlobalRicId: struct { - PlmnId string - RicNearRtId string - }{PlmnId : "131014", RicNearRtId: "556670"}} + config := &configuration.Configuration{ + RnibRetryIntervalMs: 10, + MaxRnibConnectionAttempts: 3, + RnibWriter: configuration.RnibWriterConfig{ + StateChangeMessageChannel: StateChangeMessageChannel, + }, + GlobalRicId: struct { + RicId string + Mcc string + Mnc string + }{Mcc: "327", Mnc: "94", RicId: "AACCE"}} rmrMessengerMock := &mocks.RmrMessengerMock{} rmrSender := tests.InitRmrSender(rmrMessengerMock, logger) readerMock := &mocks.RnibReaderMock{} @@ -412,27 +621,10 @@ func initMocks(t *testing.T) (E2SetupRequestNotificationHandler, *mocks.RnibRead routingManagerClientMock := &mocks.RoutingManagerClientMock{} rnibDataService := services.NewRnibDataService(logger, config, readerMock, writerMock) e2tInstancesManagerMock := &mocks.E2TInstancesManagerMock{} - e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManagerMock, routingManagerClientMock) - handler := NewE2SetupRequestNotificationHandler(logger, config, e2tInstancesManagerMock, rmrSender, rnibDataService, e2tAssociationManager) + ranListManager := managers.NewRanListManager(logger, rnibDataService) + ranAlarmService := services.NewRanAlarmService(logger, config) + ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(logger, rnibDataService, ranListManager, ranAlarmService) + e2tAssociationManager := managers.NewE2TAssociationManager(logger, rnibDataService, e2tInstancesManagerMock, routingManagerClientMock, ranConnectStatusChangeManager) + handler := NewE2SetupRequestNotificationHandler(logger, config, e2tInstancesManagerMock, rmrSender, rnibDataService, e2tAssociationManager, ranConnectStatusChangeManager, ranListManager) return handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock } - -func assertNewNodebSuccessCalls(readerMock *mocks.RnibReaderMock, t *testing.T, e2tInstancesManagerMock *mocks.E2TInstancesManagerMock, writerMock *mocks.RnibWriterMock, routingManagerClientMock *mocks.RoutingManagerClientMock, rmrMessengerMock *mocks.RmrMessengerMock) { - readerMock.AssertCalled(t, "GetNodeb", mock.Anything) - writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, mock.Anything) - e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceFullAddress) - routingManagerClientMock.AssertCalled(t, "AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything) - writerMock.AssertCalled(t, "UpdateNodebInfo", mock.Anything) - e2tInstancesManagerMock.AssertCalled(t, "AddRansToInstance", mock.Anything, mock.Anything) - rmrMessengerMock.AssertCalled(t, "SendMsg", mock.Anything, mock.Anything) -} - -func assertExistingNodebSuccessCalls(readerMock *mocks.RnibReaderMock, t *testing.T, e2tInstancesManagerMock *mocks.E2TInstancesManagerMock, writerMock *mocks.RnibWriterMock, routingManagerClientMock *mocks.RoutingManagerClientMock, rmrMessengerMock *mocks.RmrMessengerMock) { - readerMock.AssertCalled(t, "GetNodeb", mock.Anything) - writerMock.AssertNotCalled(t, "SaveNodeb", mock.Anything, mock.Anything) - e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceFullAddress) - routingManagerClientMock.AssertCalled(t, "AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything) - writerMock.AssertCalled(t, "UpdateNodebInfo", mock.Anything) - e2tInstancesManagerMock.AssertCalled(t, "AddRansToInstance", mock.Anything, mock.Anything) - rmrMessengerMock.AssertCalled(t, "SendMsg", mock.Anything, mock.Anything) -} \ No newline at end of file