-//func TestX2SetupSuccess(t *testing.T) {
-//
-// controller, readerMock, writerMock, rmrMessengerMock := setupControllerTest(t)
-//
-// ranName := "test"
-// nb := &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
-// readerMock.On("GetNodeb", ranName).Return(nb, nil)
-//
-// var nbUpdated = &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1}
-// writerMock.On("UpdateNodebInfo", nbUpdated).Return(nil)
-//
-// payload := e2pdus.PackedX2setupRequest
-// var xAction[]byte
-// msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ranName, &payload, &xAction)
-//
-// rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg, nil)
-//
-// header := http.Header{}
-// header.Set("Content-Type", "application/json")
-// httpRequest := tests.GetHttpRequest()
-// httpRequest.Header = header
-//
-// writer := httptest.NewRecorder()
-// controller.X2Setup(writer, httpRequest)
-//
-// assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode)
-//}
-//
-//func TestEndcSetupSuccess(t *testing.T) {
-//
-// controller, readerMock, writerMock, rmrMessengerMock := setupControllerTest(t)
-//
-// ranName := "test"
-// nb := &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST}
-// readerMock.On("GetNodeb", ranName).Return(nb, nil)
-//
-// var nbUpdated = &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST, ConnectionAttempts: 1}
-// writerMock.On("UpdateNodebInfo", nbUpdated).Return(nil)
-//
-// payload := e2pdus.PackedEndcX2setupRequest
-// var xAction[]byte
-// msg := rmrCgo.NewMBuf(rmrCgo.RIC_ENDC_X2_SETUP_REQ, len(payload), ranName, &payload, &xAction)
-//
-// rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg, nil)
-//
-// header := http.Header{}
-// header.Set("Content-Type", "application/json")
-// httpRequest := tests.GetHttpRequest()
-// httpRequest.Header = header
-//
-// writer := httptest.NewRecorder()
-// controller.EndcSetup(writer, httpRequest)
-//
-// assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode)
-//}
+func TestX2SetupSuccess(t *testing.T) {
+
+ controller, readerMock, writerMock, rmrMessengerMock, _ := setupControllerTest(t)
+
+ ranName := "test"
+ nb := &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, AssociatedE2TInstanceAddress:"10.0.2.15:8989"}
+ readerMock.On("GetNodeb", ranName).Return(nb, nil)
+ var nbUpdated = *nb
+ nbUpdated.ConnectionAttempts = 0
+ writerMock.On("UpdateNodebInfo", &nbUpdated).Return(nil)
+
+ var nbUpdated2 = &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1, AssociatedE2TInstanceAddress:"10.0.2.15:8989"}
+ writerMock.On("UpdateNodebInfo", nbUpdated2).Return(nil)
+
+ payload := e2pdus.PackedX2setupRequest
+ var xAction []byte
+ msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ranName, &payload, &xAction)
+
+ rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg, nil)
+
+ header := http.Header{}
+ header.Set("Content-Type", "application/json")
+ httpRequest := tests.GetHttpRequest()
+ httpRequest.Header = header
+
+ writer := httptest.NewRecorder()
+ controller.X2Setup(writer, httpRequest)
+
+ assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode)
+}
+
+
+func TestEndcSetupSuccess(t *testing.T) {
+
+ controller, readerMock, writerMock, rmrMessengerMock, _ := setupControllerTest(t)
+
+ ranName := "test"
+ nb := &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST, AssociatedE2TInstanceAddress:"10.0.2.15:8989"}
+ readerMock.On("GetNodeb", ranName).Return(nb, nil)
+ var nbUpdated = *nb
+ nbUpdated.ConnectionAttempts = 0
+ writerMock.On("UpdateNodebInfo", &nbUpdated).Return(nil)
+
+ var nbUpdated2 = &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST, ConnectionAttempts: 1, AssociatedE2TInstanceAddress:"10.0.2.15:8989"}
+ writerMock.On("UpdateNodebInfo", nbUpdated2).Return(nil)
+
+ payload := e2pdus.PackedEndcX2setupRequest
+ var xAction[]byte
+ msg := rmrCgo.NewMBuf(rmrCgo.RIC_ENDC_X2_SETUP_REQ, len(payload), ranName, &payload, &xAction)
+
+ rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg, nil)
+
+ header := http.Header{}
+ header.Set("Content-Type", "application/json")
+ httpRequest := tests.GetHttpRequest()
+ httpRequest.Header = header
+
+ writer := httptest.NewRecorder()
+ controller.EndcSetup(writer, httpRequest)
+
+ assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode)
+}