Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

rename fip operation to attach/detach #142

Merged
merged 1 commit into from
Aug 12, 2016
Merged

rename fip operation to attach/detach #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions api/client/fip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] <FIP> <CONTAINER>
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] <FIP> <CONTAINER>
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 <CONTAINER>
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 <CONTAINER>
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
}
Expand Down Expand Up @@ -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"},
}
Expand All @@ -163,15 +163,15 @@ 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 {
return "", err
}

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)
Expand All @@ -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
}
Expand Down
8 changes: 4 additions & 4 deletions vendor/src/github.com/docker/engine-api/client/fip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions vendor/src/github.com/docker/engine-api/client/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down