Merge pull request #214 from carmark/fip_name

fip with name

Author: carmark

api/client/fip.go

@@ -188,22 +188,39 @@ func (cli *DockerCli) CmdFipLs(args ...string) error {
 		return err
 	}
 	w := tabwriter.NewWriter(cli.out, 20, 1, 3, ' ', 0)
-	fmt.Fprintf(w, "Floating IP\tContainer\tService\n")
+	fmt.Fprintf(w, "Floating IP\tName\tContainer\tService\n")
 	for _, fip := range fips {
-		fmt.Fprintf(w, "%s\t%s\t%s\n", fip["fip"], fip["container"], fip["service"])
+		fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", fip["fip"], fip["name"], fip["container"], fip["service"])
 	}
 
 	w.Flush()
 	return nil
 }
 
+func (cli *DockerCli) CmdFipName(args ...string) error {
+	cmd := Cli.Subcmd("fip name", []string{"FIP [NAME]"}, "Set a name for a floating IP", false)
+	//force := cmd.Bool([]string{"f", "-force"}, false, "Force the container to disconnect from a floating IP")
+	cmd.Require(flag.Min, 1)
+	cmd.Require(flag.Max, 2)
+	if err := cmd.ParseFlags(args, true); err != nil {
+		return err
+	}
+
+	err := cli.client.FipName(context.Background(), cmd.Arg(0), cmd.Arg(1))
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func fipUsage() string {
 	fipCommands := [][]string{
 		{"allocate", "Allocate a or some IPs"},
 		{"attach", "Attach floating IP to container"},
 		{"detach", "Detach floating IP from conainer"},
 		{"ls", "List all floating IPs"},
 		{"release", "Release a floating IP"},
+		{"name", "Name a floating IP"},
 	}
 
 	help := "Commands:\n"

vendor/src/github.com/docker/engine-api/client/fip.go

@@ -76,3 +76,15 @@ func (cli *Client) FipList(ctx context.Context, options types.NetworkListOptions
 	ensureReaderClosed(resp)
 	return fips, err
 }
+
+func (cli *Client) FipName(ctx context.Context, ip, name string) error {
+	var v = url.Values{}
+	v.Set("ip", ip)
+	v.Set("name", name)
+	resp, err := cli.post(ctx, "/fips/name", v, nil, nil)
+	if err != nil {
+		return err
+	}
+	ensureReaderClosed(resp)
+	return nil
+}

vendor/src/github.com/docker/engine-api/client/interface.go

@@ -91,6 +91,7 @@ type APIClient interface {
 	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)
+	FipName(ctx context.Context, ip, name string) error
 
 	SgCreate(ctx context.Context, name string, data io.Reader) error
 	SgRm(ctx context.Context, name string) error