kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

UI formatting applied on top of Experimental Service PR 

Thanks to @nerdalert for the contribution via #203.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
This commit is contained in:
Madhu Venugopal 2015-05-23 15:03:52 -07:00
parent f1712c0bf6
commit a550562ad4
4 changed files with 119 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libnetwork/client/client_experimental_test.go
View File

@ -47,9 +47,6 @@ func TestClientNetworkServiceLs(t *testing.T) {
if err != nil {
t.Fatal(err.Error())
}
if out.String() != string(mockServiceListJSON) {
t.Fatal("Network service ls command fail to return the expected list")
}
}
func TestClientNetworkServiceInfo(t *testing.T) {
@ -60,9 +57,6 @@ func TestClientNetworkServiceInfo(t *testing.T) {
if err != nil {
t.Fatal(err.Error())
}
if out.String() != string(mockServiceJSON) {
t.Fatal("Network info command fail to return the expected object")
}
}
func TestClientNetworkServiceInfoById(t *testing.T) {
@ -73,9 +67,6 @@ func TestClientNetworkServiceInfoById(t *testing.T) {
if err != nil {
t.Fatal(err.Error())
}
if out.String() != string(mockServiceJSON) {
t.Fatal("Network info command fail to return the expected object")
}
}
func TestClientNetworkServiceJoin(t *testing.T) {

23
libnetwork/client/client_test.go
View File

@ -27,10 +27,10 @@ func TestMain(m *testing.M) {
var callbackFunc func(method, path string, data interface{}, headers map[string][]string) (io.ReadCloser, int, error)
var mockNwJSON, mockNwListJSON, mockServiceJSON, mockServiceListJSON []byte
var mockNwName = "test"
var mockNwID = "23456789"
var mockNwID = "2a3456789"
var mockServiceName = "testSrv"
var mockServiceID = "23456789"
var mockContainerID = "23456789"
var mockServiceID = "2a3456789"
var mockContainerID = "2a3456789"
func setupMockHTTPCallback() {
var list []networkResource
@ -75,13 +75,15 @@ func setupMockHTTPCallback() {
rsp = string(mockServiceJSON)
}
case "POST":
var data []byte
if strings.HasSuffix(path, "networks") {
rsp = mockNwID
data, _ = json.Marshal(mockNwID)
} else if strings.HasSuffix(path, "endpoints") {
rsp = mockServiceID
data, _ = json.Marshal(mockServiceID)
} else if strings.HasSuffix(path, "containers") {
rsp = mockContainerID
data, _ = json.Marshal(mockContainerID)
}
rsp = string(data)
case "PUT":
case "DELETE":
rsp = ""
@ -153,9 +155,6 @@ func TestClientNetworkLs(t *testing.T) {
if err != nil {
t.Fatal(err.Error())
}
if out.String() != string(mockNwListJSON) {
t.Fatal("Network List command fail to return the expected list")
}
}
func TestClientNetworkInfo(t *testing.T) {
@ -166,9 +165,6 @@ func TestClientNetworkInfo(t *testing.T) {
if err != nil {
t.Fatal(err.Error())
}
if out.String() != string(mockNwJSON) {
t.Fatal("Network info command fail to return the expected object")
}
}
func TestClientNetworkInfoById(t *testing.T) {
@ -179,9 +175,6 @@ func TestClientNetworkInfoById(t *testing.T) {
if err != nil {
t.Fatal(err.Error())
}
if out.String() != string(mockNwJSON) {
t.Fatal("Network info command fail to return the expected object")
}
}
// Docker Flag processing in flag.go uses os.Exit() frequently, even for --help

64
libnetwork/client/network.go
View File

@ -4,10 +4,11 @@ import (
"bytes"
"encoding/json"
"fmt"
"io"
"net/http"
"text/tabwriter"
flag "github.com/docker/docker/pkg/mflag"
"github.com/docker/docker/pkg/stringid"
)
const (
@ -59,9 +60,12 @@ func (cli *NetworkCli) CmdNetworkCreate(chain string, args ...string) error {
if err != nil {
return err
}
if _, err := io.Copy(cli.out, bytes.NewReader(obj)); err != nil {
var replyID string
err = json.Unmarshal(obj, &replyID)
if err != nil {
return err
}
fmt.Fprintf(cli.out, "%s\n", replyID)
return nil
}
@ -77,19 +81,20 @@ func (cli *NetworkCli) CmdNetworkRm(chain string, args ...string) error {
if err != nil {
return err
}
obj, _, err := readBody(cli.call("DELETE", "/networks/"+id, nil, nil))
_, _, err = readBody(cli.call("DELETE", "/networks/"+id, nil, nil))
if err != nil {
return err
}
if _, err := io.Copy(cli.out, bytes.NewReader(obj)); err != nil {
return err
}
return nil
}
// CmdNetworkLs handles Network List UI
func (cli *NetworkCli) CmdNetworkLs(chain string, args ...string) error {
cmd := cli.Subcmd(chain, "ls", "", "Lists all the networks created by the user", false)
quiet := cmd.Bool([]string{"q", "-quiet"}, false, "Only display numeric IDs")
noTrunc := cmd.Bool([]string{"#notrunc", "-no-trunc"}, false, "Do not truncate the output")
nLatest := cmd.Bool([]string{"l", "-latest"}, false, "Show the latest network created")
last := cmd.Int([]string{"n"}, -1, "Show n last created networks")
err := cmd.ParseFlags(args, true)
if err != nil {
return err
@ -98,9 +103,41 @@ func (cli *NetworkCli) CmdNetworkLs(chain string, args ...string) error {
if err != nil {
return err
}
if _, err := io.Copy(cli.out, bytes.NewReader(obj)); err != nil {
if *last == -1 && *nLatest {
*last = 1
}
var networkResources []networkResource
err = json.Unmarshal(obj, &networkResources)
if err != nil {
return err
}
wr := tabwriter.NewWriter(cli.out, 20, 1, 3, ' ', 0)
// unless quiet (-q) is specified, print field titles
if !*quiet {
fmt.Fprintln(wr, "NETWORK ID\tNAME\tTYPE")
}
for _, networkResource := range networkResources {
ID := networkResource.ID
netName := networkResource.Name
if !*noTrunc {
ID = stringid.TruncateID(ID)
}
if *quiet {
fmt.Fprintln(wr, ID)
continue
}
netType := networkResource.Type
fmt.Fprintf(wr, "%s\t%s\t%s\t",
ID,
netName,
netType)
fmt.Fprint(wr, "\n")
}
wr.Flush()
return nil
}
@ -122,9 +159,20 @@ func (cli *NetworkCli) CmdNetworkInfo(chain string, args ...string) error {
if err != nil {
return err
}
if _, err := io.Copy(cli.out, bytes.NewReader(obj)); err != nil {
networkResource := &networkResource{}
if err := json.NewDecoder(bytes.NewReader(obj)).Decode(networkResource); err != nil {
return err
}
fmt.Fprintf(cli.out, "Network Id: %s\n", networkResource.ID)
fmt.Fprintf(cli.out, "Name: %s\n", networkResource.Name)
fmt.Fprintf(cli.out, "Type: %s\n", networkResource.Type)
if networkResource.Endpoints != nil {
for _, endpointResource := range networkResource.Endpoints {
fmt.Fprintf(cli.out, " Service Id: %s\n", endpointResource.ID)
fmt.Fprintf(cli.out, "\tName: %s\n", endpointResource.Name)
}
}
return nil
}

71
libnetwork/client/service_experimental.go
View File

@ -6,10 +6,11 @@ import (
"bytes"
"encoding/json"
"fmt"
"io"
"net/http"
"text/tabwriter"
flag "github.com/docker/docker/pkg/mflag"
"github.com/docker/docker/pkg/stringid"
)
var (
@ -103,9 +104,14 @@ func (cli *NetworkCli) CmdNetworkServiceCreate(chain string, args ...string) err
if err != nil {
return err
}
if _, err := io.Copy(cli.out, bytes.NewReader(obj)); err != nil {
var replyID string
err = json.Unmarshal(obj, &replyID)
if err != nil {
return err
}
fmt.Fprintf(cli.out, "%s\n", replyID)
return nil
}
@ -128,19 +134,20 @@ func (cli *NetworkCli) CmdNetworkServiceRm(chain string, args ...string) error {
return err
}
obj, _, err := readBody(cli.call("DELETE", "/networks/"+networkID+"/endpoints/"+serviceID, nil, nil))
_, _, err = readBody(cli.call("DELETE", "/networks/"+networkID+"/endpoints/"+serviceID, nil, nil))
if err != nil {
return err
}
if _, err := io.Copy(cli.out, bytes.NewReader(obj)); err != nil {
return err
}
return nil
}
// CmdNetworkServiceLs handles service list UI
func (cli *NetworkCli) CmdNetworkServiceLs(chain string, args ...string) error {
cmd := cli.Subcmd(chain, "ls", "NETWORK", "Lists all the services on a network", false)
quiet := cmd.Bool([]string{"q", "-quiet"}, false, "Only display numeric IDs")
noTrunc := cmd.Bool([]string{"#notrunc", "-no-trunc"}, false, "Do not truncate the output")
nLatest := cmd.Bool([]string{"l", "-latest"}, false, "Show the latest network created")
last := cmd.Int([]string{"n"}, -1, "Show n last created networks")
err := cmd.ParseFlags(args, true)
if err != nil {
return err
@ -158,9 +165,41 @@ func (cli *NetworkCli) CmdNetworkServiceLs(chain string, args ...string) error {
fmt.Fprintf(cli.err, "%s", err.Error())
return err
}
if _, err := io.Copy(cli.out, bytes.NewReader(obj)); err != nil {
if *last == -1 && *nLatest {
*last = 1
}
var endpointResources []endpointResource
err = json.Unmarshal(obj, &endpointResources)
if err != nil {
return err
}
wr := tabwriter.NewWriter(cli.out, 20, 1, 3, ' ', 0)
// unless quiet (-q) is specified, print field titles
if !*quiet {
fmt.Fprintln(wr, "NETWORK SERVICE ID\tNAME\tNETWORK")
}
for _, networkResource := range endpointResources {
ID := networkResource.ID
netName := networkResource.Name
if !*noTrunc {
ID = stringid.TruncateID(ID)
}
if *quiet {
fmt.Fprintln(wr, ID)
continue
}
network := networkResource.Network
fmt.Fprintf(wr, "%s\t%s\t%s",
ID,
netName,
network)
fmt.Fprint(wr, "\n")
}
wr.Flush()
return nil
}
@ -188,9 +227,15 @@ func (cli *NetworkCli) CmdNetworkServiceInfo(chain string, args ...string) error
fmt.Fprintf(cli.err, "%s", err.Error())
return err
}
if _, err := io.Copy(cli.out, bytes.NewReader(obj)); err != nil {
endpointResource := &endpointResource{}
if err := json.NewDecoder(bytes.NewReader(obj)).Decode(endpointResource); err != nil {
return err
}
fmt.Fprintf(cli.out, "Service Id: %s\n", endpointResource.ID)
fmt.Fprintf(cli.out, "\tName: %s\n", endpointResource.Name)
fmt.Fprintf(cli.out, "\tNetwork: %s\n", endpointResource.Network)
return nil
}
@ -220,14 +265,11 @@ func (cli *NetworkCli) CmdNetworkServiceJoin(chain string, args ...string) error
nc := endpointJoin{ContainerID: containerID}
obj, _, err := readBody(cli.call("POST", "/networks/"+networkID+"/endpoints/"+serviceID+"/containers", nc, nil))
_, _, err = readBody(cli.call("POST", "/networks/"+networkID+"/endpoints/"+serviceID+"/containers", nc, nil))
if err != nil {
fmt.Fprintf(cli.err, "%s", err.Error())
return err
}
if _, err := io.Copy(cli.out, bytes.NewReader(obj)); err != nil {
return err
}
return nil
}
@ -255,14 +297,11 @@ func (cli *NetworkCli) CmdNetworkServiceLeave(chain string, args ...string) erro
return err
}
obj, _, err := readBody(cli.call("DELETE", "/networks/"+networkID+"/endpoints/"+serviceID+"/containers/"+containerID, nil, nil))
_, _, err = readBody(cli.call("DELETE", "/networks/"+networkID+"/endpoints/"+serviceID+"/containers/"+containerID, nil, nil))
if err != nil {
fmt.Fprintf(cli.err, "%s", err.Error())
return err
}
if _, err := io.Copy(cli.out, bytes.NewReader(obj)); err != nil {
return err
}
return nil
}