5 files changed, 82 insertions, 0 deletions
diff --git a/pkg/api/handlers/utils/pods.go b/pkg/api/handlers/utils/pods.go
index 79d1a5090..d47053eda 100644
--- a/pkg/api/handlers/utils/pods.go
+++ b/pkg/api/handlers/utils/pods.go
@@ -59,6 +59,10 @@ func GetPods(w http.ResponseWriter, r *http.Request) ([]*entities.ListPodsReport
 		if err != nil {
 			return nil, err
 		}
+		infraId, err := pod.InfraContainerID()
+		if err != nil {
+			return nil, err
+		}
 		lp := entities.ListPodsReport{
 			Cgroup:    pod.CgroupParent(),
 			Created:   pod.CreatedTime(),
@@ -66,6 +70,7 @@ func GetPods(w http.ResponseWriter, r *http.Request) ([]*entities.ListPodsReport
 			Name:      pod.Name(),
 			Namespace: pod.Namespace(),
 			Status:    status,
+			InfraId:   infraId,
 		}
 		for _, ctr := range ctrs {
 			state, err := ctr.State()
diff --git a/pkg/domain/entities/engine_container.go b/pkg/domain/entities/engine_container.go
index 77043b89e..0907a89af 100644
--- a/pkg/domain/entities/engine_container.go
+++ b/pkg/domain/entities/engine_container.go
@@ -22,6 +22,7 @@ type ContainerEngine interface {
 	PodExists(ctx context.Context, nameOrId string) (*BoolReport, error)
 	PodKill(ctx context.Context, namesOrIds []string, options PodKillOptions) ([]*PodKillReport, error)
 	PodPause(ctx context.Context, namesOrIds []string, options PodPauseOptions) ([]*PodPauseReport, error)
+	PodPs(ctx context.Context, options PodPSOptions) ([]*ListPodsReport, error)
 	PodRestart(ctx context.Context, namesOrIds []string, options PodRestartOptions) ([]*PodRestartReport, error)
 	PodStart(ctx context.Context, namesOrIds []string, options PodStartOptions) ([]*PodStartReport, error)
 	PodStop(ctx context.Context, namesOrIds []string, options PodStopOptions) ([]*PodStopReport, error)
diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go
index d92d1bc7a..a0b2c6cec 100644
--- a/pkg/domain/entities/pods.go
+++ b/pkg/domain/entities/pods.go
@@ -22,6 +22,7 @@ type ListPodsReport struct {
 	Containers []*ListPodContainer
 	Created    time.Time
 	Id         string
+	InfraId    string
 	Name       string
 	Namespace  string
 	Status     string
@@ -151,3 +152,15 @@ type PodTopOptions struct {
 	Descriptors []string
 	NameOrID    string
 }
+
+type PodPSOptions struct {
+	CtrNames  bool
+	CtrIds    bool
+	CtrStatus bool
+	Filters   map[string][]string
+	Format    string
+	Latest    bool
+	Namespace bool
+	Quiet     bool
+	Sort      string
+}
diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go
index 8abcc6e4b..494a048ec 100644
--- a/pkg/domain/infra/abi/pods.go
+++ b/pkg/domain/infra/abi/pods.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/libpod/podfilters"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/containers/libpod/pkg/signal"
 	"github.com/containers/libpod/pkg/specgen"
@@ -272,3 +273,61 @@ func (ic *ContainerEngine) PodTop(ctx context.Context, options entities.PodTopOp
 	report.Value, err = pod.GetPodPidInformation(options.Descriptors)
 	return report, err
 }
+
+func (ic *ContainerEngine) PodPs(ctx context.Context, options entities.PodPSOptions) ([]*entities.ListPodsReport, error) {
+	var (
+		filters []libpod.PodFilter
+		reports []*entities.ListPodsReport
+	)
+	for k, v := range options.Filters {
+		for _, filter := range v {
+			f, err := podfilters.GeneratePodFilterFunc(k, filter)
+			if err != nil {
+				return nil, err
+			}
+			filters = append(filters, f)
+
+		}
+	}
+	pds, err := ic.Libpod.Pods(filters...)
+	if err != nil {
+		return nil, err
+	}
+	for _, p := range pds {
+		var lpcs []*entities.ListPodContainer
+		status, err := p.GetPodStatus()
+		if err != nil {
+			return nil, err
+		}
+		cons, err := p.AllContainers()
+		if err != nil {
+			return nil, err
+		}
+		for _, c := range cons {
+			state, err := c.State()
+			if err != nil {
+				return nil, err
+			}
+			lpcs = append(lpcs, &entities.ListPodContainer{
+				Id:     c.ID(),
+				Names:  c.Name(),
+				Status: state.String(),
+			})
+		}
+		infraId, err := p.InfraContainerID()
+		if err != nil {
+			return nil, err
+		}
+		reports = append(reports, &entities.ListPodsReport{
+			Cgroup:     p.CgroupParent(),
+			Containers: lpcs,
+			Created:    p.CreatedTime(),
+			Id:         p.ID(),
+			InfraId:    infraId,
+			Name:       p.Name(),
+			Namespace:  p.Namespace(),
+			Status:     status,
+		})
+	}
+	return reports, nil
+}
diff --git a/pkg/domain/infra/tunnel/pods.go b/pkg/domain/infra/tunnel/pods.go
index 9561a9807..ad87a0a29 100644
--- a/pkg/domain/infra/tunnel/pods.go
+++ b/pkg/domain/infra/tunnel/pods.go
@@ -193,3 +193,7 @@ func (ic *ContainerEngine) PodTop(ctx context.Context, options entities.PodTopOp
 	}
 	return &entities.StringSliceReport{Value: topOutput}, nil
 }
+
+func (ic *ContainerEngine) PodPs(ctx context.Context, options entities.PodPSOptions) ([]*entities.ListPodsReport, error) {
+	return pods.List(ic.ClientCxt, options.Filters)
+}