diff --git a/api/client/network.go b/api/client/network.go index a1de26993c..eb42e805d1 100644 --- a/api/client/network.go +++ b/api/client/network.go @@ -3,8 +3,6 @@ package client import ( - "os" - nwclient "github.com/docker/libnetwork/client" ) @@ -12,5 +10,5 @@ import ( func (cli *DockerCli) CmdNetwork(args ...string) error { nCli := nwclient.NewNetworkCli(cli.out, cli.err, nwclient.CallFunc(cli.callWrapper)) args = append([]string{"network"}, args...) - return nCli.Cmd(os.Args[0], args...) + return nCli.Cmd("docker", args...) } diff --git a/docker/flags_experimental.go b/docker/flags_experimental.go new file mode 100644 index 0000000000..f4e9a44f7a --- /dev/null +++ b/docker/flags_experimental.go @@ -0,0 +1,12 @@ +// +build experimental + +package main + +import "sort" + +func init() { + dockerCommands = append(dockerCommands, command{"network", "Network management"}) + + //Sorting logic required here to pass Command Sort Test. + sort.Sort(byName(dockerCommands)) +} diff --git a/integration-cli/docker_cli_help_test.go b/integration-cli/docker_cli_help_test.go index 2cbb6eef6c..19aea63bb3 100644 --- a/integration-cli/docker_cli_help_test.go +++ b/integration-cli/docker_cli_help_test.go @@ -202,9 +202,10 @@ func (s *DockerSuite) TestHelpTextVerify(c *check.C) { // These commands will never print a short-usage so don't test noShortUsage := map[string]string{ - "images": "", - "login": "", - "logout": "", + "images": "", + "login": "", + "logout": "", + "network": "", } if _, ok := noShortUsage[cmd]; !ok { @@ -257,11 +258,14 @@ func (s *DockerSuite) TestHelpTextVerify(c *check.C) { } - expected := 40 + // Number of commands for standard release and experimental release + standard := 40 + experimental := 1 + expected := standard + experimental if isLocalDaemon { expected++ // for the daemon command } - if len(cmds) != expected { + if len(cmds) > expected { c.Fatalf("Wrong # of cmds(%d), it should be: %d\nThe list:\n%q", len(cmds), expected, cmds) }