3 files changed, 112 insertions, 2 deletions

diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index d25af24c5..172c7d1a3 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -243,7 +243,7 @@ func (ic *ContainerEngine) ContainerRm(ctx context.Context, namesOrIds []string,
 	return reports, nil
 }
 
-func (ic *ContainerEngine) ContainerInspect(ctx context.Context, namesOrIds []string, options entities.ContainerInspectOptions) ([]*entities.ContainerInspectReport, error) {
+func (ic *ContainerEngine) ContainerInspect(ctx context.Context, namesOrIds []string, options entities.InspectOptions) ([]*entities.ContainerInspectReport, error) {
 	var reports []*entities.ContainerInspectReport
 	ctrs, err := shortcuts.GetContainersByContext(false, options.Latest, namesOrIds, ic.Libpod)
 	if err != nil {
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index ef2879246..5a7acb2f7 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -17,6 +17,7 @@ import (
 	"github.com/containers/libpod/libpod/image"
 	libpodImage "github.com/containers/libpod/libpod/image"
 	"github.com/containers/libpod/pkg/domain/entities"
+	domainUtils "github.com/containers/libpod/pkg/domain/utils"
 	"github.com/containers/libpod/pkg/util"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
@@ -234,6 +235,31 @@ func (ir *ImageEngine) Pull(ctx context.Context, rawImage string, options entiti
 	return &entities.ImagePullReport{Images: foundIDs}, nil
 }
 
+func (ir *ImageEngine) Inspect(ctx context.Context, names []string, opts entities.InspectOptions) (*entities.ImageInspectReport, error) {
+	report := entities.ImageInspectReport{
+		Errors: make(map[string]error),
+	}
+
+	for _, id := range names {
+		img, err := ir.Libpod.ImageRuntime().NewFromLocal(id)
+		if err != nil {
+			report.Errors[id] = err
+			continue
+		}
+
+		results, err := img.Inspect(ctx)
+		if err != nil {
+			report.Errors[id] = err
+			continue
+		}
+
+		cookedResults := entities.ImageData{}
+		_ = domainUtils.DeepCopy(&cookedResults, results)
+		report.Images = append(report.Images, &cookedResults)
+	}
+	return &report, nil
+}
+
 // func (r *imageRuntime) Delete(ctx context.Context, nameOrId string, opts entities.ImageDeleteOptions) (*entities.ImageDeleteReport, error) {
 // 	image, err := r.libpod.ImageEngine().NewFromLocal(nameOrId)
 // 	if err != nil {
@@ -246,7 +272,7 @@ func (ir *ImageEngine) Pull(ctx context.Context, rawImage string, options entiti
 // 	}
 //
 // 	report := entities.ImageDeleteReport{}
-// 	if err := utils.DeepCopy(&report, results); err != nil {
+// 	if err := domainUtils.DeepCopy(&report, results); err != nil {
 // 		return nil, err
 // 	}
 // 	return &report, nil
@@ -264,3 +290,28 @@ func (ir *ImageEngine) Pull(ctx context.Context, rawImage string, options entiti
 // 	copy(report.Report.Id, id)
 // 	return &report, nil
 // }
+
+func (ir *ImageEngine) Tag(ctx context.Context, nameOrId string, tags []string, options entities.ImageTagOptions) error {
+	newImage, err := ir.Libpod.ImageRuntime().NewFromLocal(nameOrId)
+	if err != nil {
+		return err
+	}
+	for _, tag := range tags {
+		if err := newImage.TagImage(tag); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+func (ir *ImageEngine) Untag(ctx context.Context, nameOrId string, tags []string, options entities.ImageUntagOptions) error {
+	newImage, err := ir.Libpod.ImageRuntime().NewFromLocal(nameOrId)
+	if err != nil {
+		return err
+	}
+	for _, tag := range tags {
+		if err := newImage.UntagImage(tag); err != nil {
+			return err
+		}
+	}
+	return nil
+}
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
+}