Add R5 content to master

[ric-plt/e2mgr.git] / E2Manager / httpserver / http_server.go

diff --git a/E2Manager/httpserver/http_server.go b/E2Manager/httpserver/http_server.go
index 1c087bd..320acd0 100644 (file)
--- a/E2Manager/httpserver/http_server.go
+++ b/E2Manager/httpserver/http_server.go
@@ -17,40 +17,39 @@
 //  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)
+       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("/ids", nodebController.GetNodebIdList).Methods(http.MethodGet)
+       rr.HandleFunc("/{ranName}", nodebController.GetNodeb).Methods(http.MethodGet)
+       rr.HandleFunc("/{ranName}/update", nodebController.UpdateGnb).Methods(http.MethodPut)
+       rr.HandleFunc("/shutdown", nodebController.Shutdown).Methods(http.MethodPut)
+       rr.HandleFunc("/parameters", nodebController.SetGeneralConfiguration).Methods(http.MethodPut)
+       rrr := r.PathPrefix("/e2t").Subrouter()
+       rrr.HandleFunc("/list", e2tController.GetE2TInstances).Methods(http.MethodGet)
 }