X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhttpserver%2Fhttp_server.go;h=1109f6ecdb6270fbf6bd60b80f95fd2f00ff6517;hb=0fb24ff00209041b316352327e2c73b699943131;hp=d6ade1e0c6d64dd056a4f29f4d8c61cf80542d1c;hpb=de19068aaa1f3d2b415cd960106121ceb167aaa9;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/httpserver/http_server.go b/E2Manager/httpserver/http_server.go
index d6ade1e..1109f6e 100644
--- a/E2Manager/httpserver/http_server.go
+++ b/E2Manager/httpserver/http_server.go
@@ -1,6 +1,7 @@
 //
 // Copyright 2019 AT&T Intellectual Property
 // Copyright 2019 Nokia
+// Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,41 +14,48 @@
 // 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/controllers"
+	"e2mgr/logger"
 	"fmt"
 	"github.com/gorilla/mux"
-	"log"
 	"net/http"
 )
 
-func Run(port int, controller controllers.IRootController, newController controllers.INodebController) {
+func Run(log *logger.Logger, port int, rootController controllers.IRootController, nodebController controllers.INodebController, e2tController controllers.IE2TController) error {
 
-	router := mux.NewRouter();
-	initializeRoutes(router, controller, newController)
+	router := mux.NewRouter()
+	initializeRoutes(router, rootController, nodebController, e2tController)
 
 	addr := fmt.Sprintf(":%d", port)
 
 	err := http.ListenAndServe(addr, router)
 
-	if err != nil {
-		log.Fatalf("#http_server.Run - Fail initiating HTTP server. Error: %v", err)
-	}
+	log.Errorf("#http_server.Run - Fail initiating HTTP server. Error: %v", err)
+	return err
 }
 
-func initializeRoutes(router *mux.Router, rootController controllers.IRootController, nodebController controllers.INodebController) {
+func initializeRoutes(router *mux.Router, rootController controllers.IRootController, nodebController controllers.INodebController, e2tController controllers.IE2TController) {
 	r := router.PathPrefix("/v1").Subrouter()
-	r.HandleFunc("/health", rootController.HandleHealthCheckRequest).Methods("GET")
+	r.HandleFunc("/health", rootController.HandleHealthCheckRequest).Methods(http.MethodGet)
 
 	rr := r.PathPrefix("/nodeb").Subrouter()
-	rr.HandleFunc("/ids", nodebController.GetNodebIdList).Methods("GET")
-	rr.HandleFunc("/{ranName}", nodebController.GetNodeb).Methods("GET")
-	rr.HandleFunc("/shutdown", nodebController.Shutdown).Methods("PUT")
-	rr.HandleFunc("/{ranName}/reset", nodebController.X2Reset).Methods("PUT")
-	rr.HandleFunc("/x2-setup", nodebController.X2Setup).Methods("POST")
-	rr.HandleFunc("/endc-setup", nodebController.EndcSetup).Methods("POST")
+	rr.HandleFunc("/states", nodebController.GetNodebIdList).Methods(http.MethodGet)
+	rr.HandleFunc("/states/{ranName}", nodebController.GetNodebId).Methods(http.MethodGet)
+	rr.HandleFunc("/{ranName}", nodebController.GetNodeb).Methods(http.MethodGet)
+	rr.HandleFunc("/enb", nodebController.AddEnb).Methods(http.MethodPost)
+	rr.HandleFunc("/enb/{ranName}", nodebController.DeleteEnb).Methods(http.MethodDelete)
+	rr.HandleFunc("/gnb/{ranName}", nodebController.UpdateGnb).Methods(http.MethodPut)
+	rr.HandleFunc("/enb/{ranName}", nodebController.UpdateEnb).Methods(http.MethodPut)
+	rr.HandleFunc("/shutdown", nodebController.Shutdown).Methods(http.MethodPut)
+	rr.HandleFunc("/parameters", nodebController.SetGeneralConfiguration).Methods(http.MethodPut)
+	rr.HandleFunc("/health", nodebController.HealthCheckRequest).Methods(http.MethodPut)
+	rrr := r.PathPrefix("/e2t").Subrouter()
+	rrr.HandleFunc("/list", e2tController.GetE2TInstances).Methods(http.MethodGet)
 }