5 files changed, 47 insertions, 33 deletions
diff --git a/pkg/domain/entities/network.go b/pkg/domain/entities/network.go
index d001553e0..9beeeb042 100644
--- a/pkg/domain/entities/network.go
+++ b/pkg/domain/entities/network.go
@@ -10,6 +10,7 @@ import (
 type NetworkListOptions struct {
 	Format string
 	Quiet  bool
+	Filter string
 }
 
 // NetworkListReport describes the results from listing networks
@@ -19,6 +20,7 @@ type NetworkListReport struct {
 
 // NetworkInspectOptions describes options for inspect networks
 type NetworkInspectOptions struct {
+	Format string
 }
 
 // NetworkInspectReport describes the results from inspect networks
diff --git a/pkg/domain/infra/abi/network.go b/pkg/domain/infra/abi/network.go
index dfde3a939..8e3515824 100644
--- a/pkg/domain/infra/abi/network.go
+++ b/pkg/domain/infra/abi/network.go
@@ -6,7 +6,9 @@ import (
 	"fmt"
 	"io/ioutil"
 	"path/filepath"
+	"strings"
 
+	"github.com/containernetworking/cni/libcni"
 	cniversion "github.com/containernetworking/cni/pkg/version"
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/pkg/domain/entities"
@@ -28,8 +30,19 @@ func (ic *ContainerEngine) NetworkList(ctx context.Context, options entities.Net
 		return nil, err
 	}
 
+	var tokens []string
+	// tokenize the networkListOptions.Filter in key=value.
+	if len(options.Filter) > 0 {
+		tokens = strings.Split(options.Filter, "=")
+		if len(tokens) != 2 {
+			return nil, fmt.Errorf("invalid filter syntax : %s", options.Filter)
+		}
+	}
+
 	for _, n := range networks {
-		reports = append(reports, &entities.NetworkListReport{NetworkConfigList: n})
+		if ifPassesFilterTest(n, tokens) {
+			reports = append(reports, &entities.NetworkListReport{NetworkConfigList: n})
+		}
 	}
 	return reports, nil
 }
@@ -255,3 +268,25 @@ func createMacVLAN(r *libpod.Runtime, name string, options entities.NetworkCreat
 	err = ioutil.WriteFile(cniPathName, b, 0644)
 	return cniPathName, err
 }
+
+func ifPassesFilterTest(netconf *libcni.NetworkConfigList, filter []string) bool {
+	result := false
+	if len(filter) == 0 {
+		// No filter, so pass
+		return true
+	}
+	switch strings.ToLower(filter[0]) {
+	case "name":
+		if filter[1] == netconf.Name {
+			result = true
+		}
+	case "plugin":
+		plugins := network.GetCNIPlugins(netconf)
+		if strings.Contains(plugins, filter[1]) {
+			result = true
+		}
+	default:
+		result = false
+	}
+	return result
+}
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 17f98e9d1..dcaac99f2 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -327,7 +327,7 @@ func (ic *ContainerEngine) ContainerLogs(ctx context.Context, containers []strin
 }
 
 func (ic *ContainerEngine) ContainerAttach(ctx context.Context, nameOrId string, options entities.AttachOptions) error {
-	return containers.Attach(ic.ClientCxt, nameOrId, &options.DetachKeys, nil, bindings.PTrue, options.Stdin, options.Stdout, options.Stderr)
+	return containers.Attach(ic.ClientCxt, nameOrId, &options.DetachKeys, nil, bindings.PTrue, options.Stdin, options.Stdout, options.Stderr, nil)
 }
 
 func (ic *ContainerEngine) ContainerExec(ctx context.Context, nameOrId string, options entities.ExecOptions) (int, error) {
@@ -336,11 +336,14 @@ func (ic *ContainerEngine) ContainerExec(ctx context.Context, nameOrId string, o
 
 func startAndAttach(ic *ContainerEngine, name string, detachKeys *string, input, output, errput *os.File) error { //nolint
 	attachErr := make(chan error)
+	attachReady := make(chan bool)
 	go func() {
-		err := containers.Attach(ic.ClientCxt, name, detachKeys, bindings.PFalse, bindings.PTrue, input, output, errput)
+		err := containers.Attach(ic.ClientCxt, name, detachKeys, bindings.PFalse, bindings.PTrue, input, output, errput, attachReady)
 		attachErr <- err
 	}()
-
+	// Wait for the attach to actually happen before starting
+	// the container.
+	<-attachReady
 	if err := containers.Start(ic.ClientCxt, name, detachKeys); err != nil {
 		return err
 	}
diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go
index 5a849d362..4d00d331b 100644
--- a/pkg/domain/infra/tunnel/images.go
+++ b/pkg/domain/infra/tunnel/images.go
@@ -190,7 +190,6 @@ func (ir *ImageEngine) Save(ctx context.Context, nameOrId string, tags []string,
 		f   *os.File
 		err error
 	)
-
 	switch options.Format {
 	case "oci-dir", "docker-dir":
 		f, err = ioutil.TempFile("", "podman_save")
diff --git a/pkg/domain/infra/tunnel/manifest.go b/pkg/domain/infra/tunnel/manifest.go
index 9c1f5349a..beac378fe 100644
--- a/pkg/domain/infra/tunnel/manifest.go
+++ b/pkg/domain/infra/tunnel/manifest.go
@@ -57,46 +57,21 @@ func (ir *ImageEngine) ManifestAdd(ctx context.Context, opts entities.ManifestAd
 		}
 		manifestAddOpts.Annotation = annotations
 	}
-	listID, err := manifests.Add(ctx, opts.Images[1], manifestAddOpts)
+	listID, err := manifests.Add(ir.ClientCxt, opts.Images[1], manifestAddOpts)
 	if err != nil {
 		return listID, errors.Wrapf(err, "error adding to manifest list %s", opts.Images[1])
 	}
 	return listID, nil
 }
 
-// FIXME There is no endpoint for annotate and therefor this code is currently invalid
 // ManifestAnnotate updates an entry of the manifest list
 func (ir *ImageEngine) ManifestAnnotate(ctx context.Context, names []string, opts entities.ManifestAnnotateOptions) (string, error) {
 	return "", errors.New("not implemented")
-	//	manifestAnnotateOpts := image.ManifestAnnotateOpts{
-	//		Arch:       opts.Arch,
-	//		Features:   opts.Features,
-	//		OS:         opts.OS,
-	//		OSFeatures: opts.OSFeatures,
-	//		OSVersion:  opts.OSVersion,
-	//		Variant:    opts.Variant,
-	//	}
-	//	if len(opts.Annotation) > 0 {
-	//		annotations := make(map[string]string)
-	//		for _, annotationSpec := range opts.Annotation {
-	//			spec := strings.SplitN(annotationSpec, "=", 2)
-	//			if len(spec) != 2 {
-	//				return "", errors.Errorf("no value given for annotation %q", spec[0])
-	//			}
-	//			annotations[spec[0]] = spec[1]
-	//		}
-	//		manifestAnnotateOpts.Annotation = annotations
-	//	}
-	//	updatedListID, err := manifests.Annotate(ctx, names[0], names[1], manifestAnnotateOpts)
-	//	if err != nil {
-	//		return updatedListID, errors.Wrapf(err, "error annotating %s of manifest list %s", names[1], names[0])
-	//	}
-	//	return fmt.Sprintf("%s :%s", updatedListID, names[1]), nil
 }
 
 // ManifestRemove removes the digest from manifest list
 func (ir *ImageEngine) ManifestRemove(ctx context.Context, names []string) (string, error) {
-	updatedListID, err := manifests.Remove(ctx, names[0], names[1])
+	updatedListID, err := manifests.Remove(ir.ClientCxt, names[0], names[1])
 	if err != nil {
 		return updatedListID, errors.Wrapf(err, "error removing from manifest %s", names[0])
 	}
@@ -105,6 +80,6 @@ func (ir *ImageEngine) ManifestRemove(ctx context.Context, names []string) (stri
 
 // ManifestPush pushes a manifest list or image index to the destination
 func (ir *ImageEngine) ManifestPush(ctx context.Context, names []string, opts entities.ManifestPushOptions) error {
-	_, err := manifests.Push(ctx, names[0], &names[1], &opts.All)
+	_, err := manifests.Push(ir.ClientCxt, names[0], &names[1], &opts.All)
 	return err
 }