Merge "[RIC-436] Fix E2 Setup Response population" into PI5

diff --combined E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler_test.go
index a824e0c,8712194..3f3a27b
--- 1/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler_test.go
--- 2/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 +20,7 @@@
  package rmrmsghandlers
  
  import (
+       "bytes"
        "e2mgr/configuration"
        "e2mgr/managers"
        "e2mgr/mocks"
@@@ -27,9 -28,11 +28,11 @@@
        "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"
+       "github.com/golang/protobuf/ptypes/wrappers"
        "github.com/stretchr/testify/assert"
        "github.com/stretchr/testify/mock"
        "io/ioutil"
@@@ -45,6 -48,7 +48,7 @@@ const 
        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"
  )
  
  func readXmlFile(t *testing.T, xmlPath string) []byte {
@@@ -127,8 -131,28 +131,28 @@@ func TestE2SetupRequestNotificationHand
        var gnb *entities.NodebInfo
        readerMock.On("GetNodeb", mock.Anything).Return(gnb, common.NewResourceNotFoundError("Not found"))
        notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte(prefix), xmlGnb...)}
-       setupRequest, e2tIpAddress, _ := handler.parseSetupRequest(notificationRequest.Payload)
-       nodebInfo, _ := handler.buildNodebInfo(nodebRanName, e2tIpAddress, setupRequest)
+       nodebInfo := getExpectedNodebWithFunctionsForNewRan(notificationRequest.Payload)
+       writerMock.On("SaveNodeb", mock.Anything, nodebInfo).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)
+       handler.Handle(notificationRequest)
+       writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, nodebInfo)
+       assertNewNodebSuccessCalls(readerMock, t, e2tInstancesManagerMock, writerMock, routingManagerClientMock, rmrMessengerMock)
+ }
+ 
+ func TestE2SetupRequestNotificationHandler_HandleNewGnbWithoutFunctionsSuccess(t *testing.T) {
+       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"))
+       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte(prefix), xmlGnb...)}
+       nodebInfo := getExpectedNodebWithFunctionsForNewRan(notificationRequest.Payload)
        writerMock.On("SaveNodeb", mock.Anything, nodebInfo).Return(nil)
        routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil)
        writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil)
@@@ -198,18 -222,81 +222,81 @@@ func TestE2SetupRequestNotificationHand
        routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil)
  
        notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte(prefix), xmlGnb...)}
-       setupRequest, _, _ := handler.parseSetupRequest(notificationRequest.Payload)
-       _ = handler.setGnbFunctions(gnb, setupRequest)
+       gnbToUpdate := getExpectedNodebWithFunctionsForExistingRan(*gnb, notificationRequest.Payload)
+       writerMock.On("UpdateNodebInfo", gnbToUpdate).Return(nil)
+       e2tInstancesManagerMock.On("AddRansToInstance", mock.Anything, mock.Anything).Return(nil)
+       var errEmpty error
+       rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(&rmrCgo.MBuf{}, errEmpty)
+       handler.Handle(notificationRequest)
+       writerMock.AssertCalled(t, "UpdateNodebInfo", gnbToUpdate)
+       assertExistingNodebSuccessCalls(readerMock, t, e2tInstancesManagerMock, writerMock, routingManagerClientMock, rmrMessengerMock)
+ }
+ 
+ func TestE2SetupRequestNotificationHandler_HandleExistingGnbWithFunctionsSuccess(t *testing.T) {
+       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
  
-       writerMock.On("UpdateNodebInfo", gnb).Return(nil)
+       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,
+               AssociatedE2TInstanceAddress: e2tInstanceFullAddress,
+               ConnectionStatus:             entities.ConnectionStatus_CONNECTED,
+               NodeType:                     entities.Node_GNB,
+               Configuration:                &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{RanFunctions: []*entities.RanFunction{
+                       {
+                               RanFunctionId: &wrappers.UInt32Value{Value:2},
+                               RanFunctionRevision: &wrappers.UInt32Value{Value:2},
+                       },
+               }}},
+       }
+       readerMock.On("GetNodeb", mock.Anything).Return(gnb, nil)
+       routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil)
+ 
+       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte(prefix), xmlGnb...)}
+       gnbToUpdate := getExpectedNodebWithFunctionsForExistingRan(*gnb, notificationRequest.Payload)
+ 
+       writerMock.On("UpdateNodebInfo", gnbToUpdate).Return(nil)
        e2tInstancesManagerMock.On("AddRansToInstance", mock.Anything, mock.Anything).Return(nil)
        var errEmpty error
        rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(&rmrCgo.MBuf{}, errEmpty)
        handler.Handle(notificationRequest)
-       writerMock.AssertCalled(t, "UpdateNodebInfo", gnb)
+       writerMock.AssertCalled(t, "UpdateNodebInfo", gnbToUpdate)
        assertExistingNodebSuccessCalls(readerMock, t, e2tInstancesManagerMock, writerMock, routingManagerClientMock, rmrMessengerMock)
  }
  
+ func getExpectedNodebWithFunctionsForExistingRan(nodeb entities.NodebInfo , payload []byte) *entities.NodebInfo {
+       pipInd := bytes.IndexByte(payload, '|')
+       setupRequest := &models.E2SetupRequestMessage{}
+       _ = xml.Unmarshal(normalizeXml(payload[pipInd+1:]), &setupRequest.E2APPDU)
+       nodeb.GetGnb().RanFunctions = setupRequest.ExtractRanFunctionsList()
+       return &nodeb
+ }
+ 
+ func getExpectedNodebWithFunctionsForNewRan(payload []byte) *entities.NodebInfo {
+       pipInd := bytes.IndexByte(payload, '|')
+       setupRequest := &models.E2SetupRequestMessage{}
+       _ = xml.Unmarshal(normalizeXml(payload[pipInd+1:]), &setupRequest.E2APPDU)
+ 
+       nodeb := &entities.NodebInfo{
+               AssociatedE2TInstanceAddress: e2tInstanceFullAddress,
+               ConnectionStatus:             entities.ConnectionStatus_CONNECTED,
+               RanName:                      nodebRanName,
+               NodeType:                     entities.Node_GNB,
+               Configuration:                &entities.NodebInfo_Gnb{
+                       Gnb: &entities.Gnb{
+                               RanFunctions: setupRequest.ExtractRanFunctionsList(),
+                       },
+               },
+               GlobalNbId:                   &entities.GlobalNbId{
+                       PlmnId: setupRequest.GetPlmnId(),
+                       NbId:   setupRequest.GetNbId(),
+               },
+       }
+ 
+       return nodeb
+ }
+ 
  func TestE2SetupRequestNotificationHandler_HandleParseError(t *testing.T) {
        xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
  
@@@ -307,10 -394,9 +394,10 @@@ func TestE2SetupRequestNotificationHand
        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"}}
 +              RicId string
 +              Mcc   string
 +              Mnc   string
 +      }{Mcc: "327", Mnc: "94" ,RicId: "10011001101010101011"}}
        rmrMessengerMock := &mocks.RmrMessengerMock{}
        rmrSender := tests.InitRmrSender(rmrMessengerMock, logger)
        readerMock := &mocks.RnibReaderMock{}
@@@ -366,10 -452,9 +453,10 @@@ func TestE2SetupRequestNotificationHand
  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"}}
 +              RicId string
 +              Mcc   string
 +              Mnc   string
 +      }{Mcc: "327", Mnc: "94" ,RicId: "AACCE"}}
        rmrMessengerMock := &mocks.RmrMessengerMock{}
        rmrSender := tests.InitRmrSender(rmrMessengerMock, logger)
        readerMock := &mocks.RnibReaderMock{}