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>

2 files changed, 12 insertions, 9 deletions

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) {