2 files changed, 224 insertions, 4 deletions
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index 203f14987..e3b3e310b 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -46,7 +46,7 @@ func (ir *ImageEngine) Delete(ctx context.Context, nameOrId []string, opts entit
 			err = ir.deleteImage(ctx, img, opts, report)
 			report.Errors = append(report.Errors, err)
 		}
-		if len(targets) >= 0 || len(previousTargets) != 1 {
+		if len(previousTargets) != 1 {
 			goto repeatRun
 		}
 		return &report, nil
@@ -83,9 +83,7 @@ func (ir *ImageEngine) deleteImage(ctx context.Context, img *libpodImage.Image,
 	}
 
 	report.Deleted = append(report.Deleted, results.Deleted)
-	for _, e := range results.Untagged {
-		report.Untagged = append(report.Untagged, e)
-	}
+	report.Untagged = append(report.Untagged, results.Untagged...)
 	return nil
 }
 
diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go
index 8dd7b5a0c..4f68ad5f9 100644
--- a/pkg/domain/infra/abi/pods.go
+++ b/pkg/domain/infra/abi/pods.go
@@ -5,11 +5,45 @@ package abi
 import (
 	"context"
 
+	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/pkg/signal"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 )
 
+// getPodsByContext returns a slice of pods. Note that all, latest and pods are
+// mutually exclusive arguments.
+func getPodsByContext(all, latest bool, pods []string, runtime *libpod.Runtime) ([]*libpod.Pod, error) {
+	var outpods []*libpod.Pod
+	if all {
+		return runtime.GetAllPods()
+	}
+	if latest {
+		p, err := runtime.GetLatestPod()
+		if err != nil {
+			return nil, err
+		}
+		outpods = append(outpods, p)
+		return outpods, nil
+	}
+	var err error
+	for _, p := range pods {
+		pod, e := runtime.LookupPod(p)
+		if e != nil {
+			// Log all errors here, so callers don't need to.
+			logrus.Debugf("Error looking up pod %q: %v", p, e)
+			if err == nil {
+				err = e
+			}
+		} else {
+			outpods = append(outpods, pod)
+		}
+	}
+	return outpods, err
+}
+
 func (ic *ContainerEngine) PodExists(ctx context.Context, nameOrId string) (*entities.BoolReport, error) {
 	_, err := ic.Libpod.LookupPod(nameOrId)
 	if err != nil && errors.Cause(err) != define.ErrNoSuchPod {
@@ -17,3 +51,191 @@ func (ic *ContainerEngine) PodExists(ctx context.Context, nameOrId string) (*ent
 	}
 	return &entities.BoolReport{Value: err == nil}, nil
 }
+
+func (ic *ContainerEngine) PodKill(ctx context.Context, namesOrIds []string, options entities.PodKillOptions) ([]*entities.PodKillReport, error) {
+	var (
+		reports []*entities.PodKillReport
+	)
+	sig, err := signal.ParseSignalNameOrNumber(options.Signal)
+	if err != nil {
+		return nil, err
+	}
+	pods, err := getPodsByContext(options.All, options.Latest, namesOrIds, ic.Libpod)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, p := range pods {
+		report := entities.PodKillReport{Id: p.ID()}
+		conErrs, err := p.Kill(uint(sig))
+		if err != nil {
+			report.Errs = []error{err}
+			reports = append(reports, &report)
+			continue
+		}
+		if len(conErrs) > 0 {
+			for _, err := range conErrs {
+				report.Errs = append(report.Errs, err)
+			}
+			reports = append(reports, &report)
+			continue
+		}
+		reports = append(reports, &report)
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) PodPause(ctx context.Context, namesOrIds []string, options entities.PodPauseOptions) ([]*entities.PodPauseReport, error) {
+	var (
+		reports []*entities.PodPauseReport
+	)
+	pods, err := getPodsByContext(options.All, options.Latest, namesOrIds, ic.Libpod)
+	if err != nil {
+		return nil, err
+	}
+	for _, p := range pods {
+		report := entities.PodPauseReport{Id: p.ID()}
+		errs, err := p.Pause()
+		if err != nil {
+			report.Errs = []error{err}
+			continue
+		}
+		if len(errs) > 0 {
+			for _, v := range errs {
+				report.Errs = append(report.Errs, v)
+			}
+			reports = append(reports, &report)
+			continue
+		}
+		reports = append(reports, &report)
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) PodUnpause(ctx context.Context, namesOrIds []string, options entities.PodunpauseOptions) ([]*entities.PodUnpauseReport, error) {
+	var (
+		reports []*entities.PodUnpauseReport
+	)
+	pods, err := getPodsByContext(options.All, options.Latest, namesOrIds, ic.Libpod)
+	if err != nil {
+		return nil, err
+	}
+	for _, p := range pods {
+		report := entities.PodUnpauseReport{Id: p.ID()}
+		errs, err := p.Unpause()
+		if err != nil {
+			report.Errs = []error{err}
+			continue
+		}
+		if len(errs) > 0 {
+			for _, v := range errs {
+				report.Errs = append(report.Errs, v)
+			}
+			reports = append(reports, &report)
+			continue
+		}
+		reports = append(reports, &report)
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) PodStop(ctx context.Context, namesOrIds []string, options entities.PodStopOptions) ([]*entities.PodStopReport, error) {
+	var (
+		reports []*entities.PodStopReport
+	)
+	pods, err := getPodsByContext(options.All, options.Latest, namesOrIds, ic.Libpod)
+	if err != nil {
+		return nil, err
+	}
+	for _, p := range pods {
+		report := entities.PodStopReport{Id: p.ID()}
+		errs, err := p.StopWithTimeout(ctx, false, options.Timeout)
+		if err != nil {
+			report.Errs = []error{err}
+			continue
+		}
+		if len(errs) > 0 {
+			for _, v := range errs {
+				report.Errs = append(report.Errs, v)
+			}
+			reports = append(reports, &report)
+			continue
+		}
+		reports = append(reports, &report)
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) PodRestart(ctx context.Context, namesOrIds []string, options entities.PodRestartOptions) ([]*entities.PodRestartReport, error) {
+	var (
+		reports []*entities.PodRestartReport
+	)
+	pods, err := getPodsByContext(options.All, options.Latest, namesOrIds, ic.Libpod)
+	if err != nil {
+		return nil, err
+	}
+	for _, p := range pods {
+		report := entities.PodRestartReport{Id: p.ID()}
+		errs, err := p.Restart(ctx)
+		if err != nil {
+			report.Errs = []error{err}
+			continue
+		}
+		if len(errs) > 0 {
+			for _, v := range errs {
+				report.Errs = append(report.Errs, v)
+			}
+			reports = append(reports, &report)
+			continue
+		}
+		reports = append(reports, &report)
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) PodStart(ctx context.Context, namesOrIds []string, options entities.PodStartOptions) ([]*entities.PodStartReport, error) {
+	var (
+		reports []*entities.PodStartReport
+	)
+	pods, err := getPodsByContext(options.All, options.Latest, namesOrIds, ic.Libpod)
+	if err != nil {
+		return nil, err
+	}
+	for _, p := range pods {
+		report := entities.PodStartReport{Id: p.ID()}
+		errs, err := p.Start(ctx)
+		if err != nil {
+			report.Errs = []error{err}
+			continue
+		}
+		if len(errs) > 0 {
+			for _, v := range errs {
+				report.Errs = append(report.Errs, v)
+			}
+			reports = append(reports, &report)
+			continue
+		}
+		reports = append(reports, &report)
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) PodRm(ctx context.Context, namesOrIds []string, options entities.PodRmOptions) ([]*entities.PodRmReport, error) {
+	var (
+		reports []*entities.PodRmReport
+	)
+	pods, err := getPodsByContext(options.All, options.Latest, namesOrIds, ic.Libpod)
+	if err != nil {
+		return nil, err
+	}
+	for _, p := range pods {
+		report := entities.PodRmReport{Id: p.ID()}
+		err := ic.Libpod.RemovePod(ctx, p, true, options.Force)
+		if err != nil {
+			report.Err = err
+			continue
+		}
+		reports = append(reports, &report)
+	}
+	return reports, nil
+}