X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fproviders%2Fhttpmsghandlerprovider%2Fincoming_request_handler_provider_test.go;h=f3597889c7d098cc1fe11d89afea5cede4ffc767;hb=76709204dfd7968156b5fa81190f146a8991812d;hp=840d9c23367408c445fd47f161861053cb4fd503;hpb=efcb4528362460aa2249d319c9752b63bb720fe2;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go b/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go
index 840d9c2..f359788 100644
--- a/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go
+++ b/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go
@@ -21,6 +21,7 @@
 package httpmsghandlerprovider
 
 import (
+	"e2mgr/clients"
 	"e2mgr/configuration"
 	"e2mgr/e2managererrors"
 	"e2mgr/handlers/httpmsghandlers"
@@ -46,13 +47,20 @@ func setupTest(t *testing.T) *IncomingRequestHandlerProvider {
 	rmrMessengerMock := &mocks.RmrMessengerMock{}
 	log := initLog(t)
 	config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3}
+	config.RoutingManager.BaseUrl = "http://10.10.2.15:12020/routingmanager"
 	readerMock := &mocks.RnibReaderMock{}
 	writerMock := &mocks.RnibWriterMock{}
 	rnibDataService := services.NewRnibDataService(log, config, readerMock, writerMock)
 	rmrSender := getRmrSender(rmrMessengerMock, log)
 	ranSetupManager := managers.NewRanSetupManager(log, rmrSender, rnibDataService)
 	e2tInstancesManager := managers.NewE2TInstancesManager(rnibDataService, log)
-	return NewIncomingRequestHandlerProvider(log, rmrSender, configuration.ParseConfiguration(), rnibDataService, ranSetupManager, e2tInstancesManager)
+	httpClientMock := &mocks.HttpClientMock{}
+	rmClient := clients.NewRoutingManagerClient(log, config, httpClientMock)
+	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)
 }
 
 func TestNewIncomingRequestHandlerProvider(t *testing.T) {
@@ -73,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)
 }