X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=dmaap-mediator-producer%2Finternal%2Fserver%2Fserver.go;h=79646c29a30de120bda47d265b6f076365dde6e2;hb=46a0fd717e5f49ebae6cb2c4fbcf54f0e329dc86;hp=c3a1331cabc1f779495ae1971d9f29d335ae5090;hpb=f0e49a07dad877f94f635dda4ab477b9636536c8;p=nonrtric.git

diff --git a/dmaap-mediator-producer/internal/server/server.go b/dmaap-mediator-producer/internal/server/server.go
index c3a1331c..79646c29 100644
--- a/dmaap-mediator-producer/internal/server/server.go
+++ b/dmaap-mediator-producer/internal/server/server.go
@@ -26,34 +26,41 @@ import (
 	"io/ioutil"
 	"net/http"
 
+	"github.com/gorilla/mux"
 	"oransc.org/nonrtric/dmaapmediatorproducer/internal/jobs"
 )
 
-func StatusHandler(w http.ResponseWriter, r *http.Request) {
-	if r.URL.Path != "/" {
-		http.Error(w, "404 not found.", http.StatusNotFound)
-		return
-	}
-
-	if r.Method != "GET" {
-		http.Error(w, "Method is not supported.", http.StatusMethodNotAllowed)
-		return
-	}
+const StatusPath = "/status"
+const AddJobPath = "/jobs"
+const jobIdToken = "infoJobId"
+const deleteJobPath = AddJobPath + "/{" + jobIdToken + "}"
 
-	fmt.Fprintf(w, "All is well!")
+type ProducerCallbackHandler struct {
+	jobsManager jobs.JobsManager
 }
 
-func CreateInfoJobHandler(w http.ResponseWriter, r *http.Request) {
-	if r.URL.Path != "/producer_simulator/info_job" {
-		http.Error(w, "404 not found.", http.StatusNotFound)
-		return
+func NewProducerCallbackHandler(jm jobs.JobsManager) *ProducerCallbackHandler {
+	return &ProducerCallbackHandler{
+		jobsManager: jm,
 	}
+}
 
-	if r.Method != "POST" {
-		http.Error(w, "Method is not supported.", http.StatusMethodNotAllowed)
-		return
-	}
+func NewRouter(jm jobs.JobsManager) *mux.Router {
+	callbackHandler := NewProducerCallbackHandler(jm)
+	r := mux.NewRouter()
+	r.HandleFunc(StatusPath, statusHandler).Methods(http.MethodGet).Name("status")
+	r.HandleFunc(AddJobPath, callbackHandler.addInfoJobHandler).Methods(http.MethodPost).Name("add")
+	r.HandleFunc(deleteJobPath, callbackHandler.deleteInfoJobHandler).Methods(http.MethodDelete).Name("delete")
+	r.NotFoundHandler = &notFoundHandler{}
+	r.MethodNotAllowedHandler = &methodNotAllowedHandler{}
+	return r
+}
 
+func statusHandler(w http.ResponseWriter, r *http.Request) {
+	// Just respond OK to show the server is alive for now. Might be extended later.
+}
+
+func (h *ProducerCallbackHandler) addInfoJobHandler(w http.ResponseWriter, r *http.Request) {
 	b, readErr := ioutil.ReadAll(r.Body)
 	if readErr != nil {
 		http.Error(w, fmt.Sprintf("Unable to read body due to: %v", readErr), http.StatusBadRequest)
@@ -64,18 +71,30 @@ func CreateInfoJobHandler(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, fmt.Sprintf("Invalid json body. Cause: %v", unmarshalErr), http.StatusBadRequest)
 		return
 	}
-	if err := jobs.AddJob(jobInfo); err != nil {
+	if err := h.jobsManager.AddJobFromRESTCall(jobInfo); err != nil {
 		http.Error(w, fmt.Sprintf("Invalid job info. Cause: %v", err), http.StatusBadRequest)
 	}
 }
 
-func CreateServer(port int, handlerFunc func(http.ResponseWriter, *http.Request)) *http.Server {
-
-	mux := http.NewServeMux()
-	mux.HandleFunc("/", handlerFunc)
-	server := http.Server{
-		Addr:    fmt.Sprintf(":%v", port), // :{port}
-		Handler: mux,
+func (h *ProducerCallbackHandler) deleteInfoJobHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	id, ok := vars[jobIdToken]
+	if !ok {
+		http.Error(w, "Must provide infoJobId.", http.StatusBadRequest)
+		return
 	}
-	return &server
+
+	h.jobsManager.DeleteJobFromRESTCall(id)
+}
+
+type notFoundHandler struct{}
+
+func (h *notFoundHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	http.Error(w, "404 not found.", http.StatusNotFound)
+}
+
+type methodNotAllowedHandler struct{}
+
+func (h *methodNotAllowedHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	http.Error(w, "Method is not supported.", http.StatusMethodNotAllowed)
 }