X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhttpserver%2Fhttp_server_test.go;h=b798186c8ece355869acfb7312f6c3c0b4bf8ed5;hb=798b2731eae5c427334463c0c36db0817721dd03;hp=e6e1ef5b5ed965eae13ffec07548e07442f16f79;hpb=efcb4528362460aa2249d319c9752b63bb720fe2;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/httpserver/http_server_test.go b/E2Manager/httpserver/http_server_test.go
index e6e1ef5..b798186 100644
--- a/E2Manager/httpserver/http_server_test.go
+++ b/E2Manager/httpserver/http_server_test.go
@@ -17,7 +17,6 @@
 //  This source code is part of the near-RT RIC (RAN Intelligent Controller)
 //  platform project (RICP).
 
-
 package httpserver
 
 import (
@@ -37,11 +36,13 @@ func setupRouterAndMocks() (*mux.Router, *mocks.RootControllerMock, *mocks.Nodeb
 
 	nodebControllerMock := &mocks.NodebControllerMock{}
 	nodebControllerMock.On("Shutdown").Return(nil)
-	nodebControllerMock.On("X2Reset").Return(nil)
-	nodebControllerMock.On("X2Setup").Return(nil)
-	nodebControllerMock.On("EndcSetup").Return(nil)
 	nodebControllerMock.On("GetNodeb").Return(nil)
 	nodebControllerMock.On("GetNodebIdList").Return(nil)
+	nodebControllerMock.On("SetGeneralConfiguration").Return(nil)
+	nodebControllerMock.On("DeleteEnb").Return(nil)
+	nodebControllerMock.On("AddEnb").Return(nil)
+	nodebControllerMock.On("UpdateEnb").Return(nil)
+	nodebControllerMock.On("HealthCheckRequest").Return(nil)
 
 	e2tControllerMock := &mocks.E2TControllerMock{}
 
@@ -52,103 +53,101 @@ func setupRouterAndMocks() (*mux.Router, *mocks.RootControllerMock, *mocks.Nodeb
 	return router, rootControllerMock, nodebControllerMock, e2tControllerMock
 }
 
-func TestRoutePostEndcSetup(t *testing.T) {
+func TestRouteGetNodebIds(t *testing.T) {
 	router, _, nodebControllerMock, _ := setupRouterAndMocks()
 
-	req, err := http.NewRequest("POST", "/v1/nodeb/endc-setup", nil)
+	req, err := http.NewRequest("GET", "/v1/nodeb/states", nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 	rr := httptest.NewRecorder()
 	router.ServeHTTP(rr, req)
 
-	nodebControllerMock.AssertNumberOfCalls(t, "EndcSetup", 1)
+	nodebControllerMock.AssertNumberOfCalls(t, "GetNodebIdList", 1)
 }
 
-func TestRoutePostX2Setup(t *testing.T) {
+func TestRouteGetNodebRanName(t *testing.T) {
 	router, _, nodebControllerMock, _ := setupRouterAndMocks()
 
-	req, err := http.NewRequest("POST", "/v1/nodeb/x2-setup", nil)
+	req, err := http.NewRequest("GET", "/v1/nodeb/ran1", nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 	rr := httptest.NewRecorder()
 	router.ServeHTTP(rr, req)
 
-	nodebControllerMock.AssertNumberOfCalls(t, "X2Setup", 1)
+	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)
 }
 
-func TestRouteGetNodebIds(t *testing.T) {
-	router, _, nodebControllerMock, _ := setupRouterAndMocks()
+func TestRouteGetHealth(t *testing.T) {
+	router, rootControllerMock, _, _ := setupRouterAndMocks()
 
-	req, err := http.NewRequest("GET", "/v1/nodeb/ids", nil)
+	req, err := http.NewRequest("GET", "/v1/health", nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 	rr := httptest.NewRecorder()
 	router.ServeHTTP(rr, req)
 
-	nodebControllerMock.AssertNumberOfCalls(t, "GetNodebIdList", 1)
+	rootControllerMock.AssertNumberOfCalls(t, "HandleHealthCheckRequest", 1)
 }
 
-func TestRouteGetNodebRanName(t *testing.T) {
+func TestRoutePutNodebShutdown(t *testing.T) {
 	router, _, nodebControllerMock, _ := setupRouterAndMocks()
 
-	req, err := http.NewRequest("GET", "/v1/nodeb/ran1", nil)
+	req, err := http.NewRequest("PUT", "/v1/nodeb/shutdown", nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 	rr := httptest.NewRecorder()
 	router.ServeHTTP(rr, req)
 
-	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, "Shutdown", 1)
 }
 
-func TestRouteGetHealth(t *testing.T) {
-	router, rootControllerMock, _, _ := setupRouterAndMocks()
+func TestHealthCheckRequest(t *testing.T) {
+	router, _, nodebControllerMock, _ := setupRouterAndMocks()
 
-	req, err := http.NewRequest("GET", "/v1/health", nil)
+	req, err := http.NewRequest("PUT", "/v1/nodeb/health", nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 	rr := httptest.NewRecorder()
 	router.ServeHTTP(rr, req)
 
-	rootControllerMock.AssertNumberOfCalls(t, "HandleHealthCheckRequest", 1)
+	nodebControllerMock.AssertNumberOfCalls(t, "HealthCheckRequest", 1)
 }
 
-func TestRoutePutNodebShutdown(t *testing.T) {
+func TestRoutePutNodebSetGeneralConfiguration(t *testing.T) {
 	router, _, nodebControllerMock, _ := setupRouterAndMocks()
 
-	req, err := http.NewRequest("PUT", "/v1/nodeb/shutdown", nil)
+	req, err := http.NewRequest("PUT", "/v1/nodeb/parameters", nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 	rr := httptest.NewRecorder()
 	router.ServeHTTP(rr, req)
 
-	nodebControllerMock.AssertNumberOfCalls(t, "Shutdown", 1)
+	nodebControllerMock.AssertNumberOfCalls(t, "SetGeneralConfiguration", 1)
 }
 
-func TestRoutePutNodebResetRanName(t *testing.T) {
+func TestRoutePutUpdateEnb(t *testing.T) {
 	router, _, nodebControllerMock, _ := setupRouterAndMocks()
 
-	req, err := http.NewRequest("PUT", "/v1/nodeb/ran1/reset", nil)
+	req, err := http.NewRequest("PUT", "/v1/nodeb/enb/ran1", nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 	rr := httptest.NewRecorder()
 	router.ServeHTTP(rr, req)
 
-	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, "X2Reset", 1)
+	nodebControllerMock.AssertNumberOfCalls(t, "UpdateEnb", 1)
 }
 
 func TestRouteNotFound(t *testing.T) {
-	router, _, _,_ := setupRouterAndMocks()
+	router, _, _, _ := setupRouterAndMocks()
 
 	req, err := http.NewRequest("GET", "/v1/no/such/route", nil)
 	if err != nil {
@@ -179,6 +178,34 @@ func TestRun(t *testing.T) {
 	assert.Equal(t, 200, resp.StatusCode)
 }
 
+func TestRouteAddEnb(t *testing.T) {
+	router, _, nodebControllerMock, _ := setupRouterAndMocks()
+
+	req, err := http.NewRequest("POST", "/v1/nodeb/enb", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	rr := httptest.NewRecorder()
+	router.ServeHTTP(rr, req)
+
+	assert.Equal(t, http.StatusCreated, rr.Code, "handler returned wrong status code")
+	nodebControllerMock.AssertNumberOfCalls(t, "AddEnb", 1)
+}
+
+func TestRouteDeleteEnb(t *testing.T) {
+	router, _, nodebControllerMock, _ := setupRouterAndMocks()
+
+	req, err := http.NewRequest("DELETE", "/v1/nodeb/enb/ran1", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	rr := httptest.NewRecorder()
+	router.ServeHTTP(rr, req)
+
+	assert.Equal(t, http.StatusNoContent, rr.Code, "handler returned wrong status code")
+	nodebControllerMock.AssertNumberOfCalls(t, "DeleteEnb", 1)
+}
+
 func initLog(t *testing.T) *logger.Logger {
 	log, err := logger.InitLogger(logger.InfoLevel)
 	if err != nil {