X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhttpserver%2Fhttp_server.go;h=608110f5ab7946977b15ec9e0be80dd68e23d4ea;hb=a5f90ced0f8e4e9aeb89de647ca78089a91c1995;hp=1c087bd160fff92321ce00e3055248f5f1b7b90a;hpb=15d3982b5eda43a5b5b9054d7ecb026448c6ca16;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/httpserver/http_server.go b/E2Manager/httpserver/http_server.go index 1c087bd..608110f 100644 --- a/E2Manager/httpserver/http_server.go +++ b/E2Manager/httpserver/http_server.go @@ -22,27 +22,26 @@ 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") @@ -53,4 +52,7 @@ func initializeRoutes(router *mux.Router, rootController controllers.IRootContro rr.HandleFunc("/{ranName}/reset", nodebController.X2Reset).Methods("PUT") rr.HandleFunc("/x2-setup", nodebController.X2Setup).Methods("POST") rr.HandleFunc("/endc-setup", nodebController.EndcSetup).Methods("POST") + + rrr := r.PathPrefix("/e2t").Subrouter() + rrr.HandleFunc("/list", e2tController.GetE2TInstances).Methods("GET") }