podmanv2 pod subcommands

add pod kill, pause, restart, rm, start, stop, and unpause

Signed-off-by: Brent Baude <bbaude@redhat.com>

2 files changed, 78 insertions, 53 deletions

diff --git a/pkg/bindings/pods/pods.go b/pkg/bindings/pods/pods.go
index 1a8c31be1..49cce6e2b 100644
--- a/pkg/bindings/pods/pods.go
+++ b/pkg/bindings/pods/pods.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/pkg/bindings"
+	"github.com/containers/libpod/pkg/domain/entities"
 )
 
 func CreatePod() error {
@@ -44,10 +45,13 @@ func Inspect(ctx context.Context, nameOrID string) (*libpod.PodInspect, error) {
 
 // Kill sends a SIGTERM to all the containers in a pod.  The optional signal parameter
 // can be used to override  SIGTERM.
-func Kill(ctx context.Context, nameOrID string, signal *string) error {
+func Kill(ctx context.Context, nameOrID string, signal *string) (*entities.PodKillReport, error) {
+	var (
+		report entities.PodKillReport
+	)
 	conn, err := bindings.GetClient(ctx)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	params := url.Values{}
 	if signal != nil {
@@ -55,22 +59,23 @@ func Kill(ctx context.Context, nameOrID string, signal *string) error {
 	}
 	response, err := conn.DoRequest(nil, http.MethodPost, "/pods/%s/kill", params, nameOrID)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	return response.Process(nil)
+	return &report, response.Process(&report)
 }
 
 // Pause pauses all running containers in a given pod.
-func Pause(ctx context.Context, nameOrID string) error {
+func Pause(ctx context.Context, nameOrID string) (*entities.PodPauseReport, error) {
+	var report entities.PodPauseReport
 	conn, err := bindings.GetClient(ctx)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	response, err := conn.DoRequest(nil, http.MethodPost, "/pods/%s/pause", nil, nameOrID)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	return response.Process(nil)
+	return &report, response.Process(&report)
 }
 
 // Prune removes all non-running pods in local storage.
@@ -88,9 +93,9 @@ func Prune(ctx context.Context) error {
 
 // List returns all pods in local storage.  The optional filters parameter can
 // be used to refine which pods should be listed.
-func List(ctx context.Context, filters map[string][]string) ([]*libpod.PodInspect, error) {
+func List(ctx context.Context, filters map[string][]string) ([]*entities.ListPodsReport, error) {
 	var (
-		inspect []*libpod.PodInspect
+		podsReports []*entities.ListPodsReport
 	)
 	conn, err := bindings.GetClient(ctx)
 	if err != nil {
@@ -106,30 +111,32 @@ func List(ctx context.Context, filters map[string][]string) ([]*libpod.PodInspec
 	}
 	response, err := conn.DoRequest(nil, http.MethodGet, "/pods/json", params)
 	if err != nil {
-		return inspect, err
+		return podsReports, err
 	}
-	return inspect, response.Process(&inspect)
+	return podsReports, response.Process(&podsReports)
 }
 
 // Restart restarts all containers in a pod.
-func Restart(ctx context.Context, nameOrID string) error {
+func Restart(ctx context.Context, nameOrID string) (*entities.PodRestartReport, error) {
+	var report entities.PodRestartReport
 	conn, err := bindings.GetClient(ctx)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	response, err := conn.DoRequest(nil, http.MethodPost, "/pods/%s/restart", nil, nameOrID)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	return response.Process(nil)
+	return &report, response.Process(&report)
 }
 
 // Remove deletes a Pod from from local storage. The optional force parameter denotes
 // that the Pod can be removed even if in a running state.
-func Remove(ctx context.Context, nameOrID string, force *bool) error {
+func Remove(ctx context.Context, nameOrID string, force *bool) (*entities.PodRmReport, error) {
+	var report entities.PodRmReport
 	conn, err := bindings.GetClient(ctx)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	params := url.Values{}
 	if force != nil {
@@ -137,22 +144,27 @@ func Remove(ctx context.Context, nameOrID string, force *bool) error {
 	}
 	response, err := conn.DoRequest(nil, http.MethodDelete, "/pods/%s", params, nameOrID)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	return response.Process(nil)
+	return &report, response.Process(&report)
 }
 
 // Start starts all containers in a pod.
-func Start(ctx context.Context, nameOrID string) error {
+func Start(ctx context.Context, nameOrID string) (*entities.PodStartReport, error) {
+	var report entities.PodStartReport
 	conn, err := bindings.GetClient(ctx)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	response, err := conn.DoRequest(nil, http.MethodPost, "/pods/%s/start", nil, nameOrID)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	return response.Process(nil)
+	if response.StatusCode == http.StatusNotModified {
+		report.Id = nameOrID
+		return &report, nil
+	}
+	return &report, response.Process(&report)
 }
 
 func Stats() error {
@@ -162,10 +174,11 @@ func Stats() error {
 
 // Stop stops all containers in a Pod. The optional timeout parameter can be
 // used to override the timeout before the container is killed.
-func Stop(ctx context.Context, nameOrID string, timeout *int) error {
+func Stop(ctx context.Context, nameOrID string, timeout *int) (*entities.PodStopReport, error) {
+	var report entities.PodStopReport
 	conn, err := bindings.GetClient(ctx)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	params := url.Values{}
 	if timeout != nil {
@@ -173,9 +186,13 @@ func Stop(ctx context.Context, nameOrID string, timeout *int) error {
 	}
 	response, err := conn.DoRequest(nil, http.MethodPost, "/pods/%s/stop", params, nameOrID)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	return response.Process(nil)
+	if response.StatusCode == http.StatusNotModified {
+		report.Id = nameOrID
+		return &report, nil
+	}
+	return &report, response.Process(&report)
 }
 
 func Top() error {
@@ -184,14 +201,15 @@ func Top() error {
 }
 
 // Unpause unpauses all paused containers in a Pod.
-func Unpause(ctx context.Context, nameOrID string) error {
+func Unpause(ctx context.Context, nameOrID string) (*entities.PodUnpauseReport, error) {
+	var report entities.PodUnpauseReport
 	conn, err := bindings.GetClient(ctx)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	response, err := conn.DoRequest(nil, http.MethodPost, "/pods/%s/unpause", nil, nameOrID)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	return response.Process(nil)
+	return &report, response.Process(&report)
 }
diff --git a/pkg/bindings/test/pods_test.go b/pkg/bindings/test/pods_test.go
index a1d6ee184..c54170648 100644
--- a/pkg/bindings/test/pods_test.go
+++ b/pkg/bindings/test/pods_test.go
@@ -71,7 +71,7 @@ var _ = Describe("Podman pods", func() {
 		Expect(len(podSummary)).To(Equal(2))
 		var names []string
 		for _, i := range podSummary {
-			names = append(names, i.Config.Name)
+			names = append(names, i.Name)
 		}
 		Expect(StringInSlice(newpod, names)).To(BeTrue())
 		Expect(StringInSlice("newpod2", names)).To(BeTrue())
@@ -107,13 +107,14 @@ var _ = Describe("Podman pods", func() {
 		Expect(len(filteredPods)).To(BeNumerically("==", 1))
 		var names []string
 		for _, i := range filteredPods {
-			names = append(names, i.Config.Name)
+			names = append(names, i.Name)
 		}
 		Expect(StringInSlice("newpod2", names)).To(BeTrue())
 
 		// Validate list pod with id filter
 		filters = make(map[string][]string)
 		response, err := pods.Inspect(bt.conn, newpod)
+		Expect(err).To(BeNil())
 		id := response.Config.ID
 		filters["id"] = []string{id}
 		filteredPods, err = pods.List(bt.conn, filters)
@@ -121,7 +122,7 @@ var _ = Describe("Podman pods", func() {
 		Expect(len(filteredPods)).To(BeNumerically("==", 1))
 		names = names[:0]
 		for _, i := range filteredPods {
-			names = append(names, i.Config.Name)
+			names = append(names, i.Name)
 		}
 		Expect(StringInSlice("newpod", names)).To(BeTrue())
 
@@ -132,7 +133,7 @@ var _ = Describe("Podman pods", func() {
 		Expect(len(filteredPods)).To(BeNumerically("==", 1))
 		names = names[:0]
 		for _, i := range filteredPods {
-			names = append(names, i.Config.Name)
+			names = append(names, i.Name)
 		}
 		Expect(StringInSlice("newpod", names)).To(BeTrue())
 	})
@@ -155,7 +156,7 @@ var _ = Describe("Podman pods", func() {
 		// TODO fix this
 		Skip("Pod behavior is jacked right now.")
 		// Pause invalid container
-		err := pods.Pause(bt.conn, "dummyName")
+		_, err := pods.Pause(bt.conn, "dummyName")
 		Expect(err).ToNot(BeNil())
 		code, _ := bindings.CheckResponseCode(err)
 		Expect(code).To(BeNumerically("==", http.StatusNotFound))
@@ -167,9 +168,10 @@ var _ = Describe("Podman pods", func() {
 		// Binding needs to be modified to inspect the pod state.
 		// Since we don't have a pod state we inspect the states of the containers within the pod.
 		// Pause a valid container
-		err = pods.Pause(bt.conn, newpod)
+		_, err = pods.Pause(bt.conn, newpod)
 		Expect(err).To(BeNil())
 		response, err := pods.Inspect(bt.conn, newpod)
+		Expect(err).To(BeNil())
 		Expect(response.State.Status).To(Equal(define.PodStatePaused))
 		for _, i := range response.Containers {
 			Expect(define.StringToContainerStatus(i.State)).
@@ -177,9 +179,10 @@ var _ = Describe("Podman pods", func() {
 		}
 
 		// Unpause a valid container
-		err = pods.Unpause(bt.conn, newpod)
+		_, err = pods.Unpause(bt.conn, newpod)
 		Expect(err).To(BeNil())
 		response, err = pods.Inspect(bt.conn, newpod)
+		Expect(err).To(BeNil())
 		Expect(response.State.Status).To(Equal(define.PodStateRunning))
 		for _, i := range response.Containers {
 			Expect(define.StringToContainerStatus(i.State)).
@@ -189,28 +192,29 @@ var _ = Describe("Podman pods", func() {
 
 	It("start stop restart pod", func() {
 		// Start an invalid pod
-		err = pods.Start(bt.conn, "dummyName")
+		_, err = pods.Start(bt.conn, "dummyName")
 		Expect(err).ToNot(BeNil())
 		code, _ := bindings.CheckResponseCode(err)
 		Expect(code).To(BeNumerically("==", http.StatusNotFound))
 
 		// Stop an invalid pod
-		err = pods.Stop(bt.conn, "dummyName", nil)
+		_, err = pods.Stop(bt.conn, "dummyName", nil)
 		Expect(err).ToNot(BeNil())
 		code, _ = bindings.CheckResponseCode(err)
 		Expect(code).To(BeNumerically("==", http.StatusNotFound))
 
 		// Restart an invalid pod
-		err = pods.Restart(bt.conn, "dummyName")
+		_, err = pods.Restart(bt.conn, "dummyName")
 		Expect(err).ToNot(BeNil())
 		code, _ = bindings.CheckResponseCode(err)
 		Expect(code).To(BeNumerically("==", http.StatusNotFound))
 
 		// Start a valid pod and inspect status of each container
-		err = pods.Start(bt.conn, newpod)
+		_, err = pods.Start(bt.conn, newpod)
 		Expect(err).To(BeNil())
 
 		response, err := pods.Inspect(bt.conn, newpod)
+		Expect(err).To(BeNil())
 		Expect(response.State.Status).To(Equal(define.PodStateRunning))
 		for _, i := range response.Containers {
 			Expect(define.StringToContainerStatus(i.State)).
@@ -218,11 +222,11 @@ var _ = Describe("Podman pods", func() {
 		}
 
 		// Start an already running  pod
-		err = pods.Start(bt.conn, newpod)
+		_, err = pods.Start(bt.conn, newpod)
 		Expect(err).To(BeNil())
 
 		// Stop the running pods
-		err = pods.Stop(bt.conn, newpod, nil)
+		_, err = pods.Stop(bt.conn, newpod, nil)
 		Expect(err).To(BeNil())
 		response, _ = pods.Inspect(bt.conn, newpod)
 		Expect(response.State.Status).To(Equal(define.PodStateExited))
@@ -232,10 +236,10 @@ var _ = Describe("Podman pods", func() {
 		}
 
 		// Stop an already stopped pod
-		err = pods.Stop(bt.conn, newpod, nil)
+		_, err = pods.Stop(bt.conn, newpod, nil)
 		Expect(err).To(BeNil())
 
-		err = pods.Restart(bt.conn, newpod)
+		_, err = pods.Restart(bt.conn, newpod)
 		Expect(err).To(BeNil())
 		response, _ = pods.Inspect(bt.conn, newpod)
 		Expect(response.State.Status).To(Equal(define.PodStateRunning))
@@ -260,11 +264,12 @@ var _ = Describe("Podman pods", func() {
 		// Prune only one pod which is in exited state.
 		// Start then stop a pod.
 		// pod moves to exited state one pod should be pruned now.
-		err = pods.Start(bt.conn, newpod)
+		_, err = pods.Start(bt.conn, newpod)
 		Expect(err).To(BeNil())
-		err = pods.Stop(bt.conn, newpod, nil)
+		_, err = pods.Stop(bt.conn, newpod, nil)
 		Expect(err).To(BeNil())
 		response, err := pods.Inspect(bt.conn, newpod)
+		Expect(err).To(BeNil())
 		Expect(response.State.Status).To(Equal(define.PodStateExited))
 		err = pods.Prune(bt.conn)
 		Expect(err).To(BeNil())
@@ -274,21 +279,23 @@ var _ = Describe("Podman pods", func() {
 
 		// Test prune all pods in exited state.
 		bt.Podcreate(&newpod)
-		err = pods.Start(bt.conn, newpod)
+		_, err = pods.Start(bt.conn, newpod)
 		Expect(err).To(BeNil())
-		err = pods.Start(bt.conn, newpod2)
+		_, err = pods.Start(bt.conn, newpod2)
 		Expect(err).To(BeNil())
-		err = pods.Stop(bt.conn, newpod, nil)
+		_, err = pods.Stop(bt.conn, newpod, nil)
 		Expect(err).To(BeNil())
 		response, err = pods.Inspect(bt.conn, newpod)
+		Expect(err).To(BeNil())
 		Expect(response.State.Status).To(Equal(define.PodStateExited))
 		for _, i := range response.Containers {
 			Expect(define.StringToContainerStatus(i.State)).
 				To(Equal(define.ContainerStateStopped))
 		}
-		err = pods.Stop(bt.conn, newpod2, nil)
+		_, err = pods.Stop(bt.conn, newpod2, nil)
 		Expect(err).To(BeNil())
 		response, err = pods.Inspect(bt.conn, newpod2)
+		Expect(err).To(BeNil())
 		Expect(response.State.Status).To(Equal(define.PodStateExited))
 		for _, i := range response.Containers {
 			Expect(define.StringToContainerStatus(i.State)).