X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmain%2Fhttp_server_test.go;h=760274d71fc7ce2280ef82152d2be29e1e977af7;hb=e3623cf1310f8c8d2fd9b5842102516b9be3b441;hp=ccfe5038831de677334fdcd0a0711458e011c623;hpb=4db397dbfa07d202f1a7134e1a7a52b8fb3b5d8a;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/main/http_server_test.go b/E2Manager/main/http_server_test.go
index ccfe503..760274d 100644
--- a/E2Manager/main/http_server_test.go
+++ b/E2Manager/main/http_server_test.go
@@ -34,29 +34,43 @@ func setupRouterAndMocks() (*mux.Router, *mocks.ControllerMock, *mocks.NodebCont
 	controllerMock := &mocks.ControllerMock{}
 	controllerMock.On("ShutdownHandler").Return(nil)
 	controllerMock.On("X2ResetHandler").Return(nil)
+	controllerMock.On("X2SetupHandler").Return(nil)
+	controllerMock.On("EndcSetupHandler").Return(nil)
 
 	nodebControllerMock := &mocks.NodebControllerMock{}
-	nodebControllerMock.On("HandleRequest").Return(nil)
 	nodebControllerMock.On("GetNodebIdList").Return(nil)
 	nodebControllerMock.On("GetNodeb").Return(nil)
 	nodebControllerMock.On("HandleHealthCheckRequest").Return(nil)
 
-	router := mux.NewRouter();
+	router := mux.NewRouter()
 	initializeRoutes(router, nodebControllerMock, controllerMock)
 	return router, controllerMock, nodebControllerMock
 }
 
-func TestRoutePostNodebMessageType(t *testing.T) {
-	router, _, nodebControllerMock := setupRouterAndMocks()
+func TestRoutePostEndcSetup(t *testing.T) {
+	router, controllerMock, _ := setupRouterAndMocks()
+
+	req, err := http.NewRequest("POST", "/v1/nodeb/endc-setup", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	rr := httptest.NewRecorder()
+	router.ServeHTTP(rr, req)
+
+	controllerMock.AssertNumberOfCalls(t,"EndcSetupHandler", 1)
+}
+
+func TestRoutePostX2Setup(t *testing.T) {
+	router, controllerMock, _ := setupRouterAndMocks()
 
-	req, err := http.NewRequest("POST", "/v1/nodeb/messageType", nil)
+	req, err := http.NewRequest("POST", "/v1/nodeb/x2-setup", nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 	rr := httptest.NewRecorder()
 	router.ServeHTTP(rr, req)
 
-	nodebControllerMock.AssertNumberOfCalls(t,"HandleRequest", 1)
+	controllerMock.AssertNumberOfCalls(t,"X2SetupHandler", 1)
 }
 
 func TestRouteGetNodebIds(t *testing.T) {
@@ -69,7 +83,7 @@ func TestRouteGetNodebIds(t *testing.T) {
 	rr := httptest.NewRecorder()
 	router.ServeHTTP(rr, req)
 
-	nodebControllerMock.AssertNumberOfCalls(t,"GetNodebIdList", 1)
+	nodebControllerMock.AssertNumberOfCalls(t, "GetNodebIdList", 1)
 }
 
 func TestRouteGetNodebRanName(t *testing.T) {
@@ -84,7 +98,7 @@ func TestRouteGetNodebRanName(t *testing.T) {
 
 	assert.Equal(t, http.StatusOK, rr.Code, "handler returned wrong status code")
 	assert.Equal(t, "ran1", rr.Body.String(), "handler returned wrong body")
-	nodebControllerMock.AssertNumberOfCalls(t,"GetNodeb", 1)
+	nodebControllerMock.AssertNumberOfCalls(t, "GetNodeb", 1)
 }
 
 func TestRouteGetHealth(t *testing.T) {
@@ -97,7 +111,7 @@ func TestRouteGetHealth(t *testing.T) {
 	rr := httptest.NewRecorder()
 	router.ServeHTTP(rr, req)
 
-	nodebControllerMock.AssertNumberOfCalls(t,"HandleHealthCheckRequest", 1)
+	nodebControllerMock.AssertNumberOfCalls(t, "HandleHealthCheckRequest", 1)
 }
 
 func TestRoutePutNodebShutdown(t *testing.T) {
@@ -110,7 +124,7 @@ func TestRoutePutNodebShutdown(t *testing.T) {
 	rr := httptest.NewRecorder()
 	router.ServeHTTP(rr, req)
 
-	controllerMock.AssertNumberOfCalls(t,"ShutdownHandler", 1)
+	controllerMock.AssertNumberOfCalls(t, "ShutdownHandler", 1)
 }
 
 func TestRoutePutNodebResetRanName(t *testing.T) {
@@ -125,7 +139,7 @@ func TestRoutePutNodebResetRanName(t *testing.T) {
 
 	assert.Equal(t, http.StatusOK, rr.Code, "handler returned wrong status code")
 	assert.Equal(t, "ran1", rr.Body.String(), "handler returned wrong body")
-	controllerMock.AssertNumberOfCalls(t,"X2ResetHandler", 1)
+	controllerMock.AssertNumberOfCalls(t, "X2ResetHandler", 1)
 }
 
 func TestRouteNotFound(t *testing.T) {
@@ -148,107 +162,107 @@ func TestParseConfigurationSuccess(t *testing.T) {
 	assert.Equal(t, 4096, config.Rmr.MaxMsgSize)
 	assert.Equal(t, "info", config.Logging.LogLevel)
 	assert.Equal(t, 100, config.NotificationResponseBuffer)
-	assert.Equal(t,5, config.BigRedButtonTimeoutSec)
+	assert.Equal(t, 5, config.BigRedButtonTimeoutSec)
 }
 
 func TestParseConfigurationFileNotFoundFailure(t *testing.T) {
 	configPath := "../resources/configuration.yaml"
 	configPathTmp := "../resources/configuration.yaml_tmp"
 	err := os.Rename(configPath, configPathTmp)
-	if err != nil{
+	if err != nil {
 		t.Errorf("#http_server_test.TestParseConfigurationFileNotFoundFailure - failed to rename configuration file: %s\n", configPath)
 	}
 	defer func() {
 		err = os.Rename(configPathTmp, configPath)
-		if err != nil{
+		if err != nil {
 			t.Errorf("#http_server_test.TestParseConfigurationFileNotFoundFailure - failed to rename configuration file: %s\n", configPath)
 		}
 	}()
-	assert.Panics(t, func (){configuration.ParseConfiguration()})
+	assert.Panics(t, func() { configuration.ParseConfiguration() })
 }
 
 func TestRmrConfigNotFoundFailure(t *testing.T) {
 	configPath := "../resources/configuration.yaml"
 	configPathTmp := "../resources/configuration.yaml_tmp"
 	err := os.Rename(configPath, configPathTmp)
-	if err != nil{
+	if err != nil {
 		t.Errorf("#http_server_test.TestRmrConfigNotFoundFailure - failed to rename configuration file: %s\n", configPath)
 	}
 	defer func() {
 		err = os.Rename(configPathTmp, configPath)
-		if err != nil{
+		if err != nil {
 			t.Errorf("#http_server_test.TestRmrConfigNotFoundFailure - failed to rename configuration file: %s\n", configPath)
 		}
 	}()
 	yamlMap := map[string]interface{}{
-		"logging":map[string]interface{}{"logLevel":"info"},
-		"http":map[string]interface{}{"port":3800},
+		"logging": map[string]interface{}{"logLevel": "info"},
+		"http":    map[string]interface{}{"port": 3800},
 	}
 	buf, err := yaml.Marshal(yamlMap)
-	if err != nil{
+	if err != nil {
 		t.Errorf("#http_server_test.TestRmrConfigNotFoundFailure - failed to marshal configuration map\n")
 	}
 	err = ioutil.WriteFile("../resources/configuration.yaml", buf, 0644)
-	if err != nil{
+	if err != nil {
 		t.Errorf("#http_server_test.TestRmrConfigNotFoundFailure - failed to write configuration file: %s\n", configPath)
 	}
-	assert.PanicsWithValue(t, "#http_server.fillRmrConfig - failed to fill RMR configuration: The entry 'rmr' not found\n", func (){configuration.ParseConfiguration()})
+	assert.PanicsWithValue(t, "#http_server.fillRmrConfig - failed to fill RMR configuration: The entry 'rmr' not found\n", func() { configuration.ParseConfiguration() })
 }
 
 func TestLoggingConfigNotFoundFailure(t *testing.T) {
 	configPath := "../resources/configuration.yaml"
 	configPathTmp := "../resources/configuration.yaml_tmp"
 	err := os.Rename(configPath, configPathTmp)
-	if err != nil{
+	if err != nil {
 		t.Errorf("#http_server_test.TestLoggingConfigNotFoundFailure - failed to rename configuration file: %s\n", configPath)
 	}
 	defer func() {
 		err = os.Rename(configPathTmp, configPath)
-		if err != nil{
+		if err != nil {
 			t.Errorf("#http_server_test.TestLoggingConfigNotFoundFailure - failed to rename configuration file: %s\n", configPath)
 		}
 	}()
 	yamlMap := map[string]interface{}{
-		"rmr":map[string]interface{}{"port":3801, "maxMsgSize":4096},
-		"http":map[string]interface{}{"port":3800},
+		"rmr":  map[string]interface{}{"port": 3801, "maxMsgSize": 4096},
+		"http": map[string]interface{}{"port": 3800},
 	}
 	buf, err := yaml.Marshal(yamlMap)
-	if err != nil{
+	if err != nil {
 		t.Errorf("#http_server_test.TestRmrConfigNotFoundFailure - failed to marshal configuration map\n")
 	}
 	err = ioutil.WriteFile("../resources/configuration.yaml", buf, 0644)
-	if err != nil{
+	if err != nil {
 		t.Errorf("#http_server_test.TestRmrConfigNotFoundFailure - failed to write configuration file: %s\n", configPath)
 	}
 	assert.PanicsWithValue(t, "#http_server.fillLoggingConfig - failed to fill logging configuration: The entry 'logging' not found\n",
-		func (){configuration.ParseConfiguration()})
+		func() { configuration.ParseConfiguration() })
 }
 
 func TestHttpConfigNotFoundFailure(t *testing.T) {
 	configPath := "../resources/configuration.yaml"
 	configPathTmp := "../resources/configuration.yaml_tmp"
 	err := os.Rename(configPath, configPathTmp)
-	if err != nil{
+	if err != nil {
 		t.Errorf("#http_server_test.TestHttpConfigNotFoundFailure - failed to rename configuration file: %s\n", configPath)
 	}
 	defer func() {
 		err = os.Rename(configPathTmp, configPath)
-		if err != nil{
+		if err != nil {
 			t.Errorf("#http_server_test.TestHttpConfigNotFoundFailure - failed to rename configuration file: %s\n", configPath)
 		}
 	}()
 	yamlMap := map[string]interface{}{
-		"rmr":map[string]interface{}{"port":3801, "maxMsgSize":4096},
-		"logging":map[string]interface{}{"logLevel":"info"},
+		"rmr":     map[string]interface{}{"port": 3801, "maxMsgSize": 4096},
+		"logging": map[string]interface{}{"logLevel": "info"},
 	}
 	buf, err := yaml.Marshal(yamlMap)
-	if err != nil{
+	if err != nil {
 		t.Errorf("#http_server_test.TestHttpConfigNotFoundFailure - failed to marshal configuration map\n")
 	}
 	err = ioutil.WriteFile("../resources/configuration.yaml", buf, 0644)
-	if err != nil{
+	if err != nil {
 		t.Errorf("#http_server_test.TestHttpConfigNotFoundFailure - failed to write configuration file: %s\n", configPath)
 	}
 	assert.PanicsWithValue(t, "#http_server.fillHttpConfig - failed to fill HTTP configuration: The entry 'http' not found\n",
-		func (){configuration.ParseConfiguration()})
+		func() { configuration.ParseConfiguration() })
 }