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=5ce3b9c4413e186edb76a880cd9bdd22e4b18561;hb=c7018fe32516829bc267efcc5a20818355768762;hp=840d9c23367408c445fd47f161861053cb4fd503;hpb=372a275602ae05da22130a4601709291c7fbbaa6;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..5ce3b9c 100644
--- a/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go
+++ b/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go
@@ -17,10 +17,10 @@
 //  This source code is part of the near-RT RIC (RAN Intelligent Controller)
 //  platform project (RICP).
 
-
 package httpmsghandlerprovider
 
 import (
+	"e2mgr/clients"
 	"e2mgr/configuration"
 	"e2mgr/e2managererrors"
 	"e2mgr/handlers/httpmsghandlers"
@@ -45,14 +45,22 @@ 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{}
 	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)
+	nodebValidator := managers.NewNodebValidator()
+	updateEnbManager := managers.NewUpdateEnbManager(log, rnibDataService, nodebValidator)
+
+	return NewIncomingRequestHandlerProvider(log, rmrSender, configuration.ParseConfiguration(), rnibDataService, e2tInstancesManager, rmClient, ranConnectStatusChangeManager, nodebValidator, updateEnbManager)
 }
 
 func TestNewIncomingRequestHandlerProvider(t *testing.T) {
@@ -73,26 +81,14 @@ func TestShutdownRequestHandler(t *testing.T) {
 	assert.True(t, ok)
 }
 
-func TestX2SetupRequestHandler(t *testing.T) {
-	provider := setupTest(t)
-	handler, err := provider.GetHandler(X2SetupRequest)
-
-	assert.NotNil(t, provider)
-	assert.Nil(t, err)
-
-	_, ok := handler.(*httpmsghandlers.SetupRequestHandler)
-
-	assert.True(t, ok)
-}
-
-func TestEndcSetupRequestHandler(t *testing.T) {
+func TestSetGeneralConfigurationHandler(t *testing.T) {
 	provider := setupTest(t)
-	handler, err := provider.GetHandler(EndcSetupRequest)
+	handler, err := provider.GetHandler(SetGeneralConfigurationRequest)
 
 	assert.NotNil(t, provider)
 	assert.Nil(t, err)
 
-	_, ok := handler.(*httpmsghandlers.SetupRequestHandler)
+	_, ok := handler.(*httpmsghandlers.SetGeneralConfigurationHandler)
 
 	assert.True(t, ok)
 }