From 51f5e441662f741a40e2388fe3f804be077364f7 Mon Sep 17 00:00:00 2001 From: Lei Xue Date: Fri, 12 Aug 2016 18:17:30 +0800 Subject: [PATCH] rename fip operation to attach/detach --- api/client/fip.go | 32 +++++++++---------- .../docker/engine-api/client/fip.go | 8 ++--- .../docker/engine-api/client/interface.go | 4 +-- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/api/client/fip.go b/api/client/fip.go index c048c160d..df98f365a 100644 --- a/api/client/fip.go +++ b/api/client/fip.go @@ -70,30 +70,30 @@ func (cli *DockerCli) CmdFipRelease(args ...string) error { return nil } -// CmdFipAssociate connects a container to a floating IP +// CmdFipAttach connects a container to a floating IP // -// Usage: docker fip associate [OPTIONS] -func (cli *DockerCli) CmdFipAssociate(args ...string) error { - cmd := Cli.Subcmd("fip associate", []string{"FIP CONTAINER"}, "Connects a container to a floating IP", false) +// Usage: docker fip attach [OPTIONS] +func (cli *DockerCli) CmdFipAttach(args ...string) error { + cmd := Cli.Subcmd("fip attach", []string{"FIP CONTAINER"}, "Connects a container to a floating IP", false) cmd.Require(flag.Min, 2) if err := cmd.ParseFlags(args, true); err != nil { return err } - return cli.client.FipAssociate(context.Background(), cmd.Arg(0), cmd.Arg(1)) + return cli.client.FipAttach(context.Background(), cmd.Arg(0), cmd.Arg(1)) } -// CmdFipDisassociate disconnects a container from a floating IP +// CmdFipDetach disconnects a container from a floating IP // -// Usage: docker fip disassociate -func (cli *DockerCli) CmdFipDisassociate(args ...string) error { - cmd := Cli.Subcmd("fip disassociate", []string{"CONTAINER"}, "Disconnects container from a floating IP", false) +// Usage: docker fip detach +func (cli *DockerCli) CmdFipDetach(args ...string) error { + cmd := Cli.Subcmd("fip detach", []string{"CONTAINER"}, "Disconnects container from a floating IP", false) //force := cmd.Bool([]string{"f", "-force"}, false, "Force the container to disconnect from a floating IP") cmd.Require(flag.Exact, 1) if err := cmd.ParseFlags(args, true); err != nil { return err } - ip, err := cli.client.FipDisassociate(context.Background(), cmd.Arg(0)) + ip, err := cli.client.FipDetach(context.Background(), cmd.Arg(0)) if err != nil { return err } @@ -147,8 +147,8 @@ func (cli *DockerCli) CmdFipLs(args ...string) error { func fipUsage() string { fipCommands := [][]string{ {"allocate", "Allocate a or some IPs"}, - {"associate", "Associate floating IP to container"}, - {"disassociate", "Disassociate floating IP from conainer"}, + {"attach", "Attach floating IP to container"}, + {"detach", "Detach floating IP from conainer"}, {"ls", "List all floating IPs"}, {"release", "Release a floating IP"}, } @@ -163,7 +163,7 @@ func fipUsage() string { return help } -// Allocate and associate a fip +// Allocate and attach a fip func (cli *DockerCli) associateNewFip(ctx context.Context, contID string) (string, error) { fips, err := cli.client.FipAllocate(ctx, "1") if err != nil { @@ -171,7 +171,7 @@ func (cli *DockerCli) associateNewFip(ctx context.Context, contID string) (strin } for _, ip := range fips { - err = cli.client.FipAssociate(ctx, ip, contID) + err = cli.client.FipAttach(ctx, ip, contID) if err != nil { go func() { cli.client.FipRelease(ctx, ip) @@ -189,9 +189,9 @@ func (cli *DockerCli) releaseFip(ctx context.Context, ip string) error { return cli.client.FipRelease(ctx, ip) } -// Disassociate and release a fip +// Detach and release a fip func (cli *DockerCli) releaseContainerFip(ctx context.Context, contID string) error { - ip, err := cli.client.FipDisassociate(ctx, contID) + ip, err := cli.client.FipDetach(ctx, contID) if err != nil { return err } diff --git a/vendor/src/github.com/docker/engine-api/client/fip.go b/vendor/src/github.com/docker/engine-api/client/fip.go index 3735b023d..bfd8e2edc 100644 --- a/vendor/src/github.com/docker/engine-api/client/fip.go +++ b/vendor/src/github.com/docker/engine-api/client/fip.go @@ -33,22 +33,22 @@ func (cli *Client) FipRelease(ctx context.Context, ip string) error { return nil } -func (cli *Client) FipAssociate(ctx context.Context, ip, container string) error { +func (cli *Client) FipAttach(ctx context.Context, ip, container string) error { var v = url.Values{} v.Set("ip", ip) v.Set("container", container) - _, err := cli.post(ctx, "/fips/associate", v, nil, nil) + _, err := cli.post(ctx, "/fips/attach", v, nil, nil) if err != nil { return err } return nil } -func (cli *Client) FipDisassociate(ctx context.Context, container string) (string, error) { +func (cli *Client) FipDetach(ctx context.Context, container string) (string, error) { var result string var v = url.Values{} v.Set("container", container) - resp, err := cli.post(ctx, "/fips/deassociate", v, nil, nil) + resp, err := cli.post(ctx, "/fips/detach", v, nil, nil) if err != nil { return "", err } diff --git a/vendor/src/github.com/docker/engine-api/client/interface.go b/vendor/src/github.com/docker/engine-api/client/interface.go index 664c2b8bc..ae63f9844 100644 --- a/vendor/src/github.com/docker/engine-api/client/interface.go +++ b/vendor/src/github.com/docker/engine-api/client/interface.go @@ -88,8 +88,8 @@ type APIClient interface { SnapshotRemove(ctx context.Context, id string) error FipAllocate(ctx context.Context, count string) ([]string, error) FipRelease(ctx context.Context, ip string) error - FipAssociate(ctx context.Context, ip, container string) error - FipDisassociate(ctx context.Context, container string) (string, error) + FipAttach(ctx context.Context, ip, container string) error + FipDetach(ctx context.Context, container string) (string, error) FipList(ctx context.Context, opts types.NetworkListOptions) ([]map[string]string, error) ComposeUp(project string, services []string, c *config.ServiceConfigs, vc map[string]*config.VolumeConfig, nc map[string]*config.NetworkConfig, forcerecreate, norecreate bool) (io.ReadCloser, error)