Merge pull request #5890 from sujil02/v2-pod-inspect-fix

Update pod inspect report to hold current pod status.

3 files changed, 20 insertions, 18 deletions

diff --git a/libpod/define/pod_inspect.go b/libpod/define/pod_inspect.go
index 8558c149b..26fd2cab4 100644
--- a/libpod/define/pod_inspect.go
+++ b/libpod/define/pod_inspect.go
@@ -18,6 +18,8 @@ type InspectPodData struct {
 	Namespace string `json:"Namespace,omitempty"`
 	// Created is the time when the pod was created.
 	Created time.Time
+	// State represents the current state of the pod.
+	State string `json:"State"`
 	// Hostname is the hostname that the pod will set.
 	Hostname string
 	// Labels is a set of key-value labels that have been applied to the
diff --git a/libpod/pod_api.go b/libpod/pod_api.go
index ed4dc0727..45aa5cb8d 100644
--- a/libpod/pod_api.go
+++ b/libpod/pod_api.go
@@ -446,6 +446,7 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) {
 	if err != nil {
 		return nil, err
 	}
+	ctrStatuses := make(map[string]define.ContainerStatus, len(containers))
 	for _, c := range containers {
 		containerStatus := "unknown"
 		// Ignoring possible errors here because we don't want this to be
@@ -459,12 +460,18 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) {
 			Name:  c.Name(),
 			State: containerStatus,
 		})
+		ctrStatuses[c.ID()] = c.state.State
+	}
+	podState, err := CreatePodStatusResults(ctrStatuses)
+	if err != nil {
+		return nil, err
 	}
 	inspectData := define.InspectPodData{
 		ID:               p.ID(),
 		Name:             p.Name(),
 		Namespace:        p.Namespace(),
 		Created:          p.CreatedTime(),
+		State:            podState,
 		Hostname:         "",
 		Labels:           p.Labels(),
 		CreateCgroup:     false,
diff --git a/pkg/bindings/test/pods_test.go b/pkg/bindings/test/pods_test.go
index 4d682a522..8a0b9c7a6 100644
--- a/pkg/bindings/test/pods_test.go
+++ b/pkg/bindings/test/pods_test.go
@@ -174,8 +174,7 @@ var _ = Describe("Podman pods", func() {
 		Expect(err).To(BeNil())
 		response, err := pods.Inspect(bt.conn, newpod)
 		Expect(err).To(BeNil())
-		// FIXME sujil please fix this
-		//Expect(response.Status).To(Equal(define.PodStatePaused))
+		Expect(response.State).To(Equal(define.PodStatePaused))
 		for _, i := range response.Containers {
 			Expect(define.StringToContainerStatus(i.State)).
 				To(Equal(define.ContainerStatePaused))
@@ -186,8 +185,7 @@ var _ = Describe("Podman pods", func() {
 		Expect(err).To(BeNil())
 		response, err = pods.Inspect(bt.conn, newpod)
 		Expect(err).To(BeNil())
-		// FIXME sujil please fix this
-		//Expect(response.State.Status).To(Equal(define.PodStateRunning))
+		Expect(response.State).To(Equal(define.PodStateRunning))
 		for _, i := range response.Containers {
 			Expect(define.StringToContainerStatus(i.State)).
 				To(Equal(define.ContainerStateRunning))
@@ -219,8 +217,7 @@ var _ = Describe("Podman pods", func() {
 
 		response, err := pods.Inspect(bt.conn, newpod)
 		Expect(err).To(BeNil())
-		// FIXME sujil please fix this
-		//Expect(response.State.Status).To(Equal(define.PodStateRunning))
+		Expect(response.State).To(Equal(define.PodStateRunning))
 		for _, i := range response.Containers {
 			Expect(define.StringToContainerStatus(i.State)).
 				To(Equal(define.ContainerStateRunning))
@@ -234,8 +231,7 @@ var _ = Describe("Podman pods", func() {
 		_, err = pods.Stop(bt.conn, newpod, nil)
 		Expect(err).To(BeNil())
 		response, _ = pods.Inspect(bt.conn, newpod)
-		// FIXME sujil please fix this
-		//Expect(response.State.Status).To(Equal(define.PodStateExited))
+		Expect(response.State).To(Equal(define.PodStateExited))
 		for _, i := range response.Containers {
 			Expect(define.StringToContainerStatus(i.State)).
 				To(Equal(define.ContainerStateStopped))
@@ -248,8 +244,7 @@ var _ = Describe("Podman pods", func() {
 		_, err = pods.Restart(bt.conn, newpod)
 		Expect(err).To(BeNil())
 		response, _ = pods.Inspect(bt.conn, newpod)
-		// FIXME sujil please fix this
-		//Expect(response.State.Status).To(Equal(define.PodStateRunning))
+		Expect(response.State).To(Equal(define.PodStateRunning))
 		for _, i := range response.Containers {
 			Expect(define.StringToContainerStatus(i.State)).
 				To(Equal(define.ContainerStateRunning))
@@ -277,15 +272,15 @@ var _ = Describe("Podman pods", func() {
 		Expect(err).To(BeNil())
 		response, err := pods.Inspect(bt.conn, newpod)
 		Expect(err).To(BeNil())
-		// FIXME sujil please fix this
-		//Expect(response.State.Status).To(Equal(define.PodStateExited))
+		Expect(response.State).To(Equal(define.PodStateExited))
 		pruneResponse, err = pods.Prune(bt.conn)
 		Expect(err).To(BeNil())
 		// Validate status and record pod id of pod to be pruned
-		//Expect(response.State.Status).To(Equal(define.PodStateExited))
-		//podID := response.Config.ID
+		Expect(response.State).To(Equal(define.PodStateExited))
+		podID := response.ID
 		// Check if right pod was pruned
 		Expect(len(pruneResponse)).To(Equal(1))
+		Expect(pruneResponse[0].Id).To(Equal(podID))
 		// One pod is pruned hence only one pod should be active.
 		podSummary, err = pods.List(bt.conn, nil)
 		Expect(err).To(BeNil())
@@ -301,8 +296,7 @@ var _ = Describe("Podman pods", func() {
 		Expect(err).To(BeNil())
 		response, err = pods.Inspect(bt.conn, newpod)
 		Expect(err).To(BeNil())
-		// FIXME sujil please fix this
-		//Expect(response.State.Status).To(Equal(define.PodStateExited))
+		Expect(response.State).To(Equal(define.PodStateExited))
 		for _, i := range response.Containers {
 			Expect(define.StringToContainerStatus(i.State)).
 				To(Equal(define.ContainerStateStopped))
@@ -311,8 +305,7 @@ var _ = Describe("Podman pods", func() {
 		Expect(err).To(BeNil())
 		response, err = pods.Inspect(bt.conn, newpod2)
 		Expect(err).To(BeNil())
-		// FIXME sujil please fix this
-		//Expect(response.State.Status).To(Equal(define.PodStateExited))
+		Expect(response.State).To(Equal(define.PodStateExited))
 		for _, i := range response.Containers {
 			Expect(define.StringToContainerStatus(i.State)).
 				To(Equal(define.ContainerStateStopped))