Merge pull request #5445 from sujil02/podFilter-new

Filter pods through pod list api

5 files changed, 130 insertions, 22 deletions

diff --git a/pkg/adapter/pods.go b/pkg/adapter/pods.go
index dc856cc8d..1417bd2b9 100644
--- a/pkg/adapter/pods.go
+++ b/pkg/adapter/pods.go
@@ -122,19 +122,31 @@ func (r *LocalRuntime) GetLatestPod() (*Pod, error) {
 	return &pod, err
 }
 
+// GetPodsWithFilters gets the filtered list of pods based on the filter parameters provided.
+func (r *LocalRuntime) GetPodsWithFilters(filters string) ([]*Pod, error) {
+	pods, err := shared.GetPodsWithFilters(r.Runtime, filters)
+	if err != nil {
+		return nil, err
+	}
+	return r.podstoAdapterPods(pods)
+}
+
+func (r *LocalRuntime) podstoAdapterPods(pod []*libpod.Pod) ([]*Pod, error) {
+	var pods []*Pod
+	for _, i := range pod {
+
+		pods = append(pods, &Pod{i})
+	}
+	return pods, nil
+}
+
 // GetAllPods gets all pods and wraps it in an adapter pod
 func (r *LocalRuntime) GetAllPods() ([]*Pod, error) {
-	var pods []*Pod
 	allPods, err := r.Runtime.GetAllPods()
 	if err != nil {
 		return nil, err
 	}
-	for _, p := range allPods {
-		pod := Pod{}
-		pod.Pod = p
-		pods = append(pods, &pod)
-	}
-	return pods, nil
+	return r.podstoAdapterPods(allPods)
 }
 
 // LookupPod gets a pod by name or id and wraps it in an adapter pod
diff --git a/pkg/adapter/pods_remote.go b/pkg/adapter/pods_remote.go
index 20f089628..6b8f22f15 100644
--- a/pkg/adapter/pods_remote.go
+++ b/pkg/adapter/pods_remote.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/cmd/podman/shared"
-	"github.com/containers/libpod/cmd/podman/varlink"
+	iopodman "github.com/containers/libpod/cmd/podman/varlink"
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/pkg/varlinkapi"
@@ -208,6 +208,11 @@ func (r *LocalRuntime) GetAllPods() ([]*Pod, error) {
 	return pods, nil
 }
 
+// This is a empty implementation stating remoteclient not yet implemented
+func (r *LocalRuntime) GetPodsWithFilters(filters string) ([]*Pod, error) {
+	return nil, define.ErrNotImplemented
+}
+
 // GetPodsByStatus returns a slice of pods filtered by a libpod status
 func (r *LocalRuntime) GetPodsByStatus(statuses []string) ([]*Pod, error) {
 	podIDs, err := iopodman.GetPodsByStatus().Call(r.Conn, statuses)
diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go
index f93c8f8d5..27ec64d89 100644
--- a/pkg/api/handlers/libpod/pods.go
+++ b/pkg/api/handlers/libpod/pods.go
@@ -103,7 +103,6 @@ func PodCreate(w http.ResponseWriter, r *http.Request) {
 
 func Pods(w http.ResponseWriter, r *http.Request) {
 	var (
-		runtime        = r.Context().Value("runtime").(*libpod.Runtime)
 		podInspectData []*libpod.PodInspect
 	)
 	decoder := r.Context().Value("decoder").(*schema.Decoder)
@@ -118,12 +117,8 @@ func Pods(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if len(query.Filters) > 0 {
-		utils.Error(w, "filters are not implemented yet", http.StatusInternalServerError, define.ErrNotImplemented)
-		return
-	}
+	pods, err := utils.GetPods(w, r)
 
-	pods, err := runtime.GetAllPods()
 	if err != nil {
 		utils.Error(w, "Something went wrong", http.StatusInternalServerError, err)
 		return
diff --git a/pkg/api/handlers/utils/pods.go b/pkg/api/handlers/utils/pods.go
new file mode 100644
index 000000000..266ad9a4b
--- /dev/null
+++ b/pkg/api/handlers/utils/pods.go
@@ -0,0 +1,45 @@
+package utils
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/containers/libpod/cmd/podman/shared"
+	"github.com/containers/libpod/libpod"
+	"github.com/gorilla/schema"
+)
+
+func GetPods(w http.ResponseWriter, r *http.Request) ([]*libpod.Pod, error) {
+	runtime := r.Context().Value("runtime").(*libpod.Runtime)
+	decoder := r.Context().Value("decoder").(*schema.Decoder)
+
+	query := struct {
+		All     bool
+		Filters map[string][]string `schema:"filters"`
+		Digests bool
+	}{}
+
+	if err := decoder.Decode(&query, r.URL.Query()); err != nil {
+		return nil, err
+	}
+	var filters = []string{}
+	if _, found := r.URL.Query()["digests"]; found && query.Digests {
+		UnSupportedParameter("digests")
+	}
+
+	if len(query.Filters) > 0 {
+		for k, v := range query.Filters {
+			for _, val := range v {
+				filters = append(filters, fmt.Sprintf("%s=%s", k, val))
+			}
+		}
+		filterFuncs, err := shared.GenerateFilterFunction(runtime, filters)
+		if err != nil {
+			return nil, err
+		}
+		return shared.FilterAllPodsWithFilterFunc(runtime, filterFuncs...)
+	}
+
+	return runtime.GetAllPods()
+
+}
diff --git a/pkg/bindings/test/pods_test.go b/pkg/bindings/test/pods_test.go
index 7e29265b7..f6c4d465d 100644
--- a/pkg/bindings/test/pods_test.go
+++ b/pkg/bindings/test/pods_test.go
@@ -76,15 +76,66 @@ var _ = Describe("Podman pods", func() {
 		}
 		Expect(StringInSlice(newpod, names)).To(BeTrue())
 		Expect(StringInSlice("newpod2", names)).To(BeTrue())
+	})
 
-		// TODO not working  Because: code to list based on filter
-		// "not yet implemented",
-		// Validate list pod with filters
-		//filters := make(map[string][]string)
-		//filters["name"] = []string{newpod}
-		//filteredPods, err := pods.List(bt.conn, filters)
-		//Expect(err).To(BeNil())
-		//Expect(len(filteredPods)).To(BeNumerically("==", 1))
+	// The test validates the list pod endpoint with passing filters as the params.
+	It("List pods with filters", func() {
+		var newpod2 string = "newpod2"
+		bt.Podcreate(&newpod2)
+		_, err = bt.RunTopContainer(nil, &trueFlag, &newpod)
+		Expect(err).To(BeNil())
+
+		// Expected err with invalid filter params
+		filters := make(map[string][]string)
+		filters["dummy"] = []string{"dummy"}
+		filteredPods, err := pods.List(bt.conn, filters)
+		Expect(err).ToNot(BeNil())
+		code, _ := bindings.CheckResponseCode(err)
+		Expect(code).To(BeNumerically("==", http.StatusInternalServerError))
+
+		// Expected empty response with invalid filters
+		filters = make(map[string][]string)
+		filters["name"] = []string{"dummy"}
+		filteredPods, err = pods.List(bt.conn, filters)
+		Expect(err).To(BeNil())
+		Expect(len(filteredPods)).To(BeNumerically("==", 0))
+
+		// Validate list pod with name filter
+		filters = make(map[string][]string)
+		filters["name"] = []string{newpod2}
+		filteredPods, err = pods.List(bt.conn, filters)
+		Expect(err).To(BeNil())
+		Expect(len(filteredPods)).To(BeNumerically("==", 1))
+		var names []string
+		for _, i := range filteredPods {
+			names = append(names, i.Config.Name)
+		}
+		Expect(StringInSlice("newpod2", names)).To(BeTrue())
+
+		// Validate list pod with id filter
+		filters = make(map[string][]string)
+		response, err := pods.Inspect(bt.conn, newpod)
+		id := response.Config.ID
+		filters["id"] = []string{id}
+		filteredPods, err = pods.List(bt.conn, filters)
+		Expect(err).To(BeNil())
+		Expect(len(filteredPods)).To(BeNumerically("==", 1))
+		names = names[:0]
+		for _, i := range filteredPods {
+			names = append(names, i.Config.Name)
+		}
+		Expect(StringInSlice("newpod", names)).To(BeTrue())
+
+		// Using multiple filters
+		filters["name"] = []string{newpod}
+		filteredPods, err = pods.List(bt.conn, filters)
+		Expect(err).To(BeNil())
+		Expect(len(filteredPods)).To(BeNumerically("==", 1))
+		names = names[:0]
+		for _, i := range filteredPods {
+			names = append(names, i.Config.Name)
+		}
+		Expect(StringInSlice("newpod", names)).To(BeTrue())
 	})
 
 	// The test validates if the exists responds