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

Added helper function for libpod pod api calls

Browse Source 
Signed-off-by: haircommander <pehunt@redhat.com>

Closes: #1275
Approved by: mheon
This commit is contained in:
haircommander
2018-08-16 11:41:53 -04:00
committed by Atomic Bot
parent 309a2a15ae
commit c4fadaba6b
3 changed files with 38 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/shared/pod.go
View File

@ -1,7 +1,7 @@
package shared
import (
"github.com/projectatomic/libpod/libpod"
"github.com/containers/libpod/libpod"
)
const (

90
pkg/varlinkapi/pods.go
View File

@ -4,9 +4,9 @@ import (
"encoding/json"
"syscall"
"github.com/projectatomic/libpod/cmd/podman/shared"
"github.com/projectatomic/libpod/cmd/podman/varlink"
"github.com/projectatomic/libpod/libpod"
"github.com/containers/libpod/cmd/podman/shared"
"github.com/containers/libpod/cmd/podman/varlink"
"github.com/containers/libpod/libpod"
)
// CreatePod ...
@ -91,18 +91,10 @@ func (i *LibpodAPI) StartPod(call iopodman.VarlinkCall, name string) error {
return call.ReplyPodNotFound(name)
}
ctrErrs, err := pod.Start(getContext())
if err != nil && ctrErrs == nil {
return call.ReplyErrorOccurred(err.Error())
callErr := handlePodCall(call, pod, ctrErrs, err)
if callErr != nil {
return err
}
if ctrErrs != nil {
containerErrs := make([]iopodman.PodContainerErrorData, len(ctrErrs))
for ctr, reason := range ctrErrs {
ctrErr := iopodman.PodContainerErrorData{Containerid: ctr, Reason: reason.Error()}
containerErrs = append(containerErrs, ctrErr)
}
return call.ReplyPodContainerError(pod.ID(), containerErrs)
}
return call.ReplyStartPod(pod.ID())
}
@ -113,18 +105,10 @@ func (i *LibpodAPI) StopPod(call iopodman.VarlinkCall, name string) error {
return call.ReplyPodNotFound(name)
}
ctrErrs, err := pod.Stop(true)
if err != nil && ctrErrs == nil {
return call.ReplyErrorOccurred(err.Error())
callErr := handlePodCall(call, pod, ctrErrs, err)
if callErr != nil {
return err
}
if ctrErrs != nil {
containerErrs := make([]iopodman.PodContainerErrorData, len(ctrErrs))
for ctr, reason := range ctrErrs {
ctrErr := iopodman.PodContainerErrorData{Containerid: ctr, Reason: reason.Error()}
containerErrs = append(containerErrs, ctrErr)
}
return call.ReplyPodContainerError(pod.ID(), containerErrs)
}
return call.ReplyStopPod(pod.ID())
}
@ -135,18 +119,10 @@ func (i *LibpodAPI) RestartPod(call iopodman.VarlinkCall, name string) error {
return call.ReplyPodNotFound(name)
}
ctrErrs, err := pod.Restart(getContext())
if err != nil && ctrErrs == nil {
return call.ReplyErrorOccurred(err.Error())
callErr := handlePodCall(call, pod, ctrErrs, err)
if callErr != nil {
return err
}
if ctrErrs != nil {
containerErrs := make([]iopodman.PodContainerErrorData, len(ctrErrs))
for ctr, reason := range ctrErrs {
ctrErr := iopodman.PodContainerErrorData{Containerid: ctr, Reason: reason.Error()}
containerErrs = append(containerErrs, ctrErr)
}
return call.ReplyPodContainerError(pod.ID(), containerErrs)
}
return call.ReplyRestartPod(pod.ID())
}
@ -163,18 +139,10 @@ func (i *LibpodAPI) KillPod(call iopodman.VarlinkCall, name string, signal int64
return call.ReplyPodNotFound(name)
}
ctrErrs, err := pod.Kill(killSignal)
if err != nil && ctrErrs == nil {
return call.ReplyErrorOccurred(err.Error())
callErr := handlePodCall(call, pod, ctrErrs, err)
if callErr != nil {
return err
}
if ctrErrs != nil {
containerErrs := make([]iopodman.PodContainerErrorData, len(ctrErrs))
for ctr, reason := range ctrErrs {
ctrErr := iopodman.PodContainerErrorData{Containerid: ctr, Reason: reason.Error()}
containerErrs = append(containerErrs, ctrErr)
}
return call.ReplyPodContainerError(pod.ID(), containerErrs)
}
return call.ReplyKillPod(pod.ID())
}
@ -185,18 +153,10 @@ func (i *LibpodAPI) PausePod(call iopodman.VarlinkCall, name string) error {
return call.ReplyPodNotFound(name)
}
ctrErrs, err := pod.Pause()
if err != nil && ctrErrs == nil {
return call.ReplyErrorOccurred(err.Error())
callErr := handlePodCall(call, pod, ctrErrs, err)
if callErr != nil {
return err
}
if ctrErrs != nil {
containerErrs := make([]iopodman.PodContainerErrorData, len(ctrErrs))
for ctr, reason := range ctrErrs {
ctrErr := iopodman.PodContainerErrorData{Containerid: ctr, Reason: reason.Error()}
containerErrs = append(containerErrs, ctrErr)
}
return call.ReplyPodContainerError(pod.ID(), containerErrs)
}
return call.ReplyPausePod(pod.ID())
}
@ -207,18 +167,10 @@ func (i *LibpodAPI) UnpausePod(call iopodman.VarlinkCall, name string) error {
return call.ReplyPodNotFound(name)
}
ctrErrs, err := pod.Unpause()
if err != nil && ctrErrs == nil {
return call.ReplyErrorOccurred(err.Error())
callErr := handlePodCall(call, pod, ctrErrs, err)
if callErr != nil {
return err
}
if ctrErrs != nil {
containerErrs := make([]iopodman.PodContainerErrorData, len(ctrErrs))
for ctr, reason := range ctrErrs {
ctrErr := iopodman.PodContainerErrorData{Containerid: ctr, Reason: reason.Error()}
containerErrs = append(containerErrs, ctrErr)
}
return call.ReplyPodContainerError(pod.ID(), containerErrs)
}
return call.ReplyUnpausePod(pod.ID())
}

16
pkg/varlinkapi/util.go
View File

@ -117,3 +117,19 @@ func makeListPod(pod *libpod.Pod, batchInfo shared.PsOptions) (iopodman.ListPodD
}
return listPod, nil
}
func handlePodCall(call iopodman.VarlinkCall, pod *libpod.Pod, ctrErrs map[string]error, err error) error {
if err != nil && ctrErrs == nil {
return call.ReplyErrorOccurred(err.Error())
}
if ctrErrs != nil {
containerErrs := make([]iopodman.PodContainerErrorData, len(ctrErrs))
for ctr, reason := range ctrErrs {
ctrErr := iopodman.PodContainerErrorData{Containerid: ctr, Reason: reason.Error()}
containerErrs = append(containerErrs, ctrErr)
}
return call.ReplyPodContainerError(pod.ID(), containerErrs)
}
return nil
}