Remove duplication over GetIP

Olivier Gambier · Olivier Gambier · commit 99aacc7b79bf · 2015-10-21T13:48:13.000-07:00
+ ip address proper validation

Signed-off-by: Olivier Gambier &lt;olivier@docker.com&gt;
diff --git a/drivers/digitalocean/digitalocean.go b/drivers/digitalocean/digitalocean.go
@@ -226,13 +226,6 @@ func (d *Driver) GetURL() (string, error) {
 	return fmt.Sprintf("tcp://%s:2376", ip), nil
 }
 
-func (d *Driver) GetIP() (string, error) {
-	if d.IPAddress == "" {
-		return "", fmt.Errorf("IP address is not set")
-	}
-	return d.IPAddress, nil
-}
-
 func (d *Driver) GetState() (state.State, error) {
 	droplet, _, err := d.getClient().Droplets.Get(d.DropletID)
 	if err != nil {
diff --git a/drivers/exoscale/exoscale.go b/drivers/exoscale/exoscale.go
@@ -146,13 +146,6 @@ func (d *Driver) GetURL() (string, error) {
 	return fmt.Sprintf("tcp://%s:2376", ip), nil
 }
 
-func (d *Driver) GetIP() (string, error) {
-	if d.IPAddress == "" {
-		return "", fmt.Errorf("IP address is not set")
-	}
-	return d.IPAddress, nil
-}
-
 func (d *Driver) GetState() (state.State, error) {
 	client := egoscale.NewClient(d.URL, d.ApiKey, d.ApiSecretKey)
 	vm, err := client.GetVirtualMachine(d.Id)
diff --git a/drivers/generic/generic.go b/drivers/generic/generic.go
@@ -121,11 +121,7 @@ func (d *Driver) GetURL() (string, error) {
 	return fmt.Sprintf("tcp://%s:2376", ip), nil
 }
 
-func (d *Driver) GetIP() (string, error) {
-	if d.IPAddress == "" {
-		return "", fmt.Errorf("IP address is not set")
 	}
-	return d.IPAddress, nil
 }
 
 func (d *Driver) GetState() (state.State, error) {
diff --git a/libmachine/drivers/base.go b/libmachine/drivers/base.go
@@ -26,6 +26,16 @@ func (d *BaseDriver) DriverName() string {
 }
 
 // GetIP returns the ip
+func (d *BaseDriver) GetIP() (string, error) {
+	if d.IPAddress == "" {
+		return "", fmt.Errorf("IP address is not set")
+	}
+	ip := net.ParseIP(d.IPAddress)
+	if ip == nil {
+		return "", fmt.Errorf("IP address is invalid")
+	}
+	return d.IPAddress, nil
+}
 func (d *BaseDriver) GetMachineName() string {
 	return d.MachineName
 }

Original file line number	Diff line number	Diff line change
`@@ -121,11 +121,7 @@ func (d *Driver) GetURL() (string, error) {`
`121`	`121`	`return fmt.Sprintf("tcp://%s:2376", ip), nil`
`122`	`122`	`}`
`123`	`123`
`124`		`-func (d *Driver) GetIP() (string, error) {`
`125`		`- if d.IPAddress == "" {`
`126`		`- return "", fmt.Errorf("IP address is not set")`
`127`	`124`	`}`
`128`		`- return d.IPAddress, nil`
`129`	`125`	`}`
`130`	`126`
`131`	`127`	`func (d *Driver) GetState() (state.State, error) {`