Implemented AppIntents and GenPlaceIntents

Implemented the routes for creating,
getting, and deleting generic placement intents
and App intents.

Issue-ID: MULTICLOUD-875
Signed-off-by: Rajamohan Raj <rajamohan.raj@intel.com>
Change-Id: Iecb11c442958a43a517772e066de45213e3d7030

6 files changed, 341 insertions, 39 deletions

diff --git a/src/orchestrator/api/api.go b/src/orchestrator/api/api.go
index 5e05b31b..f4381e6c 100644
--- a/src/orchestrator/api/api.go
+++ b/src/orchestrator/api/api.go
@@ -1,33 +1,43 @@
 /*
-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
-    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.
-*/
-
+ * 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 (
-	moduleLib "github.com/onap/multicloud-k8s/src/orchestrator/pkg/module"
-
 	"github.com/gorilla/mux"
+	moduleLib "github.com/onap/multicloud-k8s/src/orchestrator/pkg/module"
 )
 
 var moduleClient *moduleLib.Client
 
 // NewRouter creates a router that registers the various urls that are supported
-func NewRouter(projectClient moduleLib.ProjectManager, compositeAppClient moduleLib.CompositeAppManager, ControllerClient moduleLib.ControllerManager, clusterClient moduleLib.ClusterManager) *mux.Router {
+func NewRouter(projectClient moduleLib.ProjectManager,
+	compositeAppClient moduleLib.CompositeAppManager,
+	ControllerClient moduleLib.ControllerManager,
+	clusterClient moduleLib.ClusterManager,
+	genericPlacementIntentClient moduleLib.GenericPlacementIntentManager,
+	appIntentClient moduleLib.AppIntentManager) *mux.Router {
 
 	router := mux.NewRouter().PathPrefix("/v2").Subrouter()
+
 	moduleClient = moduleLib.NewClient()
+
+	//setting routes for project
 	if projectClient == nil {
 		projectClient = moduleClient.Project
+
 	}
 	projHandler := projectHandler{
 		client: projectClient,
@@ -48,13 +58,13 @@ func NewRouter(projectClient moduleLib.ProjectManager, compositeAppClient module
 	router.HandleFunc("/projects/{project-name}", projHandler.getHandler).Methods("GET")
 	router.HandleFunc("/projects/{project-name}", projHandler.deleteHandler).Methods("DELETE")
 
+	//setting routes for compositeApp
 	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")
@@ -79,6 +89,30 @@ func NewRouter(projectClient moduleLib.ProjectManager, compositeAppClient module
 	router.HandleFunc("/cluster-providers/{provider-name}/clusters/{cluster-name}/kv-pairs", clusterHandler.getClusterKvPairsHandler).Methods("GET")
 	router.HandleFunc("/cluster-providers/{provider-name}/clusters/{cluster-name}/kv-pairs/{kvpair}", clusterHandler.getClusterKvPairsHandler).Methods("GET")
 	router.HandleFunc("/cluster-providers/{provider-name}/clusters/{cluster-name}/kv-pairs/{kvpair}", clusterHandler.deleteClusterKvPairsHandler).Methods("DELETE")
+	//setting routes for genericPlacementIntent
+	if genericPlacementIntentClient == nil {
+		genericPlacementIntentClient = moduleClient.GenericPlacementIntent
+	}
+
+	genericPlacementIntentHandler := genericPlacementIntentHandler{
+		client: genericPlacementIntentClient,
+	}
+	router.HandleFunc("/projects/{project-name}/composite-apps/{composite-app-name}/{composite-app-version}/generic-placement-intents", genericPlacementIntentHandler.createGenericPlacementIntentHandler).Methods("POST")
+	router.HandleFunc("/projects/{project-name}/composite-apps/{composite-app-name}/{composite-app-version}/generic-placement-intents/{intent-name}", genericPlacementIntentHandler.getGenericPlacementHandler).Methods("GET")
+	router.HandleFunc("/projects/{project-name}/composite-apps/{composite-app-name}/{composite-app-version}/generic-placement-intents/{intent-name}", genericPlacementIntentHandler.deleteGenericPlacementHandler).Methods("DELETE")
+
+	//setting routes for AppIntent
+	if appIntentClient == nil {
+		appIntentClient = moduleClient.AppIntent
+	}
+
+	appIntentHandler := appIntentHandler{
+		client: appIntentClient,
+	}
+
+	router.HandleFunc("/projects/{project-name}/composite-apps/{composite-app-name}/{composite-app-version}/generic-placement-intents/{intent-name}/app-intents", appIntentHandler.createAppIntentHandler).Methods("POST")
+	router.HandleFunc("/projects/{project-name}/composite-apps/{composite-app-name}/{composite-app-version}/generic-placement-intents/{intent-name}/app-intents/{app-intent-name}", appIntentHandler.getAppIntentHandler).Methods("GET")
+	router.HandleFunc("/projects/{project-name}/composite-apps/{composite-app-name}/{composite-app-version}/generic-placement-intents/{intent-name}/app-intents/{app-intent-name}", appIntentHandler.deleteAppIntentHandler).Methods("DELETE")
 
 	return router
 }
diff --git a/src/orchestrator/api/app_intent_handler.go b/src/orchestrator/api/app_intent_handler.go
new file mode 100644
index 00000000..ab510c8e
--- /dev/null
+++ b/src/orchestrator/api/app_intent_handler.go
@@ -0,0 +1,138 @@
+/*
+ * 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"
+	"github.com/gorilla/mux"
+	moduleLib "github.com/onap/multicloud-k8s/src/orchestrator/pkg/module"
+	"io"
+	"net/http"
+)
+
+/* Used to store backend implementation objects
+Also simplifies mocking for unit testing purposes
+*/
+type appIntentHandler struct {
+	client moduleLib.AppIntentManager
+}
+
+// createAppIntentHandler handles the create operation of intent
+func (h appIntentHandler) createAppIntentHandler(w http.ResponseWriter, r *http.Request) {
+
+	var a moduleLib.AppIntent
+
+	err := json.NewDecoder(r.Body).Decode(&a)
+	switch {
+	case err == io.EOF:
+		http.Error(w, "Empty body", http.StatusBadRequest)
+		return
+	case err != nil:
+		http.Error(w, err.Error(), http.StatusUnprocessableEntity)
+		return
+	}
+
+	if a.MetaData.Name == "" {
+		http.Error(w, "Missing AppIntentName in POST request", http.StatusBadRequest)
+		return
+	}
+
+	vars := mux.Vars(r)
+	projectName := vars["project-name"]
+	compositeAppName := vars["composite-app-name"]
+	version := vars["composite-app-version"]
+	intent := vars["intent-name"]
+
+	appIntent, createErr := h.client.CreateAppIntent(a, projectName, compositeAppName, version, intent)
+	if createErr != nil {
+		http.Error(w, createErr.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(http.StatusCreated)
+	err = json.NewEncoder(w).Encode(appIntent)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+}
+
+func (h appIntentHandler) getAppIntentHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+
+	p := vars["project-name"]
+	if p == "" {
+		http.Error(w, "Missing projectName in GET request", http.StatusBadRequest)
+		return
+	}
+	ca := vars["composite-app-name"]
+	if ca == "" {
+		http.Error(w, "Missing compositeAppName in GET request", http.StatusBadRequest)
+		return
+	}
+
+	v := vars["composite-app-version"]
+	if v == "" {
+		http.Error(w, "Missing version of compositeApp in GET request", http.StatusBadRequest)
+		return
+	}
+
+	i := vars["intent-name"]
+	if i == "" {
+		http.Error(w, "Missing genericPlacementIntentName in GET request", http.StatusBadRequest)
+		return
+	}
+
+	ai := vars["app-intent-name"]
+	if ai == "" {
+		http.Error(w, "Missing appIntentName in GET request", http.StatusBadRequest)
+		return
+	}
+
+	appIntent, err := h.client.GetAppIntent(ai, p, ca, v, i)
+	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(appIntent)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+}
+
+func (h appIntentHandler) deleteAppIntentHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+
+	p := vars["project-name"]
+	ca := vars["composite-app-name"]
+	v := vars["composite-app-version"]
+	i := vars["intent-name"]
+	ai := vars["app-intent-name"]
+
+	err := h.client.DeleteAppIntent(ai, p, ca, v, i)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	w.WriteHeader(http.StatusNoContent)
+}
diff --git a/src/orchestrator/api/clusterhandler_test.go b/src/orchestrator/api/clusterhandler_test.go
index db1b6f9f..ad7635e2 100644
--- a/src/orchestrator/api/clusterhandler_test.go
+++ b/src/orchestrator/api/clusterhandler_test.go
@@ -229,7 +229,7 @@ func TestClusterProviderCreateHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
 			request := httptest.NewRequest("POST", "/v2/cluster-providers", testCase.reader)
-			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient))
+			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -307,7 +307,7 @@ func TestClusterProviderGetAllHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
 			request := httptest.NewRequest("GET", "/v2/cluster-providers", nil)
-			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient))
+			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -377,7 +377,7 @@ func TestClusterProviderGetHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
 			request := httptest.NewRequest("GET", "/v2/cluster-providers/"+testCase.name, nil)
-			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient))
+			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -426,7 +426,7 @@ func TestClusterProviderDeleteHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
 			request := httptest.NewRequest("DELETE", "/v2/cluster-providers/"+testCase.name, nil)
-			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient))
+			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -538,7 +538,7 @@ of clusterTest
 
 			request := httptest.NewRequest("POST", "/v2/cluster-providers/clusterProvider1/clusters", bytes.NewBuffer(body.Bytes()))
 			request.Header.Set("Content-Type", multiwr.FormDataContentType())
-			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient))
+			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -625,7 +625,7 @@ func TestClusterGetAllHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
 			request := httptest.NewRequest("GET", "/v2/cluster-providers/clusterProvder1/clusters", nil)
-			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient))
+			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -706,7 +706,7 @@ func TestClusterGetHandler(t *testing.T) {
 			if len(testCase.accept) > 0 {
 				request.Header.Set("Accept", testCase.accept)
 			}
-			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient))
+			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -784,7 +784,7 @@ of clusterTest
 			if len(testCase.accept) > 0 {
 				request.Header.Set("Accept", testCase.accept)
 			}
-			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient))
+			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -834,7 +834,7 @@ func TestClusterDeleteHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
 			request := httptest.NewRequest("DELETE", "/v2/cluster-providers/clusterProvider1/clusters/"+testCase.name, nil)
-			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient))
+			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -880,7 +880,7 @@ func TestClusterLabelCreateHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
 			request := httptest.NewRequest("POST", "/v2/cluster-providers/cp1/clusters/cl1/labels", testCase.reader)
-			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient))
+			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -944,7 +944,7 @@ func TestClusterLabelsGetHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
 			request := httptest.NewRequest("GET", "/v2/cluster-providers/cp1/clusters/cl1/labels", nil)
-			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient))
+			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -1004,7 +1004,7 @@ func TestClusterLabelGetHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
 			request := httptest.NewRequest("GET", "/v2/cluster-providers/clusterProvider1/clusters/cl1/labels/"+testCase.name, nil)
-			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient))
+			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -1053,7 +1053,7 @@ func TestClusterLabelDeleteHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
 			request := httptest.NewRequest("DELETE", "/v2/cluster-providers/cp1/clusters/cl1/labels/"+testCase.name, nil)
-			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient))
+			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -1144,7 +1144,7 @@ func TestClusterKvPairsCreateHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
 			request := httptest.NewRequest("POST", "/v2/cluster-providers/cp1/clusters/cl1/kv-pairs", testCase.reader)
-			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient))
+			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -1262,7 +1262,7 @@ func TestClusterKvPairsGetAllHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
 			request := httptest.NewRequest("GET", "/v2/cluster-providers/cp1/clusters/cl1/kv-pairs", nil)
-			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient))
+			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -1352,7 +1352,7 @@ func TestClusterKvPairsGetHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
 			request := httptest.NewRequest("GET", "/v2/cluster-providers/clusterProvider1/clusters/cl1/kv-pairs/"+testCase.name, nil)
-			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient))
+			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -1401,7 +1401,7 @@ func TestClusterKvPairsDeleteHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
 			request := httptest.NewRequest("DELETE", "/v2/cluster-providers/cp1/clusters/cl1/kv-pairs/"+testCase.name, nil)
-			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient))
+			resp := executeRequest(request, NewRouter(nil, nil, nil, testCase.clusterClient, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
diff --git a/src/orchestrator/api/controllerhandler_test.go b/src/orchestrator/api/controllerhandler_test.go
index c91943ad..bcc06f98 100644
--- a/src/orchestrator/api/controllerhandler_test.go
+++ b/src/orchestrator/api/controllerhandler_test.go
@@ -110,7 +110,7 @@ func TestControllerCreateHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
 			request := httptest.NewRequest("POST", "/v2/controllers", testCase.reader)
-			resp := executeRequest(request, NewRouter(nil, nil, testCase.controllerClient, nil))
+			resp := executeRequest(request, NewRouter(nil, nil, testCase.controllerClient, nil, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -173,7 +173,7 @@ func TestControllerGetHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
 			request := httptest.NewRequest("GET", "/v2/controllers/"+testCase.name, nil)
-			resp := executeRequest(request, NewRouter(nil, nil, testCase.controllerClient, nil))
+			resp := executeRequest(request, NewRouter(nil, nil, testCase.controllerClient, nil, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -222,7 +222,7 @@ func TestControllerDeleteHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.label, func(t *testing.T) {
 			request := httptest.NewRequest("DELETE", "/v2/controllers/"+testCase.name, nil)
-			resp := executeRequest(request, NewRouter(nil, nil, testCase.controllerClient, nil))
+			resp := executeRequest(request, NewRouter(nil, nil, testCase.controllerClient, nil, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
diff --git a/src/orchestrator/api/generic_placement_intent_handler.go b/src/orchestrator/api/generic_placement_intent_handler.go
new file mode 100644
index 00000000..e186735c
--- /dev/null
+++ b/src/orchestrator/api/generic_placement_intent_handler.go
@@ -0,0 +1,130 @@
+/*
+ * 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"
+)
+
+/* Used to store backend implementation objects
+Also simplifies mocking for unit testing purposes
+*/
+type genericPlacementIntentHandler struct {
+	client moduleLib.GenericPlacementIntentManager
+}
+
+// createGenericPlacementIntentHandler handles the create operation of intent
+func (h genericPlacementIntentHandler) createGenericPlacementIntentHandler(w http.ResponseWriter, r *http.Request) {
+
+	var g moduleLib.GenericPlacementIntent
+
+	err := json.NewDecoder(r.Body).Decode(&g)
+	switch {
+	case err == io.EOF:
+		http.Error(w, "Empty body", http.StatusBadRequest)
+		return
+	case err != nil:
+		http.Error(w, err.Error(), http.StatusUnprocessableEntity)
+		return
+	}
+
+	if g.MetaData.Name == "" {
+		http.Error(w, "Missing genericPlacementIntentName in POST request", http.StatusBadRequest)
+		return
+	}
+
+	vars := mux.Vars(r)
+	projectName := vars["project-name"]
+	compositeAppName := vars["composite-app-name"]
+	version := vars["composite-app-version"]
+
+	gPIntent, createErr := h.client.CreateGenericPlacementIntent(g, projectName, compositeAppName, version)
+	if createErr != nil {
+		http.Error(w, createErr.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(http.StatusCreated)
+	err = json.NewEncoder(w).Encode(gPIntent)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+}
+
+// getGenericPlacementHandler handles the GET operations on intent
+func (h genericPlacementIntentHandler) getGenericPlacementHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	intentName := vars["intent-name"]
+	if intentName == "" {
+		http.Error(w, "Missing genericPlacementIntentName in GET request", http.StatusBadRequest)
+		return
+	}
+	projectName := vars["project-name"]
+	if projectName == "" {
+		http.Error(w, "Missing projectName in GET request", http.StatusBadRequest)
+		return
+	}
+	compositeAppName := vars["composite-app-name"]
+	if compositeAppName == "" {
+		http.Error(w, "Missing compositeAppName in GET request", http.StatusBadRequest)
+		return
+	}
+
+	version := vars["composite-app-version"]
+	if version == "" {
+		http.Error(w, "Missing version in GET request", http.StatusBadRequest)
+		return
+	}
+
+	gPIntent, err := h.client.GetGenericPlacementIntent(intentName, projectName, compositeAppName, version)
+	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(gPIntent)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+}
+
+// deleteGenericPlacementHandler handles the delete operations on intent
+func (h genericPlacementIntentHandler) deleteGenericPlacementHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	i := vars["intent-name"]
+	p := vars["project-name"]
+	ca := vars["composite-app-name"]
+	v := vars["composite-app-version"]
+
+	err := h.client.DeleteGenericPlacementIntent(i, p, ca, v)
+	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 c6da4e05..84e67521 100644
--- a/src/orchestrator/api/projecthandler_test.go
+++ b/src/orchestrator/api/projecthandler_test.go
@@ -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, nil, nil, nil))
+			resp := executeRequest(request, NewRouter(testCase.projectClient, nil, nil, nil, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {
@@ -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, nil, nil, nil))
+			resp := executeRequest(request, NewRouter(testCase.projectClient, nil, nil, nil, nil, 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, nil, nil, nil))
+			resp := executeRequest(request, NewRouter(testCase.projectClient, nil, nil, nil, nil, nil))
 
 			//Check returned code
 			if resp.StatusCode != testCase.expectedCode {