[RIC-431] Add Enb | Configuration changes | Some refactoring | K8S yamls

[ric-plt/e2mgr.git] / E2Manager / providers / httpmsghandlerprovider / incoming_request_handler_provider_test.go

diff --git a/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go b/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go
index e06105f..d6795a0 100644 (file)
--- a/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go
+++ b/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go
@@ -46,7 +46,7 @@ func getRmrSender(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger)
 func setupTest(t *testing.T) *IncomingRequestHandlerProvider {
        rmrMessengerMock := &mocks.RmrMessengerMock{}
        log := initLog(t)
-       config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3}
+       config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3, RnibWriter: configuration.RnibWriterConfig{StateChangeMessageChannel: "RAN_CONNECTION_STATUS_CHANGE", RanManipulationMessageChannel: "RAN_MANIPULATION"}}
        config.RoutingManager.BaseUrl = "http://10.10.2.15:12020/routingmanager"
        readerMock := &mocks.RnibReaderMock{}
        writerMock := &mocks.RnibWriterMock{}
@@ -56,8 +56,11 @@ func setupTest(t *testing.T) *IncomingRequestHandlerProvider {
        e2tInstancesManager := managers.NewE2TInstancesManager(rnibDataService, log)
        httpClientMock := &mocks.HttpClientMock{}
        rmClient := clients.NewRoutingManagerClient(log, config, httpClientMock)
-       e2tAssociationManager := managers.NewE2TAssociationManager(log, rnibDataService, e2tInstancesManager, rmClient)
-       return NewIncomingRequestHandlerProvider(log, rmrSender, configuration.ParseConfiguration(), rnibDataService, ranSetupManager, e2tInstancesManager, e2tAssociationManager, rmClient)
+       ranListManager := managers.NewRanListManager(log)
+       ranAlarmService := services.NewRanAlarmService(log, config)
+       ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(log, rnibDataService,ranListManager, ranAlarmService)
+       e2tAssociationManager := managers.NewE2TAssociationManager(log, rnibDataService, e2tInstancesManager, rmClient, ranConnectStatusChangeManager)
+       return NewIncomingRequestHandlerProvider(log, rmrSender, configuration.ParseConfiguration(), rnibDataService, ranSetupManager, e2tInstancesManager, e2tAssociationManager, rmClient, ranConnectStatusChangeManager)
 }
 
 func TestNewIncomingRequestHandlerProvider(t *testing.T) {
@@ -78,26 +81,14 @@ func TestShutdownRequestHandler(t *testing.T) {
        assert.True(t, ok)
 }
 
-func TestX2SetupRequestHandler(t *testing.T) {
+func TestSetGeneralConfigurationHandler(t *testing.T) {
        provider := setupTest(t)
-       handler, err := provider.GetHandler(X2SetupRequest)
+       handler, err := provider.GetHandler(SetGeneralConfigurationRequest)
 
        assert.NotNil(t, provider)
        assert.Nil(t, err)
 
-       _, ok := handler.(*httpmsghandlers.SetupRequestHandler)
-
-       assert.True(t, ok)
-}
-
-func TestEndcSetupRequestHandler(t *testing.T) {
-       provider := setupTest(t)
-       handler, err := provider.GetHandler(EndcSetupRequest)
-
-       assert.NotNil(t, provider)
-       assert.Nil(t, err)
-
-       _, ok := handler.(*httpmsghandlers.SetupRequestHandler)
+       _, ok := handler.(*httpmsghandlers.SetGeneralConfigurationHandler)
 
        assert.True(t, ok)
 }