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=1f790a6728b017741bfd1ab7ee663408979639f9;hb=5734b9170a6ea903130cf1bc2a2d81c27356e310;hp=d3a7ae269258c4e248c4fa426c8b4e25b00b24d8;hpb=1de6ad01ae4a10222b07f144509e496eab99da9d;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 d3a7ae2..1f790a6 100644 --- a/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler_test.go +++ b/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler_test.go @@ -1,7 +1,8 @@ // // Copyright 2019 AT&T Intellectual Property // Copyright 2019 Nokia -// Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved. +// Copyright (c) 2022 Samsung Electronics Co., Ltd. All Rights Reserved. +// Copyright 2023 Capgemini // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -32,11 +33,12 @@ import ( "e2mgr/utils" "encoding/xml" "errors" + "testing" + "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common" "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "testing" ) const ( @@ -50,9 +52,9 @@ const ( NgEnbSetupRequestXmlPath = "../../tests/resources/setupRequest/setupRequest_ng-eNB.xml" EnbSetupRequestXmlPath = "../../tests/resources/setupRequest/setupRequest_enb.xml" GnbWithoutFunctionsSetupRequestXmlPath = "../../tests/resources/setupRequest/setupRequest_gnb_without_functions.xml" - E2SetupFailureResponseWithMiscCause = "1131" - E2SetupFailureResponseWithTransportCause = "1131" - E2SetupFailureResponseWithRicCause = "1131" + E2SetupFailureResponseWithMiscCause = "1491131" + E2SetupFailureResponseWithTransportCause = "1491131" + E2SetupFailureResponseWithRicCause = "1491131" StateChangeMessageChannel = "RAN_CONNECTION_STATUS_CHANGE" ) @@ -379,7 +381,7 @@ func TestE2SetupRequestNotificationHandler_HandleNewRanRoutingManagerError(t *te updatedNodebInfo := *nodebInfo routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(errors.New("association error")) updatedNodebInfo.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED - writerMock.On("UpdateNodebInfo", &updatedNodebInfo).Return(nil) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) writerMock.On("UpdateNbIdentities", mock.Anything, mock.Anything, mock.Anything).Return(nil) var errEmpty error mbuf := getMbuf(gnbNodebRanName, rmrCgo.RIC_E2_SETUP_FAILURE, E2SetupFailureResponseWithTransportCause, notificationRequest) @@ -418,12 +420,12 @@ func testE2SetupRequestNotificationHandler_HandleNewRanSuccess(t *testing.T, xml writerMock.On("AddNbIdentity", nodeType, nbIdentity).Return(nil) updatedNodebInfo := *expectedNodebInfo updatedNodebInfo.ConnectionStatus = entities.ConnectionStatus_CONNECTED - writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNodebInfo, ranName+"_CONNECTED").Return(nil) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, ranName+"_CONNECTED").Return(nil) routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil) updatedNodebInfo2 := *expectedNodebInfo updatedNodebInfo2.ConnectionStatus = entities.ConnectionStatus_CONNECTED updatedNodebInfo2.AssociatedE2TInstanceAddress = e2tInstanceFullAddress - writerMock.On("UpdateNodebInfo", &updatedNodebInfo2).Return(nil) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) newNbIdentity := &entities.NbIdentity{InventoryName: ranName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, GlobalNbId: expectedNodebInfo.GlobalNbId} writerMock.On("UpdateNbIdentities", updatedNodebInfo2.GetNodeType(), []*entities.NbIdentity{nbIdentity}, []*entities.NbIdentity{newNbIdentity}).Return(nil) @@ -458,22 +460,34 @@ func getExpectedGnbNodebForNewRan(payload []byte) *entities.NodebInfo { pipInd := bytes.IndexByte(payload, '|') setupRequest := &models.E2SetupRequestMessage{} _ = xml.Unmarshal(utils.NormalizeXml(payload[pipInd+1:]), &setupRequest.E2APPDU) + gnbNodetype := "gNB_CU_UP" + if setupRequest.GetCuupId() != "" && setupRequest.GetCuupId() != "0" && setupRequest.GetDuId() != "" && setupRequest.GetDuId() != "0" { + gnbNodetype = "gNB_CU_UP" + } else if setupRequest.GetCuupId() != "" && setupRequest.GetCuupId() != "0" { + gnbNodetype = "gNB_CU_UP" + } else if setupRequest.GetDuId() != "" && setupRequest.GetDuId() != "0" { + gnbNodetype = "gNB_DU" + } nodeb := &entities.NodebInfo{ AssociatedE2TInstanceAddress: e2tInstanceFullAddress, RanName: gnbNodebRanName, SetupFromNetwork: true, NodeType: entities.Node_GNB, + GnbNodeType: gnbNodetype, Configuration: &entities.NodebInfo_Gnb{ Gnb: &entities.Gnb{ GnbType: entities.GnbType_GNB, RanFunctions: setupRequest.ExtractRanFunctionsList(), + NodeConfigs: setupRequest.ExtractE2NodeConfigList(), }, }, GlobalNbId: &entities.GlobalNbId{ PlmnId: setupRequest.GetPlmnId(), NbId: setupRequest.GetNbId(), }, + CuUpId: setupRequest.GetCuupId(), + DuId: setupRequest.GetDuId(), } return nodeb @@ -491,7 +505,8 @@ func getExpectedEnbNodebForNewRan(payload []byte) *entities.NodebInfo { NodeType: entities.Node_ENB, Configuration: &entities.NodebInfo_Enb{ Enb: &entities.Enb{ - EnbType: entities.EnbType_MACRO_ENB, + EnbType: entities.EnbType_MACRO_ENB, + NodeConfigs: setupRequest.ExtractE2NodeConfigList(), }, }, GlobalNbId: &entities.GlobalNbId{ @@ -515,13 +530,26 @@ func getExpectedNodebForExistingRan(nodeb *entities.NodebInfo, payload []byte) * nb := *nodeb if nodeb.NodeType == entities.Node_ENB { + if e2NodeConfig := setupRequest.ExtractE2NodeConfigList(); e2NodeConfig != nil { + updatedEnb := *nodeb.GetEnb() + updatedEnb.NodeConfigs = e2NodeConfig + nb.Configuration = &entities.NodebInfo_Enb{Enb: &updatedEnb} + } + return &nb } if ranFuncs := setupRequest.ExtractRanFunctionsList(); ranFuncs != nil { updatedGnb := *nodeb.GetGnb() updatedGnb.RanFunctions = ranFuncs - nb.Configuration =&entities.NodebInfo_Gnb{Gnb: &updatedGnb} + nb.Configuration = &entities.NodebInfo_Gnb{Gnb: &updatedGnb} + } + + if e2NodeConfig := setupRequest.ExtractE2NodeConfigList(); e2NodeConfig != nil { + updatedGnb := *nodeb.GetGnb() + updatedGnb.RanFunctions = nb.GetGnb().RanFunctions + updatedGnb.NodeConfigs = e2NodeConfig + nb.Configuration = &entities.NodebInfo_Gnb{Gnb: &updatedGnb} } return &nb @@ -556,7 +584,7 @@ func TestE2SetupRequestNotificationHandler_HandleExistingConnectedEnbSuccess(t * enbToUpdate.SetupFromNetwork = true newNbIdentity := &entities.NbIdentity{InventoryName: enbNodebRanName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}} writerMock.On("UpdateNbIdentities", enbToUpdate.GetNodeType(), []*entities.NbIdentity{oldNbIdentity}, []*entities.NbIdentity{newNbIdentity}).Return(nil) - writerMock.On("UpdateNodebInfo", enbToUpdate).Return(nil) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) e2tInstancesManagerMock.On("AddRansToInstance", e2tInstanceFullAddress, []string{enbNodebRanName}).Return(nil) var errEmpty error rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(&rmrCgo.MBuf{}, errEmpty) @@ -597,7 +625,7 @@ func TestE2SetupRequestNotificationHandler_HandleExistingDisconnectedEnbSuccess( enbToUpdate2 := *enbToUpdate enbToUpdate2.ConnectionStatus = entities.ConnectionStatus_CONNECTED enbToUpdate2.SetupFromNetwork = true - writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &enbToUpdate2, enbNodebRanName+"_CONNECTED").Return(nil) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, enbNodebRanName+"_CONNECTED").Return(nil) newNbIdentity := &entities.NbIdentity{InventoryName: enbNodebRanName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}} writerMock.On("UpdateNbIdentities", enbToUpdate.GetNodeType(), []*entities.NbIdentity{oldNbIdentity}, []*entities.NbIdentity{newNbIdentity}).Return(nil) @@ -606,7 +634,7 @@ func TestE2SetupRequestNotificationHandler_HandleExistingDisconnectedEnbSuccess( enbToUpdate3.ConnectionStatus = entities.ConnectionStatus_CONNECTED enbToUpdate3.SetupFromNetwork = true enbToUpdate3.AssociatedE2TInstanceAddress = e2tInstanceFullAddress - writerMock.On("UpdateNodebInfo", &enbToUpdate3).Return(nil) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) e2tInstancesManagerMock.On("AddRansToInstance", e2tInstanceFullAddress, []string{enbNodebRanName}).Return(nil) var errEmpty error rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(&rmrCgo.MBuf{}, errEmpty) @@ -649,9 +677,9 @@ func testE2SetupRequestNotificationHandler_HandleExistingConnectedGnbSuccess(t * notificationRequest := &models.NotificationRequest{RanName: gnbNodebRanName, Payload: append([]byte(e2SetupMsgPrefix), xmlGnb...)} gnbToUpdate := getExpectedNodebForExistingRan(nodebInfo, notificationRequest.Payload) gnbToUpdate.SetupFromNetwork = true - writerMock.On("UpdateNodebInfo", gnbToUpdate).Return(nil) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) if withFunctions { - writerMock.On("UpdateNodebInfoAndPublish", gnbToUpdate).Return(nil) + writerMock.On("UpdateNodebInfoAndPublish", mock.Anything).Return(nil) } newNbIdentity := &entities.NbIdentity{InventoryName: gnbNodebRanName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}} writerMock.On("UpdateNbIdentities", gnbToUpdate.GetNodeType(), []*entities.NbIdentity{oldNbIdentity}, []*entities.NbIdentity{newNbIdentity}).Return(nil) @@ -687,6 +715,16 @@ func TestE2SetupRequestNotificationHandler_HandleExistingConnectedGnbRoutingMana gnb := nodebInfo.GetGnb() gnb.RanFunctions = []*entities.RanFunction{{RanFunctionId: 2, RanFunctionRevision: 2}} + gnb.NodeConfigs = []*entities.E2NodeComponentConfig{{ + E2NodeComponentID: &entities.E2NodeComponentConfig_E2NodeComponentInterfaceTypeNG{ + E2NodeComponentInterfaceTypeNG: &entities.E2NodeComponentInterfaceNG{ + AmfName: "nginterf", + }, + }, + E2NodeComponentInterfaceType: entities.E2NodeComponentInterfaceType_ng, + E2NodeComponentRequestPart: []byte("72 65 73 70 61 72 74"), + E2NodeComponentResponsePart: []byte("72 65 73 70 61 72 74"), + }} readerMock.On("GetNodeb", gnbNodebRanName).Return(nodebInfo, nil) routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(errors.New("association error")) @@ -697,7 +735,7 @@ func TestE2SetupRequestNotificationHandler_HandleExistingConnectedGnbRoutingMana gnbToUpdate2 := *gnbToUpdate gnbToUpdate2.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED gnbToUpdate2.SetupFromNetwork = true - writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &gnbToUpdate2, gnbNodebRanName+"_DISCONNECTED").Return(nil) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, gnbNodebRanName+"_DISCONNECTED").Return(nil) newNbIdentity := &entities.NbIdentity{InventoryName: gnbNodebRanName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}} writerMock.On("UpdateNbIdentities", gnbToUpdate2.GetNodeType(), []*entities.NbIdentity{oldNbIdentity}, []*entities.NbIdentity{newNbIdentity}).Return(nil) @@ -766,12 +804,12 @@ func TestE2SetupRequestNotificationHandler_HandleExistingDisconnectedGnbSuccess( gnbToUpdate2 := *gnbToUpdate gnbToUpdate2.ConnectionStatus = entities.ConnectionStatus_CONNECTED gnbToUpdate2.SetupFromNetwork = true - writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &gnbToUpdate2, gnbNodebRanName+"_CONNECTED").Return(nil) + writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", mock.Anything, gnbNodebRanName+"_CONNECTED").Return(nil) gnbToUpdate3 := *gnbToUpdate gnbToUpdate3.ConnectionStatus = entities.ConnectionStatus_CONNECTED gnbToUpdate3.SetupFromNetwork = true gnbToUpdate3.AssociatedE2TInstanceAddress = e2tInstanceFullAddress - writerMock.On("UpdateNodebInfo", &gnbToUpdate3).Return(nil) + writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil) newNbIdentity := &entities.NbIdentity{InventoryName: gnbNodebRanName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}} writerMock.On("UpdateNbIdentities", gnbToUpdate3.GetNodeType(), []*entities.NbIdentity{oldNbIdentity}, []*entities.NbIdentity{newNbIdentity}).Return(nil)