From b6462eb6d0c11cef0380f055e7e67ad10dd45282 Mon Sep 17 00:00:00 2001
From: Olivier Gambier <olivier@docker.com>
Date: Tue, 20 Oct 2015 18:43:57 -0700
Subject: [PATCH] Remove useless duplication on GetSSHHostname
Signed-off-by: Olivier Gambier <olivier@docker.com>
---
drivers/amazonec2/amazonec2.go | 6 ------
drivers/azure/azure.go | 4 ----
drivers/digitalocean/digitalocean.go | 4 ----
drivers/exoscale/exoscale.go | 4 ----
drivers/generic/generic.go | 4 ----
drivers/google/google.go | 5 -----
drivers/hyperv/hyperv.go | 4 ----
drivers/openstack/openstack.go | 4 ----
drivers/softlayer/driver.go | 4 ----
drivers/vmwarefusion/fusion.go | 4 ----
drivers/vmwarevcloudair/vcloudair.go | 4 ----
drivers/vmwarevsphere/vsphere.go | 4 ----
12 files changed, 51 deletions(-)
diff --git a/drivers/amazonec2/amazonec2.go b/drivers/amazonec2/amazonec2.go
index 62e8fe1603..0c138366a5 100644
--- a/drivers/amazonec2/amazonec2.go
+++ b/drivers/amazonec2/amazonec2.go
@@ -452,12 +452,6 @@ func (d *Driver) GetState() (state.State, error) {
}
}
-// GetSSHHostname -
-func (d *Driver) GetSSHHostname() (string, error) {
- // TODO: use @nathanleclaire retry func here (ehazlett)
- return d.GetIP()
-}
-
func (d *Driver) GetSSHUsername() string {
if d.SSHUser == "" {
d.SSHUser = "ubuntu"
diff --git a/drivers/azure/azure.go b/drivers/azure/azure.go
index 27b578c678..b645ea80f8 100644
--- a/drivers/azure/azure.go
+++ b/drivers/azure/azure.go
@@ -119,10 +119,6 @@ func NewDriver(hostName, storePath string) drivers.Driver {
return d
}
-func (d *Driver) GetSSHHostname() (string, error) {
- return d.GetIP()
-}
-
func (d *Driver) GetSSHUsername() string {
if d.SSHUser == "" {
d.SSHUser = "ubuntu"
diff --git a/drivers/digitalocean/digitalocean.go b/drivers/digitalocean/digitalocean.go
index 366802d1f5..0638c107fe 100644
--- a/drivers/digitalocean/digitalocean.go
+++ b/drivers/digitalocean/digitalocean.go
@@ -97,10 +97,6 @@ func NewDriver(hostName, storePath string) *Driver {
}
}
-func (d *Driver) GetSSHHostname() (string, error) {
- return d.GetIP()
-}
-
func (d *Driver) DriverName() string {
return "digitalocean"
}
diff --git a/drivers/exoscale/exoscale.go b/drivers/exoscale/exoscale.go
index e083e3f0d5..68bfe4ae60 100644
--- a/drivers/exoscale/exoscale.go
+++ b/drivers/exoscale/exoscale.go
@@ -103,10 +103,6 @@ func NewDriver(hostName, storePath string) drivers.Driver {
}
}
-func (d *Driver) GetSSHHostname() (string, error) {
- return d.GetIP()
-}
-
func (d *Driver) GetSSHUsername() string {
return "ubuntu"
}
diff --git a/drivers/generic/generic.go b/drivers/generic/generic.go
index 57a47f1702..9b35a37eac 100644
--- a/drivers/generic/generic.go
+++ b/drivers/generic/generic.go
@@ -72,10 +72,6 @@ func (d *Driver) DriverName() string {
return "generic"
}
-func (d *Driver) GetSSHHostname() (string, error) {
- return d.GetIP()
-}
-
func (d *Driver) GetSSHUsername() string {
return d.SSHUser
}
diff --git a/drivers/google/google.go b/drivers/google/google.go
index 4f1f3c1ba4..acfd566929 100644
--- a/drivers/google/google.go
+++ b/drivers/google/google.go
@@ -120,11 +120,6 @@ func NewDriver(machineName string, storePath string) *Driver {
}
}
-// GetSSHHostname returns hostname for use with ssh
-func (d *Driver) GetSSHHostname() (string, error) {
- return d.GetIP()
-}
-
// GetSSHUsername returns username for use with ssh
func (d *Driver) GetSSHUsername() string {
if d.SSHUser == "" {
diff --git a/drivers/hyperv/hyperv.go b/drivers/hyperv/hyperv.go
index c9262a16cd..08f3071694 100644
--- a/drivers/hyperv/hyperv.go
+++ b/drivers/hyperv/hyperv.go
@@ -85,10 +85,6 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
return nil
}
-func (d *Driver) GetSSHHostname() (string, error) {
- return d.GetIP()
-}
-
func (d *Driver) GetSSHUsername() string {
if d.SSHUser == "" {
d.SSHUser = "docker"
diff --git a/drivers/openstack/openstack.go b/drivers/openstack/openstack.go
index fc5e9e03ba..3aa9af8faa 100644
--- a/drivers/openstack/openstack.go
+++ b/drivers/openstack/openstack.go
@@ -218,10 +218,6 @@ func NewDerivedDriver(hostName, storePath string) *Driver {
}
}
-func (d *Driver) GetSSHHostname() (string, error) {
- return d.GetIP()
-}
-
func (d *Driver) DriverName() string {
return "openstack"
}
diff --git a/drivers/softlayer/driver.go b/drivers/softlayer/driver.go
index 5352d3406a..f3f06ca191 100644
--- a/drivers/softlayer/driver.go
+++ b/drivers/softlayer/driver.go
@@ -73,10 +73,6 @@ func NewDriver(hostName, storePath string) drivers.Driver {
}
}
-func (d *Driver) GetSSHHostname() (string, error) {
- return d.GetIP()
-}
-
func (d *Driver) GetCreateFlags() []mcnflag.Flag {
// Set hourly billing to true by default since codegangsta cli doesn't take default bool values
if os.Getenv("SOFTLAYER_HOURLY_BILLING") == "" {
diff --git a/drivers/vmwarefusion/fusion.go b/drivers/vmwarefusion/fusion.go
index 132038f19e..f7798c40fa 100644
--- a/drivers/vmwarefusion/fusion.go
+++ b/drivers/vmwarefusion/fusion.go
@@ -119,10 +119,6 @@ func NewDriver(hostName, storePath string) drivers.Driver {
}
}
-func (d *Driver) GetSSHHostname() (string, error) {
- return d.GetIP()
-}
-
func (d *Driver) GetSSHUsername() string {
if d.SSHUser == "" {
d.SSHUser = "docker"
diff --git a/drivers/vmwarevcloudair/vcloudair.go b/drivers/vmwarevcloudair/vcloudair.go
index 285ada3e80..a09998a4e0 100644
--- a/drivers/vmwarevcloudair/vcloudair.go
+++ b/drivers/vmwarevcloudair/vcloudair.go
@@ -138,10 +138,6 @@ func NewDriver(hostName, storePath string) drivers.Driver {
}
}
-func (d *Driver) GetSSHHostname() (string, error) {
- return d.GetIP()
-}
-
// Driver interface implementation
func (d *Driver) DriverName() string {
return "vmwarevcloudair"
diff --git a/drivers/vmwarevsphere/vsphere.go b/drivers/vmwarevsphere/vsphere.go
index 0bea2f77dd..c658455d66 100644
--- a/drivers/vmwarevsphere/vsphere.go
+++ b/drivers/vmwarevsphere/vsphere.go
@@ -135,10 +135,6 @@ func NewDriver(hostName, storePath string) drivers.Driver {
}
}
-func (d *Driver) GetSSHHostname() (string, error) {
- return d.GetIP()
-}
-
func (d *Driver) GetSSHUsername() string {
if d.SSHUser == "" {
d.SSHUser = "docker"