From d1198fc75b87315a618eba6df2e5f09784fb4fe8 Mon Sep 17 00:00:00 2001
From: Mrunal Patel <mrunalp@gmail.com>
Date: Thu, 6 Oct 2016 16:51:13 -0700
Subject: [PATCH 1/2] Populate pod metadata in pod list and status APIs

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
---
 server/sandbox.go | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/server/sandbox.go b/server/sandbox.go
index fcaa411d..4eeb845d 100644
--- a/server/sandbox.go
+++ b/server/sandbox.go
@@ -25,6 +25,7 @@ type sandbox struct {
 	containers   oci.Store
 	processLabel string
 	mountLabel   string
+	metadata     *pb.PodSandboxMetadata
 }
 
 const (
@@ -165,6 +166,7 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
 		containers:   oci.NewMemoryStore(),
 		processLabel: processLabel,
 		mountLabel:   mountLabel,
+		metadata:     req.GetConfig().GetMetadata(),
 	})
 
 	for k, v := range annotations {
@@ -413,8 +415,11 @@ func (s *Server) PodSandboxStatus(ctx context.Context, req *pb.PodSandboxStatusR
 					Network: sPtr(netNsPath),
 				},
 			},
-			Network: &pb.PodSandboxNetworkStatus{Ip: &ip},
-			State:   &rStatus,
+			Network:     &pb.PodSandboxNetworkStatus{Ip: &ip},
+			State:       &rStatus,
+			Labels:      sb.labels,
+			Annotations: sb.annotations,
+			Metadata:    sb.metadata,
 		},
 	}, nil
 }
@@ -441,9 +446,12 @@ func (s *Server) ListPodSandbox(context.Context, *pb.ListPodSandboxRequest) (*pb
 		}
 
 		pod := &pb.PodSandbox{
-			Id:        &sb.id,
-			CreatedAt: int64Ptr(created),
-			State:     &rStatus,
+			Id:          &sb.id,
+			CreatedAt:   int64Ptr(created),
+			State:       &rStatus,
+			Labels:      sb.labels,
+			Annotations: sb.annotations,
+			Metadata:    sb.metadata,
 		}
 
 		pods = append(pods, pod)

From 7c0a441c4b12ba1e5ae7042eea0cb83108ef4670 Mon Sep 17 00:00:00 2001
From: Mrunal Patel <mrunalp@gmail.com>
Date: Thu, 6 Oct 2016 16:52:11 -0700
Subject: [PATCH 2/2] Display pod metadata on the client for list and status

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
---
 cmd/client/sandbox.go | 52 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/cmd/client/sandbox.go b/cmd/client/sandbox.go
index 88f0a3e3..ba31c32b 100644
--- a/cmd/client/sandbox.go
+++ b/cmd/client/sandbox.go
@@ -214,6 +214,20 @@ func PodSandboxStatus(client pb.RuntimeServiceClient, ID string) error {
 		return err
 	}
 	fmt.Printf("ID: %s\n", *r.Status.Id)
+	if r.Status.Metadata != nil {
+		if r.Status.Metadata.Name != nil {
+			fmt.Printf("Name: %s\n", *r.Status.Metadata.Name)
+		}
+		if r.Status.Metadata.Uid != nil {
+			fmt.Printf("UID: %s\n", *r.Status.Metadata.Uid)
+		}
+		if r.Status.Metadata.Namespace != nil {
+			fmt.Printf("Namespace: %s\n", *r.Status.Metadata.Namespace)
+		}
+		if r.Status.Metadata.Attempt != nil {
+			fmt.Printf("Attempt: %v\n", *r.Status.Metadata.Attempt)
+		}
+	}
 	if r.Status.State != nil {
 		fmt.Printf("Status: %s\n", r.Status.State)
 	}
@@ -227,6 +241,18 @@ func PodSandboxStatus(client pb.RuntimeServiceClient, ID string) error {
 	if r.Status.Network != nil {
 		fmt.Printf("IP Address: %v\n", *r.Status.Network.Ip)
 	}
+	if r.Status.Labels != nil {
+		fmt.Println("Labels:")
+		for k, v := range r.Status.Labels {
+			fmt.Printf("\t%s -> %s\n", k, v)
+		}
+	}
+	if r.Status.Annotations != nil {
+		fmt.Println("Annotations:")
+		for k, v := range r.Status.Annotations {
+			fmt.Printf("\t%s -> %s\n", k, v)
+		}
+	}
 	return nil
 }
 
@@ -239,9 +265,35 @@ func ListPodSandboxes(client pb.RuntimeServiceClient) error {
 	}
 	for _, pod := range r.Items {
 		fmt.Printf("ID: %s\n", *pod.Id)
+		if pod.Metadata != nil {
+			if pod.Metadata.Name != nil {
+				fmt.Printf("Name: %s\n", *pod.Metadata.Name)
+			}
+			if pod.Metadata.Uid != nil {
+				fmt.Printf("UID: %s\n", *pod.Metadata.Uid)
+			}
+			if pod.Metadata.Namespace != nil {
+				fmt.Printf("Namespace: %s\n", *pod.Metadata.Namespace)
+			}
+			if pod.Metadata.Attempt != nil {
+				fmt.Printf("Attempt: %v\n", *pod.Metadata.Attempt)
+			}
+		}
 		fmt.Printf("Status: %s\n", pod.State)
 		ctm := time.Unix(*pod.CreatedAt, 0)
 		fmt.Printf("Created: %v\n", ctm)
+		if pod.Labels != nil {
+			fmt.Println("Labels:")
+			for k, v := range pod.Labels {
+				fmt.Printf("\t%s -> %s\n", k, v)
+			}
+		}
+		if pod.Annotations != nil {
+			fmt.Println("Annotations:")
+			for k, v := range pod.Annotations {
+				fmt.Printf("\t%s -> %s\n", k, v)
+			}
+		}
 	}
 	return nil
 }