From 57dc1156de12532fa14f1d77a4a70f2943c33e5c Mon Sep 17 00:00:00 2001 From: David Gageot Date: Mon, 26 Oct 2015 18:46:58 +0100 Subject: [PATCH] Revert "Remove duplication over GetIP" This reverts commit 99aacc7b79bf24fda123213bb0a84d8d7b59f28d. Signed-off-by: David Gageot --- drivers/digitalocean/digitalocean.go | 7 +++++++ drivers/exoscale/exoscale.go | 7 +++++++ drivers/generic/generic.go | 4 ++++ libmachine/drivers/base.go | 10 ---------- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/drivers/digitalocean/digitalocean.go b/drivers/digitalocean/digitalocean.go index 5232860025..0638c107fe 100644 --- a/drivers/digitalocean/digitalocean.go +++ b/drivers/digitalocean/digitalocean.go @@ -226,6 +226,13 @@ 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 index de798f7bf2..68bfe4ae60 100644 --- a/drivers/exoscale/exoscale.go +++ b/drivers/exoscale/exoscale.go @@ -146,6 +146,13 @@ 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 index 9ae4580eaa..9b35a37eac 100644 --- a/drivers/generic/generic.go +++ b/drivers/generic/generic.go @@ -121,7 +121,11 @@ 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 index c352b75fc1..17bd097dd8 100644 --- a/libmachine/drivers/base.go +++ b/libmachine/drivers/base.go @@ -26,16 +26,6 @@ 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 }