Merge pull request #8920 from Luap99/ps-network-filter

podman ps/pod ps add network filter and .Networks format placeholder

8 files changed, 73 insertions, 90 deletions

diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go
index de373f05f..2409d3a20 100644
--- a/pkg/api/handlers/libpod/pods.go
+++ b/pkg/api/handlers/libpod/pods.go
@@ -43,6 +43,7 @@ func PodCreate(w http.ResponseWriter, r *http.Request) {
 }
 
 func Pods(w http.ResponseWriter, r *http.Request) {
+	runtime := r.Context().Value("runtime").(*libpod.Runtime)
 	decoder := r.Context().Value("decoder").(*schema.Decoder)
 	query := struct {
 		Filters map[string][]string `schema:"filters"`
@@ -55,7 +56,11 @@ func Pods(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	pods, err := utils.GetPods(w, r)
+	containerEngine := abi.ContainerEngine{Libpod: runtime}
+	podPSOptions := entities.PodPSOptions{
+		Filters: query.Filters,
+	}
+	pods, err := containerEngine.PodPs(r.Context(), podPSOptions)
 	if err != nil {
 		utils.Error(w, "Something went wrong", http.StatusInternalServerError, err)
 		return
diff --git a/pkg/api/handlers/utils/pods.go b/pkg/api/handlers/utils/pods.go
deleted file mode 100644
index 0fe3a308b..000000000
--- a/pkg/api/handlers/utils/pods.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package utils
-
-import (
-	"net/http"
-
-	"github.com/containers/podman/v2/libpod"
-	"github.com/containers/podman/v2/pkg/domain/entities"
-	dfilters "github.com/containers/podman/v2/pkg/domain/filters"
-	"github.com/gorilla/schema"
-)
-
-func GetPods(w http.ResponseWriter, r *http.Request) ([]*entities.ListPodsReport, error) {
-	var (
-		pods []*libpod.Pod
-	)
-	runtime := r.Context().Value("runtime").(*libpod.Runtime)
-	decoder := r.Context().Value("decoder").(*schema.Decoder)
-
-	query := struct {
-		All     bool
-		Filters map[string][]string `schema:"filters"`
-		Digests bool
-	}{}
-
-	if err := decoder.Decode(&query, r.URL.Query()); err != nil {
-		return nil, err
-	}
-	if _, found := r.URL.Query()["digests"]; found && query.Digests {
-		UnSupportedParameter("digests")
-	}
-
-	filters := make([]libpod.PodFilter, 0, len(query.Filters))
-	for k, v := range query.Filters {
-		f, err := dfilters.GeneratePodFilterFunc(k, v)
-		if err != nil {
-			return nil, err
-		}
-		filters = append(filters, f)
-	}
-	pods, err := runtime.Pods(filters...)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(pods) == 0 {
-		return []*entities.ListPodsReport{}, nil
-	}
-
-	lps := make([]*entities.ListPodsReport, 0, len(pods))
-	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,
-			Labels:    pod.Labels(),
-		}
-		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
-}
diff --git a/pkg/domain/entities/container_ps.go b/pkg/domain/entities/container_ps.go
index ff3b087ed..6709ca48a 100644
--- a/pkg/domain/entities/container_ps.go
+++ b/pkg/domain/entities/container_ps.go
@@ -43,6 +43,8 @@ type ListContainer struct {
 	// Namespaces the container belongs to.  Requires the
 	// namespace boolean to be true
 	Namespaces ListContainerNamespaces
+	// The network names assigned to the container
+	Networks []string
 	// The process id of the container
 	Pid int
 	// If the container is part of Pod, the Pod ID. Requires the pod
diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go
index 426419833..edb0af15a 100644
--- a/pkg/domain/entities/pods.go
+++ b/pkg/domain/entities/pods.go
@@ -28,8 +28,10 @@ type ListPodsReport struct {
 	InfraId    string //nolint
 	Name       string
 	Namespace  string
-	Status     string
-	Labels     map[string]string
+	// Network names connected to infra container
+	Networks []string
+	Status   string
+	Labels   map[string]string
 }
 
 type ListPodContainer struct {
diff --git a/pkg/domain/filters/containers.go b/pkg/domain/filters/containers.go
index ce6c12b71..09ef6201a 100644
--- a/pkg/domain/filters/containers.go
+++ b/pkg/domain/filters/containers.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/containers/podman/v2/libpod"
 	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/network"
 	"github.com/containers/podman/v2/pkg/timetype"
 	"github.com/containers/podman/v2/pkg/util"
 	"github.com/pkg/errors"
@@ -233,6 +234,24 @@ func GenerateContainerFilterFuncs(filter string, filterValues []string, r *libpo
 			}
 			return false
 		}, nil
+	case "network":
+		return func(c *libpod.Container) bool {
+			networks, _, err := c.Networks()
+			// if err or no networks, quick out
+			if err != nil || len(networks) == 0 {
+				return false
+			}
+			for _, net := range networks {
+				netID := network.GetNetworkID(net)
+				for _, val := range filterValues {
+					// match by network name or id
+					if val == net || val == netID {
+						return true
+					}
+				}
+			}
+			return false
+		}, nil
 	}
 	return nil, errors.Errorf("%s is an invalid filter", filter)
 }
diff --git a/pkg/domain/filters/pods.go b/pkg/domain/filters/pods.go
index 7e6b7f2cc..685c182ba 100644
--- a/pkg/domain/filters/pods.go
+++ b/pkg/domain/filters/pods.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/containers/podman/v2/libpod"
 	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/network"
 	"github.com/containers/podman/v2/pkg/util"
 	"github.com/pkg/errors"
 )
@@ -134,6 +135,29 @@ func GeneratePodFilterFunc(filter string, filterValues []string) (
 			}
 			return true
 		}, nil
+	case "network":
+		return func(p *libpod.Pod) bool {
+			infra, err := p.InfraContainer()
+			// no infra, quick out
+			if err != nil {
+				return false
+			}
+			networks, _, err := infra.Networks()
+			// if err or no networks, quick out
+			if err != nil || len(networks) == 0 {
+				return false
+			}
+			for _, net := range networks {
+				netID := network.GetNetworkID(net)
+				for _, val := range filterValues {
+					// match by network name or id
+					if val == net || val == netID {
+						return true
+					}
+				}
+			}
+			return false
+		}, nil
 	}
 	return nil, errors.Errorf("%s is an invalid filter", filter)
 }
diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go
index f108b770c..2a8445c9f 100644
--- a/pkg/domain/infra/abi/pods.go
+++ b/pkg/domain/infra/abi/pods.go
@@ -333,6 +333,17 @@ func (ic *ContainerEngine) PodPs(ctx context.Context, options entities.PodPSOpti
 		if err != nil {
 			return nil, err
 		}
+		networks := []string{}
+		if len(infraID) > 0 {
+			infra, err := p.InfraContainer()
+			if err != nil {
+				return nil, err
+			}
+			networks, _, err = infra.Networks()
+			if err != nil {
+				return nil, err
+			}
+		}
 		reports = append(reports, &entities.ListPodsReport{
 			Cgroup:     p.CgroupParent(),
 			Containers: lpcs,
@@ -341,6 +352,7 @@ func (ic *ContainerEngine) PodPs(ctx context.Context, options entities.PodPSOpti
 			InfraId:    infraID,
 			Name:       p.Name(),
 			Namespace:  p.Namespace(),
+			Networks:   networks,
 			Status:     status,
 			Labels:     p.Labels(),
 		})
diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go
index 9e0dcb728..dc577890a 100644
--- a/pkg/ps/ps.go
+++ b/pkg/ps/ps.go
@@ -178,6 +178,11 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities
 		return entities.ListContainer{}, err
 	}
 
+	networks, _, err := ctr.Networks()
+	if err != nil {
+		return entities.ListContainer{}, err
+	}
+
 	ps := entities.ListContainer{
 		AutoRemove: ctr.AutoRemove(),
 		Command:    conConfig.Command,
@@ -192,6 +197,7 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities
 		Labels:     conConfig.Labels,
 		Mounts:     ctr.UserVolumes(),
 		Names:      []string{conConfig.Name},
+		Networks:   networks,
 		Pid:        pid,
 		Pod:        conConfig.Pod,
 		Ports:      portMappings,