cmd/controller: support -a/--application

Author: weizhouapache

cmd/cli/get.go

@@ -74,6 +74,9 @@ var getCmd = &cobra.Command{
 			if name != "" {
 				q.Set("name", name)
 			}
+			if getApplication != "" && (resourceType == "Application" || resourceType == "Component" || resourceType == "VirtualMachine") {
+				q.Set("application", getApplication)
+			}
 			path := endpoint + "?" + q.Encode()
 			body, err := ControllerRequest("GET", path, nil)
 			if err != nil {
@@ -134,9 +137,11 @@ func init() {
 }
 
 var getAll bool
+var getApplication string
 
 func init() {
 	getCmd.Flags().BoolVarP(&getAll, "all", "A", false, "Show all VMs from CloudStack (include unmanaged) — controller mode only")
+	getCmd.Flags().StringVarP(&getApplication, "application", "a", "", "Filter Application/Component/VirtualMachine results by application name")
 }
 
 // tryDecodeAndPrint attempts to decode controller JSON into known typed

controller/controller.go

@@ -465,14 +465,19 @@ func (c *Controller) handleList(w http.ResponseWriter, r *http.Request) {
 	}
 	kind := r.URL.Query().Get("kind")
 	name := r.URL.Query().Get("name")
+	appFilter := r.URL.Query().Get("application")
 	switch kind {
 	case "Application":
 		var apps []v1.Application
 		if db.DB == nil {
 			http.Error(w, "database unavailable", http.StatusServiceUnavailable)
 			return
 		}
-		if err := db.DB.Find(&apps).Error; err != nil {
+		q := db.DB
+		if appFilter != "" {
+			q = q.Where("name = ?", appFilter)
+		}
+		if err := q.Find(&apps).Error; err != nil {
 			http.Error(w, "failed to list applications", http.StatusInternalServerError)
 			return
 		}
@@ -487,7 +492,11 @@ func (c *Controller) handleList(w http.ResponseWriter, r *http.Request) {
 			http.Error(w, "database unavailable", http.StatusServiceUnavailable)
 			return
 		}
-		if err := db.DB.Find(&comps).Error; err != nil {
+		q := db.DB
+		if appFilter != "" {
+			q = q.Where("application = ?", appFilter)
+		}
+		if err := q.Find(&comps).Error; err != nil {
 			http.Error(w, "failed to list components", http.StatusInternalServerError)
 			return
 		}
@@ -520,7 +529,11 @@ func (c *Controller) handleList(w http.ResponseWriter, r *http.Request) {
 			http.Error(w, "database unavailable", http.StatusServiceUnavailable)
 			return
 		}
-		if err := db.DB.Find(&vms).Error; err != nil {
+		q := db.DB
+		if appFilter != "" {
+			q = q.Where("application = ?", appFilter)
+		}
+		if err := q.Find(&vms).Error; err != nil {
 			http.Error(w, "failed to list virtualmachines", http.StatusInternalServerError)
 			return
 		}