opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 09:58:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use abi PodPs implementation for libpod/pods/json endpoint

Browse Source 
This removes unnecessary code duplication.

Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
This commit is contained in:
Paul Holzinger
2021-01-09 23:38:26 +01:00
parent 38baf3d5e2
commit 82bce7d906
2 changed files with 6 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/api/handlers/libpod/pods.go
View File

@ -43,6 +43,7 @@ func PodCreate(w http.ResponseWriter, r *http.Request) {
} }
func Pods(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) decoder := r.Context().Value("decoder").(*schema.Decoder)
query := struct { query := struct {
Filters map[string][]string `schema:"filters"` Filters map[string][]string `schema:"filters"`
@ -55,7 +56,11 @@ func Pods(w http.ResponseWriter, r *http.Request) {
return 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 { if err != nil {
utils.Error(w, "Something went wrong", http.StatusInternalServerError, err) utils.Error(w, "Something went wrong", http.StatusInternalServerError, err)
return return

87
pkg/api/handlers/utils/pods.go
View File

@ -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
}