X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fhttpserver%2Fhttp_server_test.go;h=3c0620bb5afbab8ceb0c024ae66e08e062f9ce35;hb=refs%2Fchanges%2F77%2F3377%2F1;hp=3d4d3d5f8b36f239b581e9be50e1ea879aa2de43;hpb=de19068aaa1f3d2b415cd960106121ceb167aaa9;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/httpserver/http_server_test.go b/E2Manager/httpserver/http_server_test.go
index 3d4d3d5..3c0620b 100644
--- a/E2Manager/httpserver/http_server_test.go
+++ b/E2Manager/httpserver/http_server_test.go
@@ -13,68 +13,44 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-//
+
+//  This source code is part of the near-RT RIC (RAN Intelligent Controller)
+//  platform project (RICP).
+
 
 package httpserver
 
 import (
+	"e2mgr/logger"
 	"e2mgr/mocks"
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/assert"
 	"net/http"
 	"net/http/httptest"
 	"testing"
+	"time"
 )
 
-func setupRouterAndMocks() (*mux.Router, *mocks.ControllerMock, *mocks.NodebControllerMock) {
-	controllerMock := &mocks.ControllerMock{}
-	controllerMock.On("Shutdown").Return(nil)
-	controllerMock.On("X2Reset").Return(nil)
-	controllerMock.On("X2Setup").Return(nil)
-	controllerMock.On("EndcSetup").Return(nil)
-	controllerMock.On("GetNodeb").Return(nil)
-	controllerMock.On("GetNodebIdList").Return(nil)
-
-
+func setupRouterAndMocks() (*mux.Router, *mocks.RootControllerMock, *mocks.NodebControllerMock, *mocks.E2TControllerMock) {
+	rootControllerMock := &mocks.RootControllerMock{}
+	rootControllerMock.On("HandleHealthCheckRequest").Return(nil)
 
 	nodebControllerMock := &mocks.NodebControllerMock{}
+	nodebControllerMock.On("Shutdown").Return(nil)
+	nodebControllerMock.On("GetNodeb").Return(nil)
 	nodebControllerMock.On("GetNodebIdList").Return(nil)
-	nodebControllerMock.On("GetNodeb").Return(nil) // TODO: remove
-	nodebControllerMock.On("HandleHealthCheckRequest").Return(nil)
-
-	router := mux.NewRouter()
-	initializeRoutes(router, nodebControllerMock, controllerMock)
-	return router, controllerMock, nodebControllerMock
-}
-
-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,"EndcSetup", 1)
-}
-
-func TestRoutePostX2Setup(t *testing.T) {
-	router, controllerMock, _ := setupRouterAndMocks()
+	e2tControllerMock := &mocks.E2TControllerMock{}
 
-	req, err := http.NewRequest("POST", "/v1/nodeb/x2-setup", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	rr := httptest.NewRecorder()
-	router.ServeHTTP(rr, req)
+	e2tControllerMock.On("GetE2TInstances").Return(nil)
 
-	controllerMock.AssertNumberOfCalls(t,"X2Setup", 1)
+	router := mux.NewRouter()
+	initializeRoutes(router, rootControllerMock, nodebControllerMock, e2tControllerMock)
+	return router, rootControllerMock, nodebControllerMock, e2tControllerMock
 }
 
 func TestRouteGetNodebIds(t *testing.T) {
-	router, controllerMock, _ := setupRouterAndMocks()
+	router, _, nodebControllerMock, _ := setupRouterAndMocks()
 
 	req, err := http.NewRequest("GET", "/v1/nodeb/ids", nil)
 	if err != nil {
@@ -83,11 +59,11 @@ func TestRouteGetNodebIds(t *testing.T) {
 	rr := httptest.NewRecorder()
 	router.ServeHTTP(rr, req)
 
-	controllerMock.AssertNumberOfCalls(t, "GetNodebIdList", 1)
+	nodebControllerMock.AssertNumberOfCalls(t, "GetNodebIdList", 1)
 }
 
 func TestRouteGetNodebRanName(t *testing.T) {
-	router, controllerMock,_ := setupRouterAndMocks()
+	router, _, nodebControllerMock, _ := setupRouterAndMocks()
 
 	req, err := http.NewRequest("GET", "/v1/nodeb/ran1", nil)
 	if err != nil {
@@ -98,11 +74,11 @@ 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")
-	controllerMock.AssertNumberOfCalls(t, "GetNodeb", 1)
+	nodebControllerMock.AssertNumberOfCalls(t, "GetNodeb", 1)
 }
 
 func TestRouteGetHealth(t *testing.T) {
-	router, _, nodebControllerMock := setupRouterAndMocks()
+	router, rootControllerMock, _, _ := setupRouterAndMocks()
 
 	req, err := http.NewRequest("GET", "/v1/health", nil)
 	if err != nil {
@@ -111,11 +87,11 @@ func TestRouteGetHealth(t *testing.T) {
 	rr := httptest.NewRecorder()
 	router.ServeHTTP(rr, req)
 
-	nodebControllerMock.AssertNumberOfCalls(t, "HandleHealthCheckRequest", 1)
+	rootControllerMock.AssertNumberOfCalls(t, "HandleHealthCheckRequest", 1)
 }
 
 func TestRoutePutNodebShutdown(t *testing.T) {
-	router, controllerMock, _ := setupRouterAndMocks()
+	router, _, nodebControllerMock, _ := setupRouterAndMocks()
 
 	req, err := http.NewRequest("PUT", "/v1/nodeb/shutdown", nil)
 	if err != nil {
@@ -124,33 +100,45 @@ func TestRoutePutNodebShutdown(t *testing.T) {
 	rr := httptest.NewRecorder()
 	router.ServeHTTP(rr, req)
 
-	controllerMock.AssertNumberOfCalls(t, "Shutdown", 1)
+	nodebControllerMock.AssertNumberOfCalls(t, "Shutdown", 1)
 }
 
-func TestRoutePutNodebResetRanName(t *testing.T) {
-	router, controllerMock, _ := setupRouterAndMocks()
+func TestRouteNotFound(t *testing.T) {
+	router, _, _,_ := setupRouterAndMocks()
 
-	req, err := http.NewRequest("PUT", "/v1/nodeb/ran1/reset", nil)
+	req, err := http.NewRequest("GET", "/v1/no/such/route", 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")
-	controllerMock.AssertNumberOfCalls(t, "X2Reset", 1)
+	assert.Equal(t, http.StatusNotFound, rr.Code, "handler returned wrong status code")
 }
 
-func TestRouteNotFound(t *testing.T) {
-	router, _, _ := setupRouterAndMocks()
+func TestRunError(t *testing.T) {
+	log := initLog(t)
+	err := Run(log, 1234567, &mocks.RootControllerMock{}, &mocks.NodebControllerMock{}, &mocks.E2TControllerMock{})
+	assert.NotNil(t, err)
+}
 
-	req, err := http.NewRequest("GET", "/v1/no/such/route", nil)
+func TestRun(t *testing.T) {
+	log := initLog(t)
+	_, rootControllerMock, nodebControllerMock, e2tControllerMock := setupRouterAndMocks()
+	go Run(log, 11223, rootControllerMock, nodebControllerMock, e2tControllerMock)
+
+	time.Sleep(time.Millisecond * 100)
+	resp, err := http.Get("http://localhost:11223/v1/health")
 	if err != nil {
-		t.Fatal(err)
+		t.Fatalf("failed to perform GET to http://localhost:11223/v1/health")
 	}
-	rr := httptest.NewRecorder()
-	router.ServeHTTP(rr, req)
+	assert.Equal(t, 200, resp.StatusCode)
+}
 
-	assert.Equal(t, http.StatusNotFound, rr.Code, "handler returned wrong status code")
-}
\ No newline at end of file
+func initLog(t *testing.T) *logger.Logger {
+	log, err := logger.InitLogger(logger.InfoLevel)
+	if err != nil {
+		t.Errorf("#initLog test - failed to initialize logger, error: %s", err)
+	}
+	return log
+}