Remove useless duplication on PreCreateCheck

Olivier Gambier · Olivier Gambier · commit bf3cd8b8f4c3 · 2015-10-21T13:48:13.000-07:00
Signed-off-by: Olivier Gambier &lt;olivier@docker.com&gt;
diff --git a/drivers/exoscale/exoscale.go b/drivers/exoscale/exoscale.go
@@ -188,10 +188,6 @@ func (d *Driver) GetState() (state.State, error) {
 	return state.None, nil
 }
 
-func (d *Driver) PreCreateCheck() error {
-	return nil
-}
-
 func (d *Driver) createDefaultSecurityGroup(client *egoscale.Client, group string) (string, error) {
 	rules := []egoscale.SecurityGroupRule{
 		{
diff --git a/drivers/fakedriver/fakedriver.go b/drivers/fakedriver/fakedriver.go
@@ -57,10 +57,6 @@ func (d *Driver) GetState() (state.State, error) {
 	return d.MockState, nil
 }
 
-func (d *Driver) PreCreateCheck() error {
-	return nil
-}
-
 func (d *Driver) Create() error {
 	return nil
 }
diff --git a/drivers/google/google.go b/drivers/google/google.go
@@ -165,12 +165,6 @@ func (d *Driver) initApis() (*ComputeUtil, error) {
 	return newComputeUtil(d)
 }
 
-// PreCreateCheck allows for pre-create operations to make sure a driver is ready for creation
-// It's a noop on GCE.
-func (d *Driver) PreCreateCheck() error {
-	return nil
-}
-
 // Create creates a GCE VM instance acting as a docker host.
 func (d *Driver) Create() error {
 	c, err := newComputeUtil(d)
diff --git a/drivers/hyperv/hyperv.go b/drivers/hyperv/hyperv.go
@@ -101,10 +101,6 @@ func (d *Driver) DriverName() string {
 	return "hyperv"
 }
 
-func (d *Driver) PreCreateCheck() error {
-	return nil
-}
-
 func (d *Driver) GetURL() (string, error) {
 	ip, err := d.GetIP()
 	if err != nil {
diff --git a/drivers/none/driver.go b/drivers/none/driver.go
@@ -82,10 +82,6 @@ func (d *Driver) Kill() error {
 	return fmt.Errorf("hosts without a driver cannot be killed")
 }
 
-func (d *Driver) PreCreateCheck() error {
-	return nil
-}
-
 func (d *Driver) Remove() error {
 	return nil
 }
diff --git a/drivers/openstack/openstack.go b/drivers/openstack/openstack.go
@@ -335,10 +335,6 @@ func (d *Driver) GetState() (state.State, error) {
 	return state.None, nil
 }
 
-func (d *Driver) PreCreateCheck() error {
-	return nil
-}
-
 func (d *Driver) Create() error {
 	d.KeyPairName = fmt.Sprintf("%s-%s", d.MachineName, mcnutils.GenerateRandomID())
 
diff --git a/drivers/softlayer/driver.go b/drivers/softlayer/driver.go
@@ -303,10 +303,6 @@ func (d *Driver) GetActiveTransaction() (string, error) {
 	return t, nil
 }
 
-func (d *Driver) PreCreateCheck() error {
-	return nil
-}
-
 func (d *Driver) waitForStart() {
 	log.Infof("Waiting for host to become available")
 	for {
diff --git a/drivers/vmwarefusion/fusion.go b/drivers/vmwarefusion/fusion.go
@@ -198,10 +198,6 @@ func (d *Driver) GetState() (state.State, error) {
 	return state.Stopped, nil
 }
 
-func (d *Driver) PreCreateCheck() error {
-	return nil
-}
-
 func (d *Driver) Create() error {
 	b2dutils := mcnutils.NewB2dUtils("", "", d.StorePath)
 	if err := b2dutils.CopyIsoToMachineDir(d.Boot2DockerURL, d.MachineName); err != nil {
diff --git a/drivers/vmwarevcloudair/vcloudair.go b/drivers/vmwarevcloudair/vcloudair.go
@@ -241,10 +241,6 @@ func (d *Driver) GetState() (state.State, error) {
 
 }
 
-func (d *Driver) PreCreateCheck() error {
-	return nil
-}
-
 func (d *Driver) Create() error {
 
 	key, err := d.createSSHKey()
diff --git a/drivers/vmwarevsphere/vsphere.go b/drivers/vmwarevsphere/vsphere.go
@@ -212,10 +212,6 @@ func (d *Driver) GetState() (state.State, error) {
 	return state.None, nil
 }
 
-func (d *Driver) PreCreateCheck() error {
-	return nil
-}
-
 // the current implementation does the following:
 // 1. check whether the docker directory contains the boot2docker ISO
 // 2. generate an SSH keypair and bundle it in a tar.
diff --git a/libmachine/drivers/base.go b/libmachine/drivers/base.go
@@ -52,3 +52,8 @@ func (d *BaseDriver) GetSSHUsername() string {
 
 	return d.SSHUser
 }
+
+// PreCreateCheck is called to enforce pre-creation steps
+func (d *BaseDriver) PreCreateCheck() error {
+	return nil
+}

Original file line number	Diff line number	Diff line change
`@@ -188,10 +188,6 @@ func (d *Driver) GetState() (state.State, error) {`
`188`	`188`	`return state.None, nil`
`189`	`189`	`}`
`190`	`190`
`191`		`-func (d *Driver) PreCreateCheck() error {`
`192`		`- return nil`
`193`		`-}`
`194`		`-`
`195`	`191`	`func (d Driver) createDefaultSecurityGroup(client egoscale.Client, group string) (string, error) {`
`196`	`192`	`rules := []egoscale.SecurityGroupRule{`
`197`	`193`	`{`
Original file line number	Diff line number	Diff line change
`@@ -57,10 +57,6 @@ func (d *Driver) GetState() (state.State, error) {`
`57`	`57`	`return d.MockState, nil`
`58`	`58`	`}`
`59`	`59`
`60`		`-func (d *Driver) PreCreateCheck() error {`
`61`		`- return nil`
`62`		`-}`
`63`		`-`
`64`	`60`	`func (d *Driver) Create() error {`
`65`	`61`	`return nil`
`66`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,10 +82,6 @@ func (d *Driver) Kill() error {`
`82`	`82`	`return fmt.Errorf("hosts without a driver cannot be killed")`
`83`	`83`	`}`
`84`	`84`
`85`		`-func (d *Driver) PreCreateCheck() error {`
`86`		`- return nil`
`87`		`-}`
`88`		`-`
`89`	`85`	`func (d *Driver) Remove() error {`
`90`	`86`	`return nil`
`91`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -335,10 +335,6 @@ func (d *Driver) GetState() (state.State, error) {`
`335`	`335`	`return state.None, nil`
`336`	`336`	`}`
`337`	`337`
`338`		`-func (d *Driver) PreCreateCheck() error {`
`339`		`- return nil`
`340`		`-}`
`341`		`-`
`342`	`338`	`func (d *Driver) Create() error {`
`343`	`339`	`d.KeyPairName = fmt.Sprintf("%s-%s", d.MachineName, mcnutils.GenerateRandomID())`
`344`	`340`
Original file line number	Diff line number	Diff line change
`@@ -241,10 +241,6 @@ func (d *Driver) GetState() (state.State, error) {`
`241`	`241`
`242`	`242`	`}`
`243`	`243`
`244`		`-func (d *Driver) PreCreateCheck() error {`
`245`		`- return nil`
`246`		`-}`
`247`		`-`
`248`	`244`	`func (d *Driver) Create() error {`
`249`	`245`
`250`	`246`	`key, err := d.createSSHKey()`