3 files changed, 97 insertions, 5 deletions

diff --git a/pkg/api/handlers/utils/handler.go b/pkg/api/handlers/utils/handler.go
index 32b8c5b0a..b5bd488fb 100644
--- a/pkg/api/handlers/utils/handler.go
+++ b/pkg/api/handlers/utils/handler.go
@@ -46,6 +46,13 @@ func WriteResponse(w http.ResponseWriter, code int, value interface{}) {
 		if _, err := io.Copy(w, v); err != nil {
 			logrus.Errorf("unable to copy to response: %q", err)
 		}
+	case io.Reader:
+		w.Header().Set("Content-Type", "application/x-tar")
+		w.WriteHeader(code)
+
+		if _, err := io.Copy(w, v); err != nil {
+			logrus.Errorf("unable to copy to response: %q", err)
+		}
 	default:
 		WriteJSON(w, code, value)
 	}
diff --git a/pkg/api/handlers/utils/images.go b/pkg/api/handlers/utils/images.go
index 696d5f745..1c67de9db 100644
--- a/pkg/api/handlers/utils/images.go
+++ b/pkg/api/handlers/utils/images.go
@@ -4,11 +4,52 @@ import (
 	"fmt"
 	"net/http"
 
+	"github.com/containers/image/v5/docker"
+	"github.com/containers/image/v5/storage"
+	"github.com/containers/image/v5/transports/alltransports"
+	"github.com/containers/image/v5/types"
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/image"
 	"github.com/gorilla/schema"
+	"github.com/pkg/errors"
 )
 
+// ParseDockerReference parses the specified image name to a
+// `types.ImageReference` and enforces it to refer to a docker-transport
+// reference.
+func ParseDockerReference(name string) (types.ImageReference, error) {
+	dockerPrefix := fmt.Sprintf("%s://", docker.Transport.Name())
+	imageRef, err := alltransports.ParseImageName(name)
+	if err == nil && imageRef.Transport().Name() != docker.Transport.Name() {
+		return nil, errors.Errorf("reference %q must be a docker reference", name)
+	} else if err != nil {
+		origErr := err
+		imageRef, err = alltransports.ParseImageName(fmt.Sprintf("%s%s", dockerPrefix, name))
+		if err != nil {
+			return nil, errors.Wrapf(origErr, "reference %q must be a docker reference", name)
+		}
+	}
+	return imageRef, nil
+}
+
+// ParseStorageReference parses the specified image name to a
+// `types.ImageReference` and enforces it to refer to a
+// containers-storage-transport reference.
+func ParseStorageReference(name string) (types.ImageReference, error) {
+	storagePrefix := fmt.Sprintf("%s:", storage.Transport.Name())
+	imageRef, err := alltransports.ParseImageName(name)
+	if err == nil && imageRef.Transport().Name() != docker.Transport.Name() {
+		return nil, errors.Errorf("reference %q must be a storage reference", name)
+	} else if err != nil {
+		origErr := err
+		imageRef, err = alltransports.ParseImageName(fmt.Sprintf("%s%s", storagePrefix, name))
+		if err != nil {
+			return nil, errors.Wrapf(origErr, "reference %q must be a storage reference", name)
+		}
+	}
+	return imageRef, nil
+}
+
 // GetImages is a common function used to get images for libpod and other compatibility
 // mechanisms
 func GetImages(w http.ResponseWriter, r *http.Request) ([]*image.Image, error) {
diff --git a/pkg/api/handlers/utils/pods.go b/pkg/api/handlers/utils/pods.go
index 266ad9a4b..d47053eda 100644
--- a/pkg/api/handlers/utils/pods.go
+++ b/pkg/api/handlers/utils/pods.go
@@ -6,10 +6,16 @@ import (
 
 	"github.com/containers/libpod/cmd/podman/shared"
 	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/gorilla/schema"
 )
 
-func GetPods(w http.ResponseWriter, r *http.Request) ([]*libpod.Pod, error) {
+func GetPods(w http.ResponseWriter, r *http.Request) ([]*entities.ListPodsReport, error) {
+	var (
+		lps    []*entities.ListPodsReport
+		pods   []*libpod.Pod
+		podErr error
+	)
 	runtime := r.Context().Value("runtime").(*libpod.Runtime)
 	decoder := r.Context().Value("decoder").(*schema.Decoder)
 
@@ -37,9 +43,47 @@ func GetPods(w http.ResponseWriter, r *http.Request) ([]*libpod.Pod, error) {
 		if err != nil {
 			return nil, err
 		}
-		return shared.FilterAllPodsWithFilterFunc(runtime, filterFuncs...)
+		pods, podErr = shared.FilterAllPodsWithFilterFunc(runtime, filterFuncs...)
+	} else {
+		pods, podErr = runtime.GetAllPods()
 	}
-
-	return runtime.GetAllPods()
-
+	if podErr != nil {
+		return nil, podErr
+	}
+	for _, pod := range pods {
+		status, err := pod.GetPodStatus()
+		if err != nil {
+			return nil, err
+		}
+		ctrs, err := pod.AllContainers()
+		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(),
+			Id:        pod.ID(),
+			Name:      pod.Name(),
+			Namespace: pod.Namespace(),
+			Status:    status,
+			InfraId:   infraId,
+		}
+		for _, ctr := range ctrs {
+			state, err := ctr.State()
+			if err != nil {
+				return nil, err
+			}
+			lp.Containers = append(lp.Containers, &entities.ListPodContainer{
+				Id:     ctr.ID(),
+				Names:  ctr.Name(),
+				Status: state.String(),
+			})
+		}
+		lps = append(lps, &lp)
+	}
+	return lps, nil
 }