[RICPLT-2048] X2 ENDC Setup request refactoring - unit test added

[ric-plt/e2mgr.git] / E2Manager / managers / ran_setup_manager_test.go

diff --git a/E2Manager/managers/ran_setup_manager_test.go b/E2Manager/managers/ran_setup_manager_test.go
index 7c866c8..58ca166 100644 (file)
--- a/E2Manager/managers/ran_setup_manager_test.go
+++ b/E2Manager/managers/ran_setup_manager_test.go
@@ -44,7 +44,7 @@ func TestExecuteSetupConnectingX2Setup(t *testing.T) {
 
        var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
        var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1}
-       var rnibErr common.IRNibError
+       var rnibErr error
        writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
 
        payload := e2pdus.PackedX2setupRequest
@@ -55,7 +55,7 @@ func TestExecuteSetupConnectingX2Setup(t *testing.T) {
        rmrService := getRmrService(rmrMessengerMock, log)
 
        mgr := NewRanSetupManager(log, rmrService, writerProvider)
-       if err := mgr.ExecuteSetup(initialNodeb); err != nil {
+       if err := mgr.ExecuteSetup(initialNodeb, entities.ConnectionStatus_CONNECTING); err != nil {
                t.Errorf("want: success, got: error: %s", err)
        }
 
@@ -75,7 +75,7 @@ func TestExecuteSetupConnectingEndcX2Setup(t *testing.T) {
 
        var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST}
        var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST, ConnectionAttempts: 1}
-       var rnibErr common.IRNibError
+       var rnibErr error
        writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
 
        payload := e2pdus.PackedEndcX2setupRequest
@@ -86,7 +86,7 @@ func TestExecuteSetupConnectingEndcX2Setup(t *testing.T) {
        rmrService := getRmrService(rmrMessengerMock, log)
 
        mgr := NewRanSetupManager(log, rmrService, writerProvider)
-       if err := mgr.ExecuteSetup(initialNodeb); err != nil {
+       if err := mgr.ExecuteSetup(initialNodeb, entities.ConnectionStatus_CONNECTING); err != nil {
                t.Errorf("want: success, got: error: %s", err)
        }
 
@@ -107,7 +107,7 @@ func TestExecuteSetupDisconnected(t *testing.T) {
        var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
        var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1}
        var argNodebDisconnected = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 0}
-       var rnibErr common.IRNibError
+       var rnibErr error
        writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
        writerMock.On("UpdateNodebInfo", argNodebDisconnected).Return(rnibErr)
 
@@ -119,7 +119,7 @@ func TestExecuteSetupDisconnected(t *testing.T) {
        rmrService := getRmrService(rmrMessengerMock, log)
 
        mgr := NewRanSetupManager(log, rmrService, writerProvider)
-       if err := mgr.ExecuteSetup(initialNodeb); err == nil {
+       if err := mgr.ExecuteSetup(initialNodeb, entities.ConnectionStatus_CONNECTING); err == nil {
                t.Errorf("want: failure, got: success")
        }
 
@@ -152,7 +152,7 @@ func TestExecuteSetupConnectingRnibError(t *testing.T) {
        rmrService := getRmrService(rmrMessengerMock, log)
 
        mgr := NewRanSetupManager(log, rmrService, writerProvider)
-       if err := mgr.ExecuteSetup(initialNodeb); err == nil {
+       if err := mgr.ExecuteSetup(initialNodeb, entities.ConnectionStatus_CONNECTING); err == nil {
                t.Errorf("want: failure, got: success")
        } else {
                assert.IsType(t, e2managererrors.NewRnibDbError(), err)
@@ -175,7 +175,7 @@ func TestExecuteSetupDisconnectedRnibError(t *testing.T) {
        var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
        var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1}
        var argNodebDisconnected = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 0}
-       var rnibErr common.IRNibError
+       var rnibErr error
        writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
        writerMock.On("UpdateNodebInfo", argNodebDisconnected).Return(common.NewInternalError(fmt.Errorf("DB error")))
 
@@ -187,7 +187,7 @@ func TestExecuteSetupDisconnectedRnibError(t *testing.T) {
        rmrService := getRmrService(rmrMessengerMock, log)
 
        mgr := NewRanSetupManager(log, rmrService, writerProvider)
-       if err := mgr.ExecuteSetup(initialNodeb); err == nil {
+       if err := mgr.ExecuteSetup(initialNodeb, entities.ConnectionStatus_CONNECTING); err == nil {
                t.Errorf("want: failure, got: success")
        } else {
                assert.IsType(t, e2managererrors.NewRnibDbError(), err)
@@ -209,7 +209,7 @@ func TestExecuteSetupUnsupportedProtocol(t *testing.T) {
 
        var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_UNKNOWN_E2_APPLICATION_PROTOCOL}
        var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_UNKNOWN_E2_APPLICATION_PROTOCOL, ConnectionAttempts: 1}
-       var rnibErr common.IRNibError
+       var rnibErr error
        writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
 
        payload := e2pdus.PackedX2setupRequest
@@ -220,7 +220,7 @@ func TestExecuteSetupUnsupportedProtocol(t *testing.T) {
        rmrService := getRmrService(rmrMessengerMock, log)
 
        mgr := NewRanSetupManager(log, rmrService, writerProvider)
-       if err := mgr.ExecuteSetup(initialNodeb); err == nil {
+       if err := mgr.ExecuteSetup(initialNodeb, entities.ConnectionStatus_CONNECTING); err == nil {
                t.Errorf("want: error, got: success")
        }