diff options
Diffstat (limited to 'src/k8splugin/api/api.go')
| -rw-r--r-- | src/k8splugin/api/api.go | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/k8splugin/api/api.go b/src/k8splugin/api/api.go index 636b80b4..4308db4f 100644 --- a/src/k8splugin/api/api.go +++ b/src/k8splugin/api/api.go @@ -26,6 +26,7 @@ func NewRouter(defClient rb.DefinitionManager, profileClient rb.ProfileManager, instClient app.InstanceManager, configClient app.ConfigManager, + connectionClient connection.ConnectionManager, templateClient rb.ConfigTemplateManager) *mux.Router { router := mux.NewRouter() @@ -37,6 +38,7 @@ func NewRouter(defClient rb.DefinitionManager, instHandler := instanceHandler{client: instClient} instRouter := router.PathPrefix("/v1").Subrouter() instRouter.HandleFunc("/instance", instHandler.createHandler).Methods("POST") + instRouter.HandleFunc("/instance", instHandler.listHandler).Methods("GET") instRouter.HandleFunc("/instance/{instID}", instHandler.getHandler).Methods("GET") instRouter.HandleFunc("/instance/{instID}", instHandler.deleteHandler).Methods("DELETE") // (TODO): Fix update method @@ -51,11 +53,13 @@ func NewRouter(defClient rb.DefinitionManager, router.HandleFunc("/{cloud-owner}/{cloud-region}/infra_workload/{instID}", brokerHandler.deleteHandler).Methods("DELETE") //Setup the connectivity api handler here - connectionClient := connection.NewConnectionClient() - connectionHandler := connection.ConnectionHandler{Client: connectionClient} - instRouter.HandleFunc("/connectivity-info", connectionHandler.CreateHandler).Methods("POST") - instRouter.HandleFunc("/connectivity-info/{connname}", connectionHandler.GetHandler).Methods("GET") - instRouter.HandleFunc("/connectivity-info/{connname}", connectionHandler.DeleteHandler).Methods("DELETE") + if connectionClient == nil { + connectionClient = connection.NewConnectionClient() + } + connectionHandler := connectionHandler{client: connectionClient} + instRouter.HandleFunc("/connectivity-info", connectionHandler.createHandler).Methods("POST") + instRouter.HandleFunc("/connectivity-info/{connname}", connectionHandler.getHandler).Methods("GET") + instRouter.HandleFunc("/connectivity-info/{connname}", connectionHandler.deleteHandler).Methods("DELETE") //Setup resource bundle definition routes if defClient == nil { @@ -66,6 +70,7 @@ func NewRouter(defClient rb.DefinitionManager, resRouter.HandleFunc("/definition", defHandler.createHandler).Methods("POST") resRouter.HandleFunc("/definition/{rbname}/{rbversion}/content", defHandler.uploadHandler).Methods("POST") resRouter.HandleFunc("/definition/{rbname}", defHandler.listVersionsHandler).Methods("GET") + resRouter.HandleFunc("/definition", defHandler.listAllHandler).Methods("GET") resRouter.HandleFunc("/definition/{rbname}/{rbversion}", defHandler.getHandler).Methods("GET") resRouter.HandleFunc("/definition/{rbname}/{rbversion}", defHandler.deleteHandler).Methods("DELETE") @@ -75,6 +80,7 @@ func NewRouter(defClient rb.DefinitionManager, } profileHandler := rbProfileHandler{client: profileClient} resRouter.HandleFunc("/definition/{rbname}/{rbversion}/profile", profileHandler.createHandler).Methods("POST") + resRouter.HandleFunc("/definition/{rbname}/{rbversion}/profile", profileHandler.listHandler).Methods("GET") resRouter.HandleFunc("/definition/{rbname}/{rbversion}/profile/{prname}/content", profileHandler.uploadHandler).Methods("POST") resRouter.HandleFunc("/definition/{rbname}/{rbversion}/profile/{prname}", profileHandler.getHandler).Methods("GET") resRouter.HandleFunc("/definition/{rbname}/{rbversion}/profile/{prname}", profileHandler.deleteHandler).Methods("DELETE") |