diff options
| author | Madhu Venugopal <madhu@docker.com> | 2016-06-12 21:29:43 -0700 |
|---|---|---|
| committer | Tonis Tiigi <tonistiigi@gmail.com> | 2016-06-13 18:24:17 -0700 |
| commit | 484b556549e934e0a47caa84ad164f08c206fdcc (patch) | |
| tree | 794680db1c52df61e21ad429a4b328ff459f8495 | |
| parent | f6dd2a5206be0c1ab50cdf64ace26b902408e82b (diff) | |
| download | docker-484b556549e934e0a47caa84ad164f08c206fdcc.tar.gz | |
swarm managed networks should me marked as "swarm" scoped (cli)
Signed-off-by: Madhu Venugopal <madhu@docker.com>
| -rw-r--r-- | api/client/network/list.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/api/client/network/list.go b/api/client/network/list.go index 3e113b7275..292b4f62b0 100644 --- a/api/client/network/list.go +++ b/api/client/network/list.go @@ -71,7 +71,7 @@ func runList(dockerCli *client.DockerCli, opts listOptions) error { w := tabwriter.NewWriter(dockerCli.Out(), 20, 1, 3, ' ', 0) if !opts.quiet { - fmt.Fprintf(w, "NETWORK ID\tNAME\tDRIVER") + fmt.Fprintf(w, "NETWORK ID\tNAME\tDRIVER\tSCOPE") fmt.Fprintf(w, "\n") } @@ -79,6 +79,8 @@ func runList(dockerCli *client.DockerCli, opts listOptions) error { for _, networkResource := range networkResources { ID := networkResource.ID netName := networkResource.Name + driver := networkResource.Driver + scope := networkResource.Scope if !opts.noTrunc { ID = stringid.TruncateID(ID) } @@ -86,11 +88,11 @@ func runList(dockerCli *client.DockerCli, opts listOptions) error { fmt.Fprintln(w, ID) continue } - driver := networkResource.Driver - fmt.Fprintf(w, "%s\t%s\t%s\t", + fmt.Fprintf(w, "%s\t%s\t%s\t%s\t", ID, netName, - driver) + driver, + scope) fmt.Fprint(w, "\n") } w.Flush() |