Merge pull request #196 from carmark/fip

some improvements on fip

Author: gnawux

api/client/compose.go

@@ -11,6 +11,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/engine-api/client"
+	"github.com/docker/engine-api/types"
+	"github.com/docker/engine-api/types/filters"
 	Cli "github.com/hyperhq/hypercli/cli"
 	"github.com/hyperhq/hypercli/pkg/jsonmessage"
 	flag "github.com/hyperhq/hypercli/pkg/mflag"
@@ -21,6 +23,8 @@ import (
 	"golang.org/x/net/context"
 )
 
+const ComposeFipAuto = "auto"
+
 // CmdCompose is the parent subcommand for all compose commands
 //
 // Usage: hyper compose <COMMAND> [OPTIONS]
@@ -152,6 +156,45 @@ func (cli *DockerCli) CmdComposeUp(args ...string) error {
 	if *projectName == "" {
 		*projectName = getBaseDir()
 	}
+	var fips = []string{}
+	var newFipNum = 0
+	for _, svconfig := range c.M {
+		if svconfig.Fip == ComposeFipAuto {
+			newFipNum++
+		}
+	}
+	fipFilterArgs, _ := filters.FromParam("dangling=true")
+	options := types.NetworkListOptions{
+		Filters: fipFilterArgs,
+	}
+	fipList, err := cli.client.FipList(context.Background(), options)
+	if err == nil {
+		for _, fip := range fipList {
+			if fip["container"] == "" && fip["service"] == "" {
+				fips = append(fips, fip["fip"])
+			}
+		}
+	}
+	if newFipNum > len(fips) {
+		if askForConfirmation(warnMessage) == true {
+			newFips, err := cli.client.FipAllocate(context.Background(), fmt.Sprintf("%d", newFipNum-len(fips)))
+			if err != nil {
+				return err
+			}
+			fips = append(fips, newFips...)
+		}
+	}
+	i := 0
+	for _, svconfig := range c.M {
+		if svconfig.Fip == ComposeFipAuto {
+			if i >= newFipNum {
+				svconfig.Fip = ""
+			} else {
+				svconfig.Fip = fips[i]
+				i++
+			}
+		}
+	}
 	body, err := cli.client.ComposeUp(*projectName, services, c, vc, nc, cli.configFile.AuthConfigs, *forcerecreate, *norecreate)
 	if err != nil {
 		return err

api/client/fip.go

@@ -35,13 +35,29 @@ func (cli *DockerCli) CmdFip(args ...string) error {
 // Usage: docker fip create [OPTIONS] COUNT
 func (cli *DockerCli) CmdFipAllocate(args ...string) error {
 	cmd := Cli.Subcmd("fip allocate", []string{"COUNT"}, "Creates some new floating IPs by the user", false)
+	flAvailable := cmd.Bool([]string{"-pick"}, false, "Pick an available floating IP if have")
 	flForce := cmd.Bool([]string{"y", "-yes"}, false, "Agree to allocate floating IP, will not show prompt")
 
 	cmd.Require(flag.Exact, 1)
 	err := cmd.ParseFlags(args, true)
 	if err != nil {
 		return err
 	}
+	if *flAvailable == true {
+		fipFilterArgs, _ := filters.FromParam("dangling=true")
+		options := types.NetworkListOptions{
+			Filters: fipFilterArgs,
+		}
+		fips, err := cli.client.FipList(context.Background(), options)
+		if err == nil {
+			for _, fip := range fips {
+				if fip["container"] == "" && fip["service"] == "" {
+					fmt.Fprintf(cli.out, "%s\n", fip["fip"])
+					return nil
+				}
+			}
+		}
+	}
 	if *flForce == false {
 		if askForConfirmation(warnMessage) == false {
 			return nil
@@ -87,10 +103,36 @@ func (cli *DockerCli) CmdFipRelease(args ...string) error {
 // 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)
+	flForce := cmd.Bool([]string{"f", "-force"}, false, "Deattach that FIP and attach it to this container")
 	cmd.Require(flag.Min, 2)
 	if err := cmd.ParseFlags(args, true); err != nil {
 		return err
 	}
+	if *flForce {
+		filter, _ := filters.FromParam("dangling=false")
+		options := types.NetworkListOptions{
+			Filters: filter,
+		}
+
+		fips, err := cli.client.FipList(context.Background(), options)
+		if err != nil {
+			return err
+		}
+		for _, fip := range fips {
+			if ip := fip["fip"]; ip == cmd.Arg(0) {
+				if fip["container"] != "" {
+					cli.client.FipDetach(context.Background(), fip["container"])
+				} else if fip["service"] != "" {
+					ip = ""
+					sv := types.ServiceUpdate{
+						FIP: &ip,
+					}
+					cli.client.ServiceUpdate(context.Background(), fip["service"], sv)
+				}
+				break
+			}
+		}
+	}
 	return cli.client.FipAttach(context.Background(), cmd.Arg(0), cmd.Arg(1))
 }