From 645c6a331cd00043fcf9f567f5f261a9db070918 Mon Sep 17 00:00:00 2001
From: Eric Multanen <eric.w.multanen@intel.com>
Date: Wed, 12 Aug 2020 15:33:12 -0700
Subject: Enhance the status query API

This patch enhances the status query API.
- The ResourceBundleState CRD is modified to just use the
  k8s Pod structure instead of a customized struct.
- Status queries can either present results showing
  the rsync status of the composite app and resources
  or from information received from the cluster via
  the ResourceBundleState CR
- Query parameters are provided to the API call to
  customize the query and response
- Support for querying status of cluster network
  intents is added

Issue-ID: MULTICLOUD-1042
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
Change-Id: Icca4cdd901e2f2b446414fade256fc24d87594cd
---
 src/orchestrator/api/instantiation_handler.go | 95 ++++++++++++++++++++++++++-
 1 file changed, 92 insertions(+), 3 deletions(-)

(limited to 'src/orchestrator/api/instantiation_handler.go')

diff --git a/src/orchestrator/api/instantiation_handler.go b/src/orchestrator/api/instantiation_handler.go
index eeac8a00..f9f86954 100644
--- a/src/orchestrator/api/instantiation_handler.go
+++ b/src/orchestrator/api/instantiation_handler.go
@@ -19,8 +19,11 @@ package api
 import (
 	"encoding/json"
 	"net/http"
+	"net/url"
+	"strings"
 
 	"github.com/gorilla/mux"
+	"github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/validation"
 	moduleLib "github.com/onap/multicloud-k8s/src/orchestrator/pkg/module"
 )
 
@@ -90,7 +93,95 @@ func (h instantiationHandler) statusHandler(w http.ResponseWriter, r *http.Reque
 	v := vars["composite-app-version"]
 	di := vars["deployment-intent-group-name"]
 
-	status, iErr := h.client.Status(p, ca, v, di)
+	qParams, err := url.ParseQuery(r.URL.RawQuery)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	var queryInstance string
+	if o, found := qParams["instance"]; found {
+		queryInstance = o[0]
+		if queryInstance == "" {
+			http.Error(w, "Invalid query instance", http.StatusBadRequest)
+			return
+		}
+	} else {
+		queryInstance = "" // default instance value
+	}
+
+	var queryType string
+	if t, found := qParams["type"]; found {
+		queryType = t[0]
+		if queryType != "cluster" && queryType != "rsync" {
+			http.Error(w, "Invalid query type", http.StatusBadRequest)
+			return
+		}
+	} else {
+		queryType = "rsync" // default type
+	}
+
+	var queryOutput string
+	if o, found := qParams["output"]; found {
+		queryOutput = o[0]
+		if queryOutput != "summary" && queryOutput != "all" && queryOutput != "detail" {
+			http.Error(w, "Invalid query output", http.StatusBadRequest)
+			return
+		}
+	} else {
+		queryOutput = "all" // default output format
+	}
+
+	var queryApps []string
+	if a, found := qParams["app"]; found {
+		queryApps = a
+		for _, app := range queryApps {
+			errs := validation.IsValidName(app)
+			if len(errs) > 0 {
+				http.Error(w, "Invalid app query", http.StatusBadRequest)
+				return
+			}
+		}
+	} else {
+		queryApps = make([]string, 0)
+	}
+
+	var queryClusters []string
+	if c, found := qParams["cluster"]; found {
+		queryClusters = c
+		for _, cl := range queryClusters {
+			parts := strings.Split(cl, "+")
+			if len(parts) != 2 {
+				http.Error(w, "Invalid cluster query", http.StatusBadRequest)
+				return
+			}
+			for _, p := range parts {
+				errs := validation.IsValidName(p)
+				if len(errs) > 0 {
+					http.Error(w, "Invalid cluster query", http.StatusBadRequest)
+					return
+				}
+			}
+		}
+	} else {
+		queryClusters = make([]string, 0)
+	}
+
+	var queryResources []string
+	if r, found := qParams["resource"]; found {
+		queryResources = r
+		for _, res := range queryResources {
+			errs := validation.IsValidName(res)
+			if len(errs) > 0 {
+				http.Error(w, "Invalid resources query", http.StatusBadRequest)
+				return
+			}
+		}
+	} else {
+		queryResources = make([]string, 0)
+	}
+
+	status, iErr := h.client.Status(p, ca, v, di, queryInstance, queryType, queryOutput, queryApps, queryClusters, queryResources)
 	if iErr != nil {
 		http.Error(w, iErr.Error(), http.StatusInternalServerError)
 		return
@@ -103,6 +194,4 @@ func (h instantiationHandler) statusHandler(w http.ResponseWriter, r *http.Reque
 		http.Error(w, iErr.Error(), http.StatusInternalServerError)
 		return
 	}
-	w.WriteHeader(http.StatusAccepted)
-
 }
-- 
cgit 1.2.3-korg