From 09049fc3576dc39a74db8eced81849ec0b1a3baa Mon Sep 17 00:00:00 2001
From: Mrunal Patel <mpatel@redhat.com>
Date: Thu, 13 Oct 2016 10:07:36 -0700
Subject: [PATCH] Filter containers by id, pod id and state in container list

Signed-off-by: Mrunal Patel <mpatel@redhat.com>
---
 server/container.go | 51 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/server/container.go b/server/container.go
index 08ed4b06..da8da6b5 100644
--- a/server/container.go
+++ b/server/container.go
@@ -411,10 +411,54 @@ func (s *Server) RemoveContainer(ctx context.Context, req *pb.RemoveContainerReq
 	return &pb.RemoveContainerResponse{}, nil
 }
 
+// filterContainer returns whether passed container matches filtering criteria
+func filterContainer(c *pb.Container, filter *pb.ContainerFilter) bool {
+	if filter != nil {
+		if filter.State != nil {
+			if *c.State != *filter.State {
+				return false
+			}
+		}
+		// TODO(mrunalp): Add support for label filtering
+	}
+	return true
+}
+
 // ListContainers lists all containers by filters.
 func (s *Server) ListContainers(ctx context.Context, req *pb.ListContainersRequest) (*pb.ListContainersResponse, error) {
 	var ctrs []*pb.Container
-	for _, ctr := range s.state.containers.List() {
+	filter := req.Filter
+	ctrList := s.state.containers.List()
+
+	// Filter using container id and pod id first.
+	if filter != nil {
+		if filter.Id != nil {
+			c := s.state.containers.Get(*filter.Id)
+			if c != nil {
+				if filter.PodSandboxId != nil {
+					if c.Sandbox() == *filter.PodSandboxId {
+						ctrList = []*oci.Container{c}
+					} else {
+						ctrList = []*oci.Container{}
+					}
+
+				} else {
+					ctrList = []*oci.Container{c}
+				}
+			}
+		} else {
+			if filter.PodSandboxId != nil {
+				pod := s.state.sandboxes[*filter.PodSandboxId]
+				if pod == nil {
+					ctrList = []*oci.Container{}
+				} else {
+					ctrList = pod.containers.List()
+				}
+			}
+		}
+	}
+
+	for _, ctr := range ctrList {
 		if err := s.runtime.UpdateStatus(ctr); err != nil {
 			return nil, err
 		}
@@ -441,7 +485,10 @@ func (s *Server) ListContainers(ctx context.Context, req *pb.ListContainersReque
 		}
 		c.State = &rState
 
-		ctrs = append(ctrs, c)
+		// Filter by other criteria such as state and labels.
+		if filterContainer(c, req.Filter) {
+			ctrs = append(ctrs, c)
+		}
 	}
 
 	return &pb.ListContainersResponse{