kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Make network ls output order

Browse source 
Fixes: #20328
We sort network ls output with incresing order,
it may make output more easy to consume for users.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
This commit is contained in:
Kai Qiang Wu(Kennan) 2016-02-17 03:11:37 +00:00
parent eae59c4226
commit 838ed1866b
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
api/client/network.go
View file

@ -3,6 +3,7 @@ package client
import ( import (
"fmt" "fmt"
"net" "net"
"sort"
"strings" "strings"
"text/tabwriter" "text/tabwriter"
@ -192,7 +193,7 @@ func (cli *DockerCli) CmdNetworkLs(args ...string) error {
if !*quiet { if !*quiet {
fmt.Fprintln(wr, "NETWORK ID\tNAME\tDRIVER") fmt.Fprintln(wr, "NETWORK ID\tNAME\tDRIVER")
} }
sort.Sort(byNetworkName(networkResources))
for _, networkResource := range networkResources { for _, networkResource := range networkResources {
ID := networkResource.ID ID := networkResource.ID
netName := networkResource.Name netName := networkResource.Name
@ -214,6 +215,12 @@ func (cli *DockerCli) CmdNetworkLs(args ...string) error {
return nil return nil
} }
type byNetworkName []types.NetworkResource
func (r byNetworkName) Len() int { return len(r) }
func (r byNetworkName) Swap(i, j int) { r[i], r[j] = r[j], r[i] }
func (r byNetworkName) Less(i, j int) bool { return r[i].Name < r[j].Name }
// CmdNetworkInspect inspects the network object for more details // CmdNetworkInspect inspects the network object for more details
// //
// Usage: docker network inspect [OPTIONS] <NETWORK> [NETWORK...] // Usage: docker network inspect [OPTIONS] <NETWORK> [NETWORK...]

10
integration-cli/docker_cli_network_unix_test.go
View file

@ -10,7 +10,6 @@ import (
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os" "os"
"sort"
"strings" "strings"
"time" "time"
@ -259,9 +258,6 @@ func assertNwList(c *check.C, out string, expectNws []string) {
// wrap all network name in nwList // wrap all network name in nwList
nwList = append(nwList, netFields[1]) nwList = append(nwList, netFields[1])
} }
// first need to sort out and expected
sort.StringSlice(nwList).Sort()
sort.StringSlice(expectNws).Sort()
// network ls should contains all expected networks // network ls should contains all expected networks
c.Assert(nwList, checker.DeepEquals, expectNws) c.Assert(nwList, checker.DeepEquals, expectNws)
@ -321,11 +317,11 @@ func (s *DockerNetworkSuite) TestDockerNetworkLsFilter(c *check.C) {
// filter with partial ID and partial name // filter with partial ID and partial name
// only show 'bridge' and 'dev' network // only show 'bridge' and 'dev' network
out, _ = dockerCmd(c, "network", "ls", "-f", "id="+networkID[0:5], "-f", "name=dge") out, _ = dockerCmd(c, "network", "ls", "-f", "id="+networkID[0:5], "-f", "name=dge")
assertNwList(c, out, []string{"dev", "bridge"}) assertNwList(c, out, []string{"bridge", "dev"})
// only show built-in network (bridge, none, host) // only show built-in network (bridge, none, host)
out, _ = dockerCmd(c, "network", "ls", "-f", "type=builtin") out, _ = dockerCmd(c, "network", "ls", "-f", "type=builtin")
assertNwList(c, out, []string{"bridge", "none", "host"}) assertNwList(c, out, []string{"bridge", "host", "none"})
// only show custom networks (dev) // only show custom networks (dev)
out, _ = dockerCmd(c, "network", "ls", "-f", "type=custom") out, _ = dockerCmd(c, "network", "ls", "-f", "type=custom")
@ -334,7 +330,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkLsFilter(c *check.C) {
// show all networks with filter // show all networks with filter
// it should be equivalent of ls without option // it should be equivalent of ls without option
out, _ = dockerCmd(c, "network", "ls", "-f", "type=custom", "-f", "type=builtin") out, _ = dockerCmd(c, "network", "ls", "-f", "type=custom", "-f", "type=builtin")
assertNwList(c, out, []string{"dev", "bridge", "host", "none"}) assertNwList(c, out, []string{"bridge", "dev", "host", "none"})
} }
func (s *DockerNetworkSuite) TestDockerNetworkCreateDelete(c *check.C) { func (s *DockerNetworkSuite) TestDockerNetworkCreateDelete(c *check.C) {