From 8e7a20777f2100324526a34b4b6c943b512df0fb Mon Sep 17 00:00:00 2001 From: Eric Multanen Date: Wed, 27 May 2020 11:21:42 -0700 Subject: Move cluster management into its own microservice Split out the cluster provider and cluster APIs and packages into a separate microservice to align with the architecture. Issue-ID: MULTICLOUD-1029 Signed-off-by: Eric Multanen Change-Id: I08f357b5a488004a2389b72a178ae33e101d1540 --- src/ncm/api/api.go | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'src/ncm/api/api.go') diff --git a/src/ncm/api/api.go b/src/ncm/api/api.go index a304516c..6dd958a1 100644 --- a/src/ncm/api/api.go +++ b/src/ncm/api/api.go @@ -20,7 +20,6 @@ import ( "reflect" "github.com/gorilla/mux" - "github.com/onap/multicloud-k8s/src/ncm/pkg/cluster" "github.com/onap/multicloud-k8s/src/ncm/pkg/module" "github.com/onap/multicloud-k8s/src/ncm/pkg/networkintents" "github.com/onap/multicloud-k8s/src/ncm/pkg/scheduler" @@ -33,13 +32,6 @@ var moduleClient *module.Client // return the testClient, otherwise return the client. func setClient(client, testClient interface{}) interface{} { switch cl := client.(type) { - case *cluster.ClusterClient: - if testClient != nil && reflect.TypeOf(testClient).Implements(reflect.TypeOf((*cluster.ClusterManager)(nil)).Elem()) { - c, ok := testClient.(cluster.ClusterManager) - if ok { - return c - } - } case *networkintents.NetworkClient: if testClient != nil && reflect.TypeOf(testClient).Implements(reflect.TypeOf((*networkintents.NetworkManager)(nil)).Elem()) { c, ok := testClient.(networkintents.NetworkManager) @@ -75,27 +67,6 @@ func NewRouter(testClient interface{}) *mux.Router { router := mux.NewRouter().PathPrefix("/v2").Subrouter() - clusterHandler := clusterHandler{ - client: setClient(moduleClient.Cluster, testClient).(cluster.ClusterManager), - } - router.HandleFunc("/cluster-providers", clusterHandler.createClusterProviderHandler).Methods("POST") - router.HandleFunc("/cluster-providers", clusterHandler.getClusterProviderHandler).Methods("GET") - router.HandleFunc("/cluster-providers/{name}", clusterHandler.getClusterProviderHandler).Methods("GET") - router.HandleFunc("/cluster-providers/{name}", clusterHandler.deleteClusterProviderHandler).Methods("DELETE") - router.HandleFunc("/cluster-providers/{provider-name}/clusters", clusterHandler.createClusterHandler).Methods("POST") - router.HandleFunc("/cluster-providers/{provider-name}/clusters", clusterHandler.getClusterHandler).Methods("GET") - router.HandleFunc("/cluster-providers/{provider-name}/clusters", clusterHandler.getClusterHandler).Queries("label", "{label}") - router.HandleFunc("/cluster-providers/{provider-name}/clusters/{name}", clusterHandler.getClusterHandler).Methods("GET") - router.HandleFunc("/cluster-providers/{provider-name}/clusters/{name}", clusterHandler.deleteClusterHandler).Methods("DELETE") - router.HandleFunc("/cluster-providers/{provider-name}/clusters/{cluster-name}/labels", clusterHandler.createClusterLabelHandler).Methods("POST") - router.HandleFunc("/cluster-providers/{provider-name}/clusters/{cluster-name}/labels", clusterHandler.getClusterLabelHandler).Methods("GET") - router.HandleFunc("/cluster-providers/{provider-name}/clusters/{cluster-name}/labels/{label}", clusterHandler.getClusterLabelHandler).Methods("GET") - router.HandleFunc("/cluster-providers/{provider-name}/clusters/{cluster-name}/labels/{label}", clusterHandler.deleteClusterLabelHandler).Methods("DELETE") - router.HandleFunc("/cluster-providers/{provider-name}/clusters/{cluster-name}/kv-pairs", clusterHandler.createClusterKvPairsHandler).Methods("POST") - 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") - networkHandler := networkHandler{ client: setClient(moduleClient.Network, testClient).(networkintents.NetworkManager), } -- cgit 1.2.3-korg