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=608110f5ab7946977b15ec9e0be80dd68e23d4ea;hpb=372a275602ae05da22130a4601709291c7fbbaa6;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/httpserver/http_server.go b/E2Manager/httpserver/http_server.go
index 608110f..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.
@@ -17,7 +18,6 @@
 //  This source code is part of the near-RT RIC (RAN Intelligent Controller)
 //  platform project (RICP).
 
-
 package httpserver
 
 import (
@@ -30,7 +30,7 @@ import (
 
 func Run(log *logger.Logger, port int, rootController controllers.IRootController, nodebController controllers.INodebController, e2tController controllers.IE2TController) error {
 
-	router := mux.NewRouter();
+	router := mux.NewRouter()
 	initializeRoutes(router, rootController, nodebController, e2tController)
 
 	addr := fmt.Sprintf(":%d", port)
@@ -43,16 +43,19 @@ func Run(log *logger.Logger, port int, rootController controllers.IRootControlle
 
 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("GET")
+	rrr.HandleFunc("/list", e2tController.GetE2TInstances).Methods(http.MethodGet)
 }