diff options
| author |   Eric Multanen <eric.w.multanen@intel.com> | 2020-07-22 14:11:05 -0700 |
|---|---|---|
| committer | Eric Multanen <eric.w.multanen@intel.com> | 2020-08-03 15:40:09 -0700 |
| commit | b2c23afb03b393b05fe38dd7c54b1de3c42deaf3 (patch) | |
| tree | 5e845ad676a62e4bde17a6c4a846544164b0ad40 /src/orchestrator/api | |
| parent | d6f900721c81a2c03cb1a21a3d2064e9a69fc4b7 (diff) | |
Add StateInfo structure synced resources
Add a StateInfo structure to the Cluster and
Deployment-Intent-Group resources to keep track of
the lifecycle state of these resources. Moved the
appcontext id that was being kept into this structure
as well. Enabled the approve state (and API) for
the deployment intent group.
Issue-ID: MULTICLOUD-1042
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
Change-Id: I36602d8a0658d9d6d37b8799f9a372a7d1042496
Diffstat (limited to 'src/orchestrator/api')
| -rw-r--r-- | src/orchestrator/api/api.go | 2 | ||||
| -rw-r--r-- | src/orchestrator/api/instantiation_handler.go | 17 |
2 files changed, 19 insertions, 0 deletions
diff --git a/src/orchestrator/api/api.go b/src/orchestrator/api/api.go index 03afee28..72b444b7 100644 --- a/src/orchestrator/api/api.go +++ b/src/orchestrator/api/api.go @@ -189,6 +189,8 @@ func NewRouter(projectClient moduleLib.ProjectManager, client: instantiationClient, } + router.HandleFunc("/projects/{project-name}/composite-apps/{composite-app-name}/{composite-app-version}/deployment-intent-groups/{deployment-intent-group-name}/approve", instantiationHandler.approveHandler).Methods("POST") + router.HandleFunc("/projects/{project-name}/composite-apps/{composite-app-name}/{composite-app-version}/deployment-intent-groups/{deployment-intent-group-name}/terminate", instantiationHandler.terminateHandler).Methods("POST") router.HandleFunc("/projects/{project-name}/composite-apps/{composite-app-name}/{composite-app-version}/deployment-intent-groups/{deployment-intent-group-name}/instantiate", instantiationHandler.instantiateHandler).Methods("POST") router.HandleFunc("/projects/{project-name}/composite-apps/{composite-app-name}/{composite-app-version}/deployment-intent-groups/{deployment-intent-group-name}/terminate", instantiationHandler.terminateHandler).Methods("POST") router.HandleFunc("/projects/{project-name}/composite-apps/{composite-app-name}/{composite-app-version}/deployment-intent-groups/{deployment-intent-group-name}/status", instantiationHandler.statusHandler).Methods("GET") diff --git a/src/orchestrator/api/instantiation_handler.go b/src/orchestrator/api/instantiation_handler.go index ce50e5b8..eeac8a00 100644 --- a/src/orchestrator/api/instantiation_handler.go +++ b/src/orchestrator/api/instantiation_handler.go @@ -31,6 +31,23 @@ type instantiationHandler struct { client moduleLib.InstantiationManager } +func (h instantiationHandler) approveHandler(w http.ResponseWriter, r *http.Request) { + + vars := mux.Vars(r) + p := vars["project-name"] + ca := vars["composite-app-name"] + v := vars["composite-app-version"] + di := vars["deployment-intent-group-name"] + + iErr := h.client.Approve(p, ca, v, di) + if iErr != nil { + http.Error(w, iErr.Error(), http.StatusInternalServerError) + return + } + w.WriteHeader(http.StatusAccepted) + +} + func (h instantiationHandler) instantiateHandler(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) |