enable load integration tests

fix bug where multiple images can be loaded and have to be able to handle the return of multiple names

Signed-off-by: Brent Baude <bbaude@redhat.com>

5 files changed, 15 insertions, 12 deletions

diff --git a/cmd/podman/images/load.go b/cmd/podman/images/load.go
index 23c657b59..f49f95002 100644
--- a/cmd/podman/images/load.go
+++ b/cmd/podman/images/load.go
@@ -6,6 +6,7 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"strings"
 
 	"github.com/containers/image/v5/docker/reference"
 	"github.com/containers/libpod/cmd/podman/parse"
@@ -89,6 +90,6 @@ func load(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	fmt.Println("Loaded image: " + response.Name)
+	fmt.Println("Loaded image(s): " + strings.Join(response.Names, ","))
 	return nil
 }
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go
index 760ab1b7c..f7be5ce9a 100644
--- a/pkg/api/handlers/libpod/images.go
+++ b/pkg/api/handlers/libpod/images.go
@@ -283,7 +283,7 @@ func ImagesLoad(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	}
-	utils.WriteResponse(w, http.StatusOK, entities.ImageLoadReport{Name: loadedImage})
+	utils.WriteResponse(w, http.StatusOK, entities.ImageLoadReport{Names: split})
 }
 
 func ImagesImport(w http.ResponseWriter, r *http.Request) {
diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go
index 773cd90b4..460965b34 100644
--- a/pkg/domain/entities/images.go
+++ b/pkg/domain/entities/images.go
@@ -256,7 +256,7 @@ type ImageLoadOptions struct {
 }
 
 type ImageLoadReport struct {
-	Name string
+	Names []string
 }
 
 type ImageImportOptions struct {
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index 64d9c9f12..724bc5343 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -326,16 +326,19 @@ func (ir *ImageEngine) Load(ctx context.Context, opts entities.ImageLoadOptions)
 	if err != nil {
 		return nil, err
 	}
-	newImage, err := ir.Libpod.ImageRuntime().NewFromLocal(name)
-	if err != nil {
-		return nil, errors.Wrap(err, "image loaded but no additional tags were created")
-	}
-	if len(opts.Name) > 0 {
-		if err := newImage.TagImage(fmt.Sprintf("%s:%s", opts.Name, opts.Tag)); err != nil {
-			return nil, errors.Wrapf(err, "error adding %q to image %q", opts.Name, newImage.InputName)
+	names := strings.Split(name, ",")
+	if len(names) <= 1 {
+		newImage, err := ir.Libpod.ImageRuntime().NewFromLocal(name)
+		if err != nil {
+			return nil, errors.Wrap(err, "image loaded but no additional tags were created")
+		}
+		if len(opts.Name) > 0 {
+			if err := newImage.TagImage(fmt.Sprintf("%s:%s", opts.Name, opts.Tag)); err != nil {
+				return nil, errors.Wrapf(err, "error adding %q to image %q", opts.Name, newImage.InputName)
+			}
 		}
 	}
-	return &entities.ImageLoadReport{Name: name}, nil
+	return &entities.ImageLoadReport{Names: names}, nil
 }
 
 func (ir *ImageEngine) Import(ctx context.Context, opts entities.ImageImportOptions) (*entities.ImageImportReport, error) {
diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go
index 6b6d3820a..9a2cee9e1 100644
--- a/test/e2e/load_test.go
+++ b/test/e2e/load_test.go
@@ -20,7 +20,6 @@ var _ = Describe("Podman load", func() {
 	)
 
 	BeforeEach(func() {
-		Skip(v2fail)
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
 			os.Exit(1)