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

Update pod inspect report to hold current pod status.

2 files changed, 9 insertions, 0 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,