From b11b37f11fa45ab149e8a88a183b70f077c0f48e Mon Sep 17 00:00:00 2001 From: Srivahni Chivukula Date: Fri, 14 Feb 2020 05:11:08 -0800 Subject: Add Composite Application API Implemented Composite application API and added create, get and delete handlers for the composite applications. Formatted Project related .go files Issue-ID: MULTICLOUD-994 Signed-off-by: Srivahni Chivukula Change-Id: I7cef1a2c75f8cb39f397dcbb3f5d7bb2a57b4a72 --- src/orchestrator/api/api.go | 20 ++++- src/orchestrator/api/composite_app_handler.go | 113 ++++++++++++++++++++++++++ src/orchestrator/api/projecthandler_test.go | 50 ++++++------ 3 files changed, 155 insertions(+), 28 deletions(-) create mode 100644 src/orchestrator/api/composite_app_handler.go (limited to 'src/orchestrator/api') diff --git a/src/orchestrator/api/api.go b/src/orchestrator/api/api.go index e37b158a..1cb4299e 100644 --- a/src/orchestrator/api/api.go +++ b/src/orchestrator/api/api.go @@ -1,5 +1,5 @@ /* -Copyright 2018 Intel Corporation. +Copyright 2020 Intel Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at @@ -10,6 +10,7 @@ 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. */ + package api import ( @@ -17,9 +18,11 @@ import ( "github.com/gorilla/mux" ) + var moduleClient *moduleLib.Client + // NewRouter creates a router that registers the various urls that are supported -func NewRouter(projectClient moduleLib.ProjectManager) *mux.Router { +func NewRouter(projectClient moduleLib.ProjectManager, compositeAppClient moduleLib.CompositeAppManager) *mux.Router { router := mux.NewRouter().PathPrefix("/v2").Subrouter() moduleClient = moduleLib.NewClient() @@ -33,5 +36,16 @@ func NewRouter(projectClient moduleLib.ProjectManager) *mux.Router { router.HandleFunc("/projects/{project-name}", projHandler.getHandler).Methods("GET") router.HandleFunc("/projects/{project-name}", projHandler.deleteHandler).Methods("DELETE") + if compositeAppClient == nil { + compositeAppClient = moduleClient.CompositeApp + } + compAppHandler := compositeAppHandler{ + client: compositeAppClient, + } + + router.HandleFunc("/projects/{project-name}/composite-apps", compAppHandler.createHandler).Methods("POST") + router.HandleFunc("/projects/{project-name}/composite-apps/{composite-app-name}/{version}", compAppHandler.getHandler).Methods("GET") + router.HandleFunc("/projects/{project-name}/composite-apps/{composite-app-name}/{version}", compAppHandler.deleteHandler).Methods("DELETE") + return router -} \ No newline at end of file +} diff --git a/src/orchestrator/api/composite_app_handler.go b/src/orchestrator/api/composite_app_handler.go new file mode 100644 index 00000000..42c72cdb --- /dev/null +++ b/src/orchestrator/api/composite_app_handler.go @@ -0,0 +1,113 @@ +/* + * Copyright 2020 Intel Corporation, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + */ + +package api + +import ( + "encoding/json" + "io" + "net/http" + + moduleLib "github.com/onap/multicloud-k8s/src/orchestrator/pkg/module" + + "github.com/gorilla/mux" +) + +// compositeAppHandler to store backend implementations objects +// Also simplifies mocking for unit testing purposes +type compositeAppHandler struct { + // Interface that implements CompositeApp operations + // We will set this variable with a mock interface for testing + client moduleLib.CompositeAppManager +} + +// createHandler handles creation of the CompositeApp entry in the database +// This is a multipart handler +func (h compositeAppHandler) createHandler(w http.ResponseWriter, r *http.Request) { + var c moduleLib.CompositeApp + + err := json.NewDecoder(r.Body).Decode(&c) + switch { + case err == io.EOF: + http.Error(w, "Empty body", http.StatusBadRequest) + return + case err != nil: + http.Error(w, err.Error(), http.StatusUnprocessableEntity) + return + } + + // Name is required. + if c.Metadata.Name == "" { + http.Error(w, "Missing name in POST request", http.StatusBadRequest) + return + } + + vars := mux.Vars(r) + projectName := vars["project-name"] + + ret, err := h.client.CreateCompositeApp(c, projectName) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(http.StatusCreated) + err = json.NewEncoder(w).Encode(ret) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } +} + +// getHandler handles GET operations on a particular CompositeApp Name +// Returns a compositeApp +func (h compositeAppHandler) getHandler(w http.ResponseWriter, r *http.Request) { + vars := mux.Vars(r) + name := vars["composite-app-name"] + version := vars["version"] + projectName := vars["project-name"] + + ret, err := h.client.GetCompositeApp(name, version, projectName) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(http.StatusOK) + err = json.NewEncoder(w).Encode(ret) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } +} + +// deleteHandler handles DELETE operations on a particular CompositeApp Name +func (h compositeAppHandler) deleteHandler(w http.ResponseWriter, r *http.Request) { + vars := mux.Vars(r) + name := vars["composite-app-name"] + version := vars["version"] + projectName := vars["project-name"] + + err := h.client.DeleteCompositeApp(name, version, projectName) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + w.WriteHeader(http.StatusNoContent) +} diff --git a/src/orchestrator/api/projecthandler_test.go b/src/orchestrator/api/projecthandler_test.go index ee6ed358..c76764b3 100644 --- a/src/orchestrator/api/projecthandler_test.go +++ b/src/orchestrator/api/projecthandler_test.go @@ -86,23 +86,23 @@ func TestProjectCreateHandler(t *testing.T) { }`)), expected: moduleLib.Project{ MetaData: moduleLib.ProjectMetaData{ - Name: "testProject", + Name: "testProject", Description: "Test Project used for unit testing", - UserData1: "data1", - UserData2: "data2", + UserData1: "data1", + UserData2: "data2", }, }, projectClient: &mockProjectManager{ //Items that will be returned by the mocked Client Items: []moduleLib.Project{ - moduleLib.Project{ - MetaData: moduleLib.ProjectMetaData{ - Name: "testProject", - Description: "Test Project used for unit testing", - UserData1: "data1", - UserData2: "data2", - }, - }, + moduleLib.Project{ + MetaData: moduleLib.ProjectMetaData{ + Name: "testProject", + Description: "Test Project used for unit testing", + UserData1: "data1", + UserData2: "data2", + }, + }, }, }, }, @@ -119,7 +119,7 @@ func TestProjectCreateHandler(t *testing.T) { for _, testCase := range testCases { t.Run(testCase.label, func(t *testing.T) { request := httptest.NewRequest("POST", "/v2/projects", testCase.reader) - resp := executeRequest(request, NewRouter(testCase.projectClient)) + resp := executeRequest(request, NewRouter(testCase.projectClient, nil)) //Check returned code if resp.StatusCode != testCase.expectedCode { @@ -154,23 +154,23 @@ func TestProjectGetHandler(t *testing.T) { expectedCode: http.StatusOK, expected: moduleLib.Project{ MetaData: moduleLib.ProjectMetaData{ - Name: "testProject", + Name: "testProject", Description: "Test Project used for unit testing", - UserData1: "data1", - UserData2: "data2", + UserData1: "data1", + UserData2: "data2", }, }, name: "testProject", projectClient: &mockProjectManager{ Items: []moduleLib.Project{ - moduleLib.Project{ - MetaData: moduleLib.ProjectMetaData{ - Name: "testProject", - Description: "Test Project used for unit testing", - UserData1: "data1", - UserData2: "data2", - }, - }, + moduleLib.Project{ + MetaData: moduleLib.ProjectMetaData{ + Name: "testProject", + Description: "Test Project used for unit testing", + UserData1: "data1", + UserData2: "data2", + }, + }, }, }, }, @@ -188,7 +188,7 @@ func TestProjectGetHandler(t *testing.T) { for _, testCase := range testCases { t.Run(testCase.label, func(t *testing.T) { request := httptest.NewRequest("GET", "/v2/projects/"+testCase.name, nil) - resp := executeRequest(request, NewRouter(testCase.projectClient)) + resp := executeRequest(request, NewRouter(testCase.projectClient, nil)) //Check returned code if resp.StatusCode != testCase.expectedCode { @@ -237,7 +237,7 @@ func TestProjectDeleteHandler(t *testing.T) { for _, testCase := range testCases { t.Run(testCase.label, func(t *testing.T) { request := httptest.NewRequest("DELETE", "/v2/projects/"+testCase.name, nil) - resp := executeRequest(request, NewRouter(testCase.projectClient)) + resp := executeRequest(request, NewRouter(testCase.projectClient, nil)) //Check returned code if resp.StatusCode != testCase.expectedCode { -- cgit 1.2.3-korg