6 files changed, 988 insertions, 755 deletions

diff --git a/src/dcm/api/api.go b/src/dcm/api/api.go
index 87ad77b5..10856ba2 100644
--- a/src/dcm/api/api.go
+++ b/src/dcm/api/api.go
@@ -14,143 +14,147 @@ limitations under the License.
 package api
 
 import (
+	"github.com/onap/multicloud-k8s/src/dcm/pkg/module"
 
-    "github.com/onap/multicloud-k8s/src/dcm/pkg/module"
-
-    "github.com/gorilla/mux"
+	"github.com/gorilla/mux"
 )
 
 // NewRouter creates a router that registers the various urls that are
 // supported
-
 func NewRouter(
-    logicalCloudClient module.LogicalCloudManager,
-    clusterClient module.ClusterManager,
-    userPermissionClient module.UserPermissionManager,
-    quotaClient module.QuotaManager,
-    keyValueClient module.KeyValueManager) *mux.Router {
+	logicalCloudClient module.LogicalCloudManager,
+	clusterClient module.ClusterManager,
+	userPermissionClient module.UserPermissionManager,
+	quotaClient module.QuotaManager,
+	keyValueClient module.KeyValueManager) *mux.Router {
 
-    router := mux.NewRouter()
+	router := mux.NewRouter()
 
-    // Set up Logical Cloud handler routes
-    if logicalCloudClient == nil {
-        logicalCloudClient = module.NewLogicalCloudClient()
-    }
+	// Set up Logical Cloud handler routes
+	if logicalCloudClient == nil {
+		logicalCloudClient = module.NewLogicalCloudClient()
+	}
 
-    if clusterClient == nil {
-        clusterClient = module.NewClusterClient()
-    }
+	if clusterClient == nil {
+		clusterClient = module.NewClusterClient()
+	}
 
-    if quotaClient == nil {
-        quotaClient = module.NewQuotaClient()
-    }
+	if quotaClient == nil {
+		quotaClient = module.NewQuotaClient()
+	}
 
-    logicalCloudHandler := logicalCloudHandler{client: logicalCloudClient,
-        clusterClient: clusterClient,
-        quotaClient: quotaClient,
-    }
-    lcRouter := router.PathPrefix("/v2/projects/{project-name}").Subrouter()
-    lcRouter.HandleFunc(
-        "/logical-clouds",
-        logicalCloudHandler.createHandler).Methods("POST")
-    lcRouter.HandleFunc(
-        "/logical-clouds",
-        logicalCloudHandler.getHandler).Methods("GET")
-    lcRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}",
-        logicalCloudHandler.getHandler).Methods("GET")
-    lcRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}",
-        logicalCloudHandler.deleteHandler).Methods("DELETE")
-    lcRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}",
-        logicalCloudHandler.updateHandler).Methods("PUT")
-    lcRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}/apply",
-        logicalCloudHandler.applyHandler).Methods("POST")
-    // To Do
-    // get kubeconfig
-    /*lcRouter.HandleFunc(
-         "/logical-clouds/{name}/kubeconfig?cluster-reference={cluster}",
-         logicalCloudHandler.getConfigHandler).Methods("GET")
-    //get status
-    lcRouter.HandleFunc(
-        "/logical-clouds/{name}/cluster-references/",
-        logicalCloudHandler.associateHandler).Methods("GET")*/
+	// Set up Logical Cloud API
+	logicalCloudHandler := logicalCloudHandler{client: logicalCloudClient,
+		clusterClient: clusterClient,
+		quotaClient:   quotaClient,
+	}
+	lcRouter := router.PathPrefix("/v2/projects/{project-name}").Subrouter()
+	lcRouter.HandleFunc(
+		"/logical-clouds",
+		logicalCloudHandler.createHandler).Methods("POST")
+	lcRouter.HandleFunc(
+		"/logical-clouds",
+		logicalCloudHandler.getAllHandler).Methods("GET")
+	lcRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}",
+		logicalCloudHandler.getHandler).Methods("GET")
+	lcRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}",
+		logicalCloudHandler.deleteHandler).Methods("DELETE")
+	lcRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}",
+		logicalCloudHandler.updateHandler).Methods("PUT")
+	lcRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/apply",
+		logicalCloudHandler.applyHandler).Methods("POST")
+	lcRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/terminate",
+		logicalCloudHandler.terminateHandler).Methods("POST")
 
-    // Set up Cluster API
-    
-    clusterHandler := clusterHandler{client: clusterClient}
-    clusterRouter := router.PathPrefix("/v2/projects/{project-name}").Subrouter()
-    clusterRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}/cluster-references",
-        clusterHandler.createHandler).Methods("POST")
-    clusterRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}/cluster-references",
-        clusterHandler.getHandler).Methods("GET")
-    clusterRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}/cluster-references/{cluster-reference}",
-        clusterHandler.getHandler).Methods("GET")
-    clusterRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}/cluster-references/{cluster-reference}",
-        clusterHandler.updateHandler).Methods("PUT")
-    clusterRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}/cluster-references/{cluster-reference}",
-        clusterHandler.deleteHandler).Methods("DELETE")
+	// Set up Cluster API
+	clusterHandler := clusterHandler{client: clusterClient}
+	clusterRouter := router.PathPrefix("/v2/projects/{project-name}").Subrouter()
+	clusterRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/cluster-references",
+		clusterHandler.createHandler).Methods("POST")
+	clusterRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/cluster-references",
+		clusterHandler.getAllHandler).Methods("GET")
+	clusterRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/cluster-references/{cluster-reference}",
+		clusterHandler.getHandler).Methods("GET")
+	clusterRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/cluster-references/{cluster-reference}",
+		clusterHandler.updateHandler).Methods("PUT")
+	clusterRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/cluster-references/{cluster-reference}",
+		clusterHandler.deleteHandler).Methods("DELETE")
+	// Get kubeconfig for cluster of logical cloud
+	clusterRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/cluster-references/{cluster-reference}/kubeconfig",
+		clusterHandler.getConfigHandler).Methods("GET")
 
-    // Set up User Permission API
-    if userPermissionClient == nil {
-        userPermissionClient = module.NewUserPermissionClient()
-    }
-    userPermissionHandler := userPermissionHandler{client: userPermissionClient}
-    upRouter := router.PathPrefix("/v2/projects/{project-name}").Subrouter()
-    upRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}/user-permissions",
-        userPermissionHandler.createHandler).Methods("POST")
-    upRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}/user-permissions/{permission-name}",
-        userPermissionHandler.getHandler).Methods("GET")
-    upRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}/user-permissions/{permission-name}",
-        userPermissionHandler.updateHandler).Methods("PUT")
-    upRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}/user-permissions/{permission-name}",
-        userPermissionHandler.deleteHandler).Methods("DELETE")
+	// Set up User Permission API
+	if userPermissionClient == nil {
+		userPermissionClient = module.NewUserPermissionClient()
+	}
+	userPermissionHandler := userPermissionHandler{client: userPermissionClient}
+	upRouter := router.PathPrefix("/v2/projects/{project-name}").Subrouter()
+	upRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/user-permissions",
+		userPermissionHandler.createHandler).Methods("POST")
+	upRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/user-permissions",
+		userPermissionHandler.getAllHandler).Methods("GET")
+	upRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/user-permissions/{permission-name}",
+		userPermissionHandler.getHandler).Methods("GET")
+	upRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/user-permissions/{permission-name}",
+		userPermissionHandler.updateHandler).Methods("PUT")
+	upRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/user-permissions/{permission-name}",
+		userPermissionHandler.deleteHandler).Methods("DELETE")
 
-    // Set up Quota API
-    
-    quotaHandler := quotaHandler{client: quotaClient}
-    quotaRouter := router.PathPrefix("/v2/projects/{project-name}").Subrouter()
-    quotaRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}/cluster-quotas",
-        quotaHandler.createHandler).Methods("POST")
-    quotaRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}/cluster-quotas/{quota-name}",
-        quotaHandler.getHandler).Methods("GET")
-    quotaRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}/cluster-quotas/{quota-name}",
-        quotaHandler.updateHandler).Methods("PUT")
-    quotaRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}/cluster-quotas/{quota-name}",
-        quotaHandler.deleteHandler).Methods("DELETE")
+	// Set up Quota API
+	quotaHandler := quotaHandler{client: quotaClient}
+	quotaRouter := router.PathPrefix("/v2/projects/{project-name}").Subrouter()
+	quotaRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/cluster-quotas",
+		quotaHandler.createHandler).Methods("POST")
+	quotaRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/cluster-quotas",
+		quotaHandler.getAllHandler).Methods("GET")
+	quotaRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/cluster-quotas/{quota-name}",
+		quotaHandler.getHandler).Methods("GET")
+	quotaRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/cluster-quotas/{quota-name}",
+		quotaHandler.updateHandler).Methods("PUT")
+	quotaRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/cluster-quotas/{quota-name}",
+		quotaHandler.deleteHandler).Methods("DELETE")
 
-    // Set up Key Value API
-    if keyValueClient == nil {
-        keyValueClient = module.NewKeyValueClient()
-    }
-    keyValueHandler := keyValueHandler{client: keyValueClient}
-    kvRouter := router.PathPrefix("/v2/projects/{project-name}").Subrouter()
-    kvRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}/kv-pairs",
-        keyValueHandler.createHandler).Methods("POST")
-    kvRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}/kv-pairs/{kv-pair-name}",
-        keyValueHandler.getHandler).Methods("GET")
-    kvRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}/kv-pairs/{kv-pair-name}",
-        keyValueHandler.updateHandler).Methods("PUT")
-    kvRouter.HandleFunc(
-        "/logical-clouds/{logical-cloud-name}/kv-pairs/{kv-pair-name}",
-        keyValueHandler.deleteHandler).Methods("DELETE")
-        return router
+	// Set up Key Value API
+	if keyValueClient == nil {
+		keyValueClient = module.NewKeyValueClient()
+	}
+	keyValueHandler := keyValueHandler{client: keyValueClient}
+	kvRouter := router.PathPrefix("/v2/projects/{project-name}").Subrouter()
+	kvRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/kv-pairs",
+		keyValueHandler.createHandler).Methods("POST")
+	kvRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/kv-pairs",
+		keyValueHandler.getAllHandler).Methods("GET")
+	kvRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/kv-pairs/{kv-pair-name}",
+		keyValueHandler.getHandler).Methods("GET")
+	kvRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/kv-pairs/{kv-pair-name}",
+		keyValueHandler.updateHandler).Methods("PUT")
+	kvRouter.HandleFunc(
+		"/logical-clouds/{logical-cloud-name}/kv-pairs/{kv-pair-name}",
+		keyValueHandler.deleteHandler).Methods("DELETE")
+	return router
 }
diff --git a/src/dcm/api/clusterHandler.go b/src/dcm/api/clusterHandler.go
index 3e483f06..1201611f 100644
--- a/src/dcm/api/clusterHandler.go
+++ b/src/dcm/api/clusterHandler.go
@@ -14,149 +14,211 @@
 * See the License for the specific language governing permissions
 * and
 * limitations under the License.
-*/
+ */
 
 package api
 
 import (
-    "encoding/json"
-    "net/http"
-    "io"
-    "github.com/onap/multicloud-k8s/src/dcm/pkg/module"
+	"encoding/json"
+	"io"
+	"net/http"
 
-    "github.com/gorilla/mux"
+	"github.com/gorilla/mux"
+	"github.com/onap/multicloud-k8s/src/dcm/pkg/module"
 )
 
-
 // clusterHandler is used to store backend implementations objects
 type clusterHandler struct {
-    client module.ClusterManager
+	client module.ClusterManager
 }
 
-// CreateHandler handles creation of the cluster reference entry in the database
-
+// createHandler handles creation of the cluster reference entry in the database
 func (h clusterHandler) createHandler(w http.ResponseWriter, r *http.Request) {
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    logicalCloud := vars["logical-cloud-name"]
-    var v module.Cluster
-
-    err := json.NewDecoder(r.Body).Decode(&v)
-    switch {
-    case err == io.EOF:
-        http.Error(w, "Empty body", http.StatusBadRequest)
-        return
-    case err != nil:
-        http.Error(w, err.Error(), http.StatusUnprocessableEntity)
-        return
-    }
-
-    // Cluster Reference Name is required.
-    if v.MetaData.ClusterReference == "" {
-        http.Error(w, "Missing name in POST request", http.StatusBadRequest)
-        return
-    }
-
-    ret, err := h.client.CreateCluster(project, logicalCloud, v)
-    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
-    }
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	var v module.Cluster
+
+	err := json.NewDecoder(r.Body).Decode(&v)
+	switch {
+	case err == io.EOF:
+		http.Error(w, "Empty body", http.StatusBadRequest)
+		return
+	case err != nil:
+		http.Error(w, err.Error(), http.StatusUnprocessableEntity)
+		return
+	}
+
+	// Cluster Reference Name is required.
+	if v.MetaData.ClusterReference == "" {
+		http.Error(w, "Missing name in POST request", http.StatusBadRequest)
+		return
+	}
+
+	ret, err := h.client.CreateCluster(project, logicalCloud, v)
+	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
+	}
+}
+
+// getAllHandler handles GET operations over cluster references
+// Returns a list of Cluster References
+func (h clusterHandler) getAllHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	var ret interface{}
+	var err error
+
+	ret, err = h.client.GetAllClusters(project, logicalCloud)
+	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
+	}
 }
 
-// getHandler handle GET operations on a particular name
+// getHandler handles GET operations on a particular name
 // Returns a Cluster Reference
 func (h clusterHandler) getHandler(w http.ResponseWriter, r *http.Request) {
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    logicalCloud := vars["logical-cloud-name"]
-    name := vars["cluster-reference"]
-    var ret interface{}
-    var err error
-
-    if len(name) == 0 {
-        ret, err = h.client.GetAllClusters(project, logicalCloud)
-        if err != nil {
-            http.Error(w, err.Error(), http.StatusInternalServerError)
-            return
-        }
-    } else {
-        ret, err = h.client.GetCluster(project, logicalCloud, name)
-        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
-    }
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	name := vars["cluster-reference"]
+	var ret interface{}
+	var err error
+
+	ret, err = h.client.GetCluster(project, logicalCloud, name)
+	if err != nil {
+		if err.Error() == "Cluster Reference does not exist" {
+			http.Error(w, err.Error(), http.StatusNotFound)
+			return
+		}
+		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
+	}
 }
 
 // UpdateHandler handles Update operations on a particular cluster reference
 func (h clusterHandler) updateHandler(w http.ResponseWriter, r *http.Request) {
-    var v module.Cluster
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    logicalCloud := vars["logical-cloud-name"]
-    name := vars["cluster-reference"]
-
-    err := json.NewDecoder(r.Body).Decode(&v)
-    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 v.MetaData.ClusterReference == "" {
-        http.Error(w, "Missing name in PUT request", http.StatusBadRequest)
-        return
-    }
-
-    ret, err := h.client.UpdateCluster(project, logicalCloud, name, v)
-    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
-    }
+	var v module.Cluster
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	name := vars["cluster-reference"]
+
+	err := json.NewDecoder(r.Body).Decode(&v)
+	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 v.MetaData.ClusterReference == "" {
+		http.Error(w, "Missing name in PUT request", http.StatusBadRequest)
+		return
+	}
+
+	ret, err := h.client.UpdateCluster(project, logicalCloud, name, v)
+	if err != nil {
+		if err.Error() == "Cluster Reference does not exist" {
+			http.Error(w, err.Error(), http.StatusNotFound)
+			return
+		}
+		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 record
 func (h clusterHandler) deleteHandler(w http.ResponseWriter, r *http.Request) {
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    logicalCloud := vars["logical-cloud-name"]
-    name := vars["cluster-reference"]
-
-    err := h.client.DeleteCluster(project, logicalCloud, name)
-    if err != nil {
-        http.Error(w, err.Error(), http.StatusInternalServerError)
-        return
-    }
-
-    w.WriteHeader(http.StatusNoContent)
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	name := vars["cluster-reference"]
+
+	err := h.client.DeleteCluster(project, logicalCloud, name)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	w.WriteHeader(http.StatusNoContent)
+}
+
+// getConfigHandler handles GET operations on kubeconfigs
+// Returns a kubeconfig file
+func (h clusterHandler) getConfigHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	name := vars["cluster-reference"]
+	var err error
+
+	_, err = h.client.GetCluster(project, logicalCloud, name)
+	if err != nil {
+		if err.Error() == "Cluster Reference does not exist" {
+			http.Error(w, err.Error(), http.StatusNotFound)
+		} else {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+		}
+		return
+	}
+
+	cfg, err := h.client.GetClusterConfig(project, logicalCloud, name)
+	if err != nil {
+		if err.Error() == "The certificate for this cluster hasn't been issued yet. Please try later." {
+			http.Error(w, err.Error(), http.StatusAccepted)
+		} else if err.Error() == "Logical Cloud hasn't been applied yet" {
+			http.Error(w, err.Error(), http.StatusBadRequest)
+		} else {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+		}
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/yaml")
+	w.WriteHeader(http.StatusOK)
+	_, err = io.WriteString(w, cfg)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
 }
diff --git a/src/dcm/api/keyValueHandler.go b/src/dcm/api/keyValueHandler.go
index 57df6556..69333efb 100644
--- a/src/dcm/api/keyValueHandler.go
+++ b/src/dcm/api/keyValueHandler.go
@@ -14,148 +14,171 @@
 * See the License for the specific language governing permissions
 * and
 * limitations under the License.
-*/
+ */
 
 package api
 
 import (
-    "encoding/json"
-    "net/http"
-    "io"
-    "github.com/onap/multicloud-k8s/src/dcm/pkg/module"
-    "github.com/gorilla/mux"
-)
+	"encoding/json"
+	"io"
+	"net/http"
 
+	"github.com/gorilla/mux"
+	"github.com/onap/multicloud-k8s/src/dcm/pkg/module"
+)
 
 // keyValueHandler is used to store backend implementations objects
 type keyValueHandler struct {
-    client module.KeyValueManager
+	client module.KeyValueManager
 }
 
 // CreateHandler handles creation of the key value entry in the database
-
 func (h keyValueHandler) createHandler(w http.ResponseWriter, r *http.Request) {
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    logicalCloud := vars["logical-cloud-name"]
-    var v module.KeyValue
-
-    err := json.NewDecoder(r.Body).Decode(&v)
-    switch {
-    case err == io.EOF:
-        http.Error(w, "Empty body", http.StatusBadRequest)
-        return
-    case err != nil:
-        http.Error(w, err.Error(), http.StatusUnprocessableEntity)
-        return
-    }
-
-    // Key Value Name is required.
-    if v.MetaData.KeyValueName == "" {
-        http.Error(w, "Missing name in POST request", http.StatusBadRequest)
-        return
-    }
-
-    ret, err := h.client.CreateKVPair(project, logicalCloud, v)
-    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
-    }
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	var v module.KeyValue
+
+	err := json.NewDecoder(r.Body).Decode(&v)
+	switch {
+	case err == io.EOF:
+		http.Error(w, "Empty body", http.StatusBadRequest)
+		return
+	case err != nil:
+		http.Error(w, err.Error(), http.StatusUnprocessableEntity)
+		return
+	}
+
+	// Key Value Name is required.
+	if v.MetaData.KeyValueName == "" {
+		http.Error(w, "Missing name in POST request", http.StatusBadRequest)
+		return
+	}
+
+	ret, err := h.client.CreateKVPair(project, logicalCloud, v)
+	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 over key-value pairs
+// Returns a list of Key Values
+func (h keyValueHandler) getAllHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	var ret interface{}
+	var err error
+
+	ret, err = h.client.GetAllKVPairs(project, logicalCloud)
+	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
+	}
 }
 
 // getHandler handle GET operations on a particular name
 // Returns a Key Value
 func (h keyValueHandler) getHandler(w http.ResponseWriter, r *http.Request) {
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    logicalCloud := vars["logical-cloud-name"]
-    name := vars["kv-pair-name"]
-    var ret interface{}
-    var err error
-
-    if len(name) == 0 {
-        ret, err = h.client.GetAllKVPairs(project, logicalCloud)
-        if err != nil {
-            http.Error(w, err.Error(), http.StatusInternalServerError)
-            return
-        }
-    } else {
-        ret, err = h.client.GetKVPair(project, logicalCloud, name)
-        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
-    }
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	name := vars["kv-pair-name"]
+	var ret interface{}
+	var err error
+
+	ret, err = h.client.GetKVPair(project, logicalCloud, name)
+	if err != nil {
+		if err.Error() == "KV Pair does not exist" {
+			http.Error(w, err.Error(), http.StatusNotFound)
+			return
+		}
+		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
+	}
 }
 
 // UpdateHandler handles Update operations on a particular Key Value
 func (h keyValueHandler) updateHandler(w http.ResponseWriter, r *http.Request) {
-    var v module.KeyValue
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    logicalCloud := vars["logical-cloud-name"]
-    name := vars["kv-pair-name"]
-
-    err := json.NewDecoder(r.Body).Decode(&v)
-    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 v.MetaData.KeyValueName == "" {
-        http.Error(w, "Missing name in PUT request", http.StatusBadRequest)
-        return
-    }
-
-    ret, err := h.client.UpdateKVPair(project, logicalCloud, name, v)
-    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
-    }
+	var v module.KeyValue
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	name := vars["kv-pair-name"]
+
+	err := json.NewDecoder(r.Body).Decode(&v)
+	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 v.MetaData.KeyValueName == "" {
+		http.Error(w, "Missing name in PUT request", http.StatusBadRequest)
+		return
+	}
+
+	ret, err := h.client.UpdateKVPair(project, logicalCloud, name, v)
+	if err != nil {
+		if err.Error() == "KV Pair does not exist" {
+			http.Error(w, err.Error(), http.StatusNotFound)
+			return
+		}
+		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 record
 func (h keyValueHandler) deleteHandler(w http.ResponseWriter, r *http.Request) {
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    logicalCloud := vars["logical-cloud-name"]
-    name := vars["kv-pair-name"]
-
-        err := h.client.DeleteKVPair(project, logicalCloud, name)
-        if err != nil {
-                http.Error(w, err.Error(), http.StatusInternalServerError)
-                return
-        }
-
-        w.WriteHeader(http.StatusNoContent)
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	name := vars["kv-pair-name"]
+
+	err := h.client.DeleteKVPair(project, logicalCloud, name)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	w.WriteHeader(http.StatusNoContent)
 }
diff --git a/src/dcm/api/logicalCloudHandler.go b/src/dcm/api/logicalCloudHandler.go
index d8fcf268..ad9a3807 100644
--- a/src/dcm/api/logicalCloudHandler.go
+++ b/src/dcm/api/logicalCloudHandler.go
@@ -14,182 +14,281 @@
 * See the License for the specific language governing permissions
 * and
 * limitations under the License.
-*/
+ */
 
 package api
 
 import (
-    "encoding/json"
-    "net/http"
-    "io"
-    "github.com/onap/multicloud-k8s/src/dcm/pkg/module"
-    "github.com/gorilla/mux"
-)
+	"encoding/json"
+	"io"
+	"net/http"
 
+	"github.com/gorilla/mux"
+	"github.com/onap/multicloud-k8s/src/dcm/pkg/module"
+	orch "github.com/onap/multicloud-k8s/src/orchestrator/pkg/module"
+)
 
 // logicalCloudHandler is used to store backend implementations objects
 type logicalCloudHandler struct {
-    client module.LogicalCloudManager
-    clusterClient module.ClusterManager
-    quotaClient module.QuotaManager
+	client        module.LogicalCloudManager
+	clusterClient module.ClusterManager
+	quotaClient   module.QuotaManager
 }
 
-// CreateHandler handles creation of the logical cloud entry in the database
-
+// CreateHandler handles the creation of a logical cloud
 func (h logicalCloudHandler) createHandler(w http.ResponseWriter, r *http.Request) {
 
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    var v module.LogicalCloud
-
-    err := json.NewDecoder(r.Body).Decode(&v)
-    switch {
-    case err == io.EOF:
-        http.Error(w, "Empty body", http.StatusBadRequest)
-        return
-    case err != nil:
-        http.Error(w, err.Error(), http.StatusUnprocessableEntity)
-        return
-    }
-
-    // Logical Cloud Name is required.
-    if v.MetaData.LogicalCloudName == "" {
-        http.Error(w, "Missing name in POST request", http.StatusBadRequest)
-        return
-    }
-
-    ret, err := h.client.Create(project, v)
-    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
-    }
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	var v module.LogicalCloud
+
+	err := json.NewDecoder(r.Body).Decode(&v)
+	switch {
+	case err == io.EOF:
+		http.Error(w, "Empty body", http.StatusBadRequest)
+		return
+	case err != nil:
+		http.Error(w, err.Error(), http.StatusUnprocessableEntity)
+		return
+	}
+
+	// Logical Cloud Name is required.
+	if v.MetaData.LogicalCloudName == "" {
+		http.Error(w, "Missing name in POST request", http.StatusBadRequest)
+		return
+	}
+
+	// Validate that the specified Project exists
+	// before associating a Logical Cloud with it
+	p := orch.NewProjectClient()
+	_, err = p.GetProject(project)
+	if err != nil {
+		http.Error(w, "The specified project does not exist.", http.StatusNotFound)
+		return
+	}
+
+	ret, err := h.client.Create(project, v)
+	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 handle GET operations on a particular name
+// getAllHandler handles GET operations over logical clouds
+// Returns a list of Logical Clouds
+func (h logicalCloudHandler) getAllHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	var ret interface{}
+	var err error
+
+	ret, err = h.client.GetAll(project)
+	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
+	}
+}
+
+// getHandler handles GET operations on a particular name
 // Returns a Logical Cloud
 func (h logicalCloudHandler) getHandler(w http.ResponseWriter, r *http.Request) {
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    name := vars["logical-cloud-name"]
-    var ret interface{}
-    var err error
-
-    if len(name) == 0 {
-        ret, err = h.client.GetAll(project)
-        if err != nil {
-            http.Error(w, err.Error(), http.StatusInternalServerError)
-            return
-        }
-    } else {
-        ret, err = h.client.Get(project, name)
-        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
-    }
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	name := vars["logical-cloud-name"]
+	var ret interface{}
+	var err error
+
+	ret, err = h.client.Get(project, name)
+	if err != nil {
+		if err.Error() == "Logical Cloud does not exist" {
+			http.Error(w, err.Error(), http.StatusNotFound)
+			return
+		}
+		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
+	}
 }
 
-// UpdateHandler handles Update operations on a particular logical cloud
+// updateHandler handles Update operations on a particular logical cloud
 func (h logicalCloudHandler) updateHandler(w http.ResponseWriter, r *http.Request) {
-    var v module.LogicalCloud
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    name := vars["logical-cloud-name"]
-
-    err := json.NewDecoder(r.Body).Decode(&v)
-    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 v.MetaData.LogicalCloudName == "" {
-        http.Error(w, "Missing name in PUT request", http.StatusBadRequest)
-        return
-    }
-
-    ret, err := h.client.Update(project, name, v)
-    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
-    }
+	var v module.LogicalCloud
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	name := vars["logical-cloud-name"]
+
+	err := json.NewDecoder(r.Body).Decode(&v)
+	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 v.MetaData.LogicalCloudName == "" {
+		http.Error(w, "Missing name in PUT request", http.StatusBadRequest)
+		return
+	}
+
+	ret, err := h.client.Update(project, name, v)
+	if err != nil {
+		if err.Error() == "Logical Cloud does not exist" {
+			http.Error(w, err.Error(), http.StatusNotFound)
+			return
+		}
+		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
+	}
 }
 
+// deleteHandler handles Delete operations on a particular logical cloud
 func (h logicalCloudHandler) deleteHandler(w http.ResponseWriter, r *http.Request) {
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    name := vars["logical-cloud-name"]
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	name := vars["logical-cloud-name"]
 
-    err := h.client.Delete(project, name)
-    if err != nil {
-        http.Error(w, err.Error(), http.StatusInternalServerError)
-        return
-    }
+	err := h.client.Delete(project, name)
+	if err != nil {
+		if err.Error() == "Logical Cloud does not exist" {
+			http.Error(w, err.Error(), http.StatusNotFound)
+			return
+		}
+		if err.Error() == "The Logical Cloud can't be deleted yet, it is being terminated." {
+			http.Error(w, err.Error(), http.StatusConflict)
+			return
+		}
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
 
-    w.WriteHeader(http.StatusNoContent)
+	w.WriteHeader(http.StatusNoContent)
 }
 
+// applyHandler handles applying a particular logical cloud
 func (h logicalCloudHandler) applyHandler(w http.ResponseWriter, r *http.Request) {
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    name := vars["logical-cloud-name"]
-
-    // Get logical cloud
-    lc, err := h.client.Get(project, name)
-    if err != nil {
-        http.Error(w, err.Error(), http.StatusInternalServerError)
-        return
-    }
-
-    // Get Clusters
-    clusters, err := h.clusterClient.GetAllClusters(project, name)
-
-    if err != nil {
-        http.Error(w, err.Error(), http.StatusInternalServerError)
-        return
-    }
-
-
-    //Get Quotas
-    quotas, err := h.quotaClient.GetAllQuotas(project, name)
-    if err != nil {
-        http.Error(w, err.Error(), http.StatusInternalServerError)
-        return
-    }
-
-    err = module.CreateEtcdContext(lc, clusters, quotas)
-    if err != nil {
-        http.Error(w, err.Error(), http.StatusInternalServerError)
-        return
-    }
-
-    return
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	name := vars["logical-cloud-name"]
+
+	// Get logical cloud
+	lc, err := h.client.Get(project, name)
+	if err != nil {
+		if err.Error() == "Logical Cloud does not exist" {
+			http.Error(w, err.Error(), http.StatusNotFound)
+			return
+		}
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	// Get Clusters
+	clusters, err := h.clusterClient.GetAllClusters(project, name)
+
+	if err != nil {
+		if err.Error() == "No Cluster References associated" {
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	// Get Quotas
+	quotas, err := h.quotaClient.GetAllQuotas(project, name)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	// Apply the Logical Cloud
+	err = module.Apply(project, lc, clusters, quotas)
+	if err != nil {
+		if err.Error() == "The Logical Cloud can't be re-applied yet, it is being terminated." {
+			http.Error(w, err.Error(), http.StatusConflict)
+			return
+		}
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	return
+}
+
+// applyHandler handles terminating a particular logical cloud
+func (h logicalCloudHandler) terminateHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	name := vars["logical-cloud-name"]
+
+	// Get logical cloud
+	lc, err := h.client.Get(project, name)
+	if err != nil {
+		if err.Error() == "Logical Cloud does not exist" {
+			http.Error(w, err.Error(), http.StatusNotFound)
+			return
+		}
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	// Get Clusters
+	clusters, err := h.clusterClient.GetAllClusters(project, name)
+
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	// Get Quotas
+	quotas, err := h.quotaClient.GetAllQuotas(project, name)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	// Terminate the Logical Cloud
+	err = module.Terminate(project, lc, clusters, quotas)
+	if err != nil {
+		if err.Error() == "Logical Cloud doesn't seem applied: "+name {
+			http.Error(w, err.Error(), http.StatusConflict)
+			return
+		}
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+	}
+
+	return
 }
diff --git a/src/dcm/api/quotaHandler.go b/src/dcm/api/quotaHandler.go
index bca5206a..1f0e45a5 100644
--- a/src/dcm/api/quotaHandler.go
+++ b/src/dcm/api/quotaHandler.go
@@ -14,149 +14,171 @@
 * See the License for the specific language governing permissions
 * and
 * limitations under the License.
-*/
+ */
 
 package api
 
 import (
-    "encoding/json"
-    "net/http"
-    "io"
-    "github.com/onap/multicloud-k8s/src/dcm/pkg/module"
+	"encoding/json"
+	"io"
+	"net/http"
 
-    "github.com/gorilla/mux"
+	"github.com/gorilla/mux"
+	"github.com/onap/multicloud-k8s/src/dcm/pkg/module"
 )
 
-
 // quotaHandler is used to store backend implementations objects
 type quotaHandler struct {
-    client module.QuotaManager
+	client module.QuotaManager
 }
 
 // CreateHandler handles creation of the quota entry in the database
-
 func (h quotaHandler) createHandler(w http.ResponseWriter, r *http.Request) {
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    logicalCloud := vars["logical-cloud-name"]
-    var v module.Quota
-
-    err := json.NewDecoder(r.Body).Decode(&v)
-    switch {
-    case err == io.EOF:
-        http.Error(w, "Empty body", http.StatusBadRequest)
-        return
-    case err != nil:
-        http.Error(w, err.Error(), http.StatusUnprocessableEntity)
-        return
-    }
-
-    // Quota Name is required.
-    if v.MetaData.QuotaName == "" {
-        http.Error(w, "Missing name in POST request", http.StatusBadRequest)
-        return
-    }
-
-    ret, err := h.client.CreateQuota(project, logicalCloud, v)
-    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
-    }
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	var v module.Quota
+
+	err := json.NewDecoder(r.Body).Decode(&v)
+	switch {
+	case err == io.EOF:
+		http.Error(w, "Empty body", http.StatusBadRequest)
+		return
+	case err != nil:
+		http.Error(w, err.Error(), http.StatusUnprocessableEntity)
+		return
+	}
+
+	// Quota Name is required.
+	if v.MetaData.QuotaName == "" {
+		http.Error(w, "Missing name in POST request", http.StatusBadRequest)
+		return
+	}
+
+	ret, err := h.client.CreateQuota(project, logicalCloud, v)
+	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 over quotas
+// Returns a list of Quotas
+func (h quotaHandler) getAllHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	var ret interface{}
+	var err error
+
+	ret, err = h.client.GetAllQuotas(project, logicalCloud)
+	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
+	}
 }
 
 // getHandler handle GET operations on a particular name
-// Returns a quota
+// Returns a Quota
 func (h quotaHandler) getHandler(w http.ResponseWriter, r *http.Request) {
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    logicalCloud := vars["logical-cloud-name"]
-    name := vars["quota-name"]
-    var ret interface{}
-    var err error
-
-    if len(name) == 0 {
-        ret, err = h.client.GetAllQuotas(project, logicalCloud)
-        if err != nil {
-            http.Error(w, err.Error(), http.StatusInternalServerError)
-            return
-        }
-    } else {
-        ret, err = h.client.GetQuota(project, logicalCloud, name)
-        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
-    }
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	name := vars["quota-name"]
+	var ret interface{}
+	var err error
+
+	ret, err = h.client.GetQuota(project, logicalCloud, name)
+	if err != nil {
+		if err.Error() == "Cluster Quota does not exist" {
+			http.Error(w, err.Error(), http.StatusNotFound)
+			return
+		}
+		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
+	}
 }
 
 // UpdateHandler handles Update operations on a particular quota
 func (h quotaHandler) updateHandler(w http.ResponseWriter, r *http.Request) {
-    var v module.Quota
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    logicalCloud := vars["logical-cloud-name"]
-    name := vars["quota-name"]
-
-    err := json.NewDecoder(r.Body).Decode(&v)
-    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 v.MetaData.QuotaName == "" {
-        http.Error(w, "Missing name in PUT request", http.StatusBadRequest)
-        return
-    }
-
-    ret, err := h.client.UpdateQuota(project, logicalCloud, name, v)
-    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
-    }
+	var v module.Quota
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	name := vars["quota-name"]
+
+	err := json.NewDecoder(r.Body).Decode(&v)
+	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 v.MetaData.QuotaName == "" {
+		http.Error(w, "Missing name in PUT request", http.StatusBadRequest)
+		return
+	}
+
+	ret, err := h.client.UpdateQuota(project, logicalCloud, name, v)
+	if err != nil {
+		if err.Error() == "Cluster Quota does not exist" {
+			http.Error(w, err.Error(), http.StatusNotFound)
+			return
+		}
+		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 record
 func (h quotaHandler) deleteHandler(w http.ResponseWriter, r *http.Request) {
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    logicalCloud := vars["logical-cloud-name"]
-    name := vars["quota-name"]
-
-    err := h.client.DeleteQuota(project, logicalCloud, name)
-    if err != nil {
-        http.Error(w, err.Error(), http.StatusInternalServerError)
-        return
-    }
-
-    w.WriteHeader(http.StatusNoContent)
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	name := vars["quota-name"]
+
+	err := h.client.DeleteQuota(project, logicalCloud, name)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	w.WriteHeader(http.StatusNoContent)
 }
diff --git a/src/dcm/api/userPermissionsHandler.go b/src/dcm/api/userPermissionsHandler.go
index 48ab3d8e..6d88f573 100644
--- a/src/dcm/api/userPermissionsHandler.go
+++ b/src/dcm/api/userPermissionsHandler.go
@@ -14,149 +14,172 @@
 * See the License for the specific language governing permissions
 * and
 * limitations under the License.
-*/
+ */
 
 package api
 
 import (
-    "encoding/json"
-    "net/http"
-    "io"
-    "github.com/onap/multicloud-k8s/src/dcm/pkg/module"
-    "github.com/gorilla/mux"
-)
+	"encoding/json"
+	"io"
+	"net/http"
 
+	"github.com/gorilla/mux"
+	"github.com/onap/multicloud-k8s/src/dcm/pkg/module"
+)
 
 // userPermissionHandler is used to store backend implementations objects
 type userPermissionHandler struct {
-    client module.UserPermissionManager
+	client module.UserPermissionManager
 }
 
 // CreateHandler handles creation of the user permission entry in the database
-
 func (h userPermissionHandler) createHandler(w http.ResponseWriter, r *http.Request) {
 
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    logicalCloud := vars["logical-cloud-name"]
-    var v module.UserPermission
-
-    err := json.NewDecoder(r.Body).Decode(&v)
-    switch {
-    case err == io.EOF:
-        http.Error(w, "Empty body", http.StatusBadRequest)
-        return
-    case err != nil:
-        http.Error(w, err.Error(), http.StatusUnprocessableEntity)
-        return
-    }
-
-    // User-Permission Name is required.
-    if v.UserPermissionName == "" {
-        http.Error(w, "Missing name in POST request", http.StatusBadRequest)
-        return
-    }
-
-    ret, err := h.client.CreateUserPerm(project, logicalCloud, v)
-    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
-    }
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	var v module.UserPermission
+
+	err := json.NewDecoder(r.Body).Decode(&v)
+	switch {
+	case err == io.EOF:
+		http.Error(w, "Empty body", http.StatusBadRequest)
+		return
+	case err != nil:
+		http.Error(w, err.Error(), http.StatusUnprocessableEntity)
+		return
+	}
+
+	// User-Permission Name is required.
+	if v.UserPermissionName == "" {
+		http.Error(w, "Missing name in POST request", http.StatusBadRequest)
+		return
+	}
+
+	ret, err := h.client.CreateUserPerm(project, logicalCloud, v)
+	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
+	}
+}
+
+// getAllHandler handles GET operations over user permissions
+// Returns a list of User Permissions
+func (h userPermissionHandler) getAllHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	var ret interface{}
+	var err error
+
+	ret, err = h.client.GetAllUserPerms(project, logicalCloud)
+	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
+	}
 }
 
-// getHandler handle GET operations on a particular name
+// getHandler handles GET operations on a particular name
 // Returns a User Permission
 func (h userPermissionHandler) getHandler(w http.ResponseWriter, r *http.Request) {
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    logicalCloud := vars["logical-cloud-name"]
-    name := vars["permission-name"]
-    var ret interface{}
-    var err error
-
-    if len(name) == 0 {
-        ret, err = h.client.GetAllUserPerms(project, logicalCloud)
-        if err != nil {
-            http.Error(w, err.Error(), http.StatusInternalServerError)
-            return
-        }
-    } else {
-        ret, err = h.client.GetAllUserPerms(project, logicalCloud)
-        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
-    }
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	name := vars["permission-name"]
+	var ret interface{}
+	var err error
+
+	ret, err = h.client.GetUserPerm(project, logicalCloud, name)
+	if err != nil {
+		if err.Error() == "User Permission does not exist" {
+			http.Error(w, err.Error(), http.StatusNotFound)
+			return
+		}
+		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
+	}
 }
 
 // UpdateHandler handles Update operations on a particular user permission
 func (h userPermissionHandler) updateHandler(w http.ResponseWriter, r *http.Request) {
-    var v module.UserPermission
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    logicalCloud := vars["logical-cloud-name"]
-    name := vars["permission-name"]
-
-    err := json.NewDecoder(r.Body).Decode(&v)
-    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 v.UserPermissionName == "" {
-        http.Error(w, "Missing name in PUT request", http.StatusBadRequest)
-        return
-    }
-
-    ret, err := h.client.UpdateUserPerm(project, logicalCloud, name, v)
-    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
-    }
+	var v module.UserPermission
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	name := vars["permission-name"]
+
+	err := json.NewDecoder(r.Body).Decode(&v)
+	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 v.UserPermissionName == "" {
+		http.Error(w, "Missing name in PUT request", http.StatusBadRequest)
+		return
+	}
+
+	ret, err := h.client.UpdateUserPerm(project, logicalCloud, name, v)
+	if err != nil {
+		if err.Error() == "User Permission does not exist" {
+			http.Error(w, err.Error(), http.StatusNotFound)
+			return
+		}
+		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 record
 func (h userPermissionHandler) deleteHandler(w http.ResponseWriter, r *http.Request) {
-    vars := mux.Vars(r)
-    project := vars["project-name"]
-    logicalCloud := vars["logical-cloud-name"]
-    name := vars["permission-name"]
-
-    err := h.client.DeleteUserPerm(project, logicalCloud, name)
-    if err != nil {
-        http.Error(w, err.Error(), http.StatusInternalServerError)
-        return
-    }
-
-    w.WriteHeader(http.StatusNoContent)
+	vars := mux.Vars(r)
+	project := vars["project-name"]
+	logicalCloud := vars["logical-cloud-name"]
+	name := vars["permission-name"]
+
+	err := h.client.DeleteUserPerm(project, logicalCloud, name)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	w.WriteHeader(http.StatusNoContent)
 }