vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

sort all map type result in ocic

Browse source 
Signed-off-by: Crazykev <crazykev@zju.edu.cn>
This commit is contained in:
Crazykev 2016-11-02 14:36:42 +08:00
parent 018c4db06d
commit 295c32331a
2 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmd/client/container.go
View file

@ -453,14 +453,14 @@ func ListContainers(client pb.RuntimeServiceClient, opts listOptions) error {
}
if c.Labels != nil {
fmt.Println("Labels:")
for k, v := range c.Labels {
fmt.Printf("\t%s -> %s\n", k, v)
for _, k := range getSortedKeys(c.Labels) {
fmt.Printf("\t%s -> %s\n", k, c.Labels[k])
}
}
if c.Annotations != nil {
fmt.Println("Annotations:")
for k, v := range c.Annotations {
fmt.Printf("\t%s -> %s\n", k, v)
for _, k := range getSortedKeys(c.Annotations) {
fmt.Printf("\t%s -> %s\n", k, c.Annotations[k])
}
}
fmt.Println()

27
cmd/client/sandbox.go
View file

@ -3,6 +3,7 @@ package main
import (
"fmt"
"log"
"sort"
"strings"
"time"
@ -302,14 +303,14 @@ func PodSandboxStatus(client pb.RuntimeServiceClient, ID string) error {
}
if r.Status.Labels != nil {
fmt.Println("Labels:")
for k, v := range r.Status.Labels {
fmt.Printf("\t%s -> %s\n", k, v)
for _, k := range getSortedKeys(r.Status.Labels) {
fmt.Printf("\t%s -> %s\n", k, r.Status.Labels[k])
}
}
if r.Status.Annotations != nil {
fmt.Println("Annotations:")
for k, v := range r.Status.Annotations {
fmt.Printf("\t%s -> %s\n", k, v)
for _, k := range getSortedKeys(r.Status.Annotations) {
fmt.Printf("\t%s -> %s\n", k, r.Status.Annotations[k])
}
}
return nil
@ -369,17 +370,27 @@ func ListPodSandboxes(client pb.RuntimeServiceClient, opts listOptions) error {
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)
for _, k := range getSortedKeys(pod.Labels) {
fmt.Printf("\t%s -> %s\n", k, pod.Labels[k])
}
}
if pod.Annotations != nil {
fmt.Println("Annotations:")
for k, v := range pod.Annotations {
fmt.Printf("\t%s -> %s\n", k, v)
for _, k := range getSortedKeys(pod.Annotations) {
fmt.Printf("\t%s -> %s\n", k, pod.Annotations[k])
}
}
fmt.Println()
}
return nil
}
func getSortedKeys(m map[string]string) []string {
var keys []string
for k := range m {
keys = append(keys, k)
}
sort.Strings(keys)
return keys
}