From 19fc64d5839e09cc93b6abd7eed39815f6d2d00f Mon Sep 17 00:00:00 2001 From: David Gageot Date: Tue, 22 Dec 2015 13:32:04 +0100 Subject: [PATCH] Remove redundant code Signed-off-by: David Gageot --- drivers/hyperv/hyperv.go | 17 ----------------- drivers/hyperv/hyperv_test.go | 8 +++++++- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/drivers/hyperv/hyperv.go b/drivers/hyperv/hyperv.go index ef0bb35ac0..49e0e4330e 100644 --- a/drivers/hyperv/hyperv.go +++ b/drivers/hyperv/hyperv.go @@ -82,7 +82,6 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error { d.SwarmHost = flags.String("swarm-host") d.SwarmDiscovery = flags.String("swarm-discovery") d.SSHUser = "docker" - d.SSHPort = 22 return nil } @@ -90,14 +89,6 @@ func (d *Driver) GetSSHHostname() (string, error) { return d.GetIP() } -func (d *Driver) GetSSHUsername() string { - if d.SSHUser == "" { - d.SSHUser = "docker" - } - - return d.SSHUser -} - // DriverName returns the name of the driver func (d *Driver) DriverName() string { return "hyperv" @@ -156,8 +147,6 @@ func (d *Driver) PreCreateCheck() error { } func (d *Driver) Create() error { - d.setMachineNameIfNotSet() - b2dutils := mcnutils.NewB2dUtils(d.StorePath) if err := b2dutils.CopyIsoToMachineDir(d.Boot2DockerURL, d.MachineName); err != nil { return err @@ -347,12 +336,6 @@ func (d *Driver) Kill() error { return nil } -func (d *Driver) setMachineNameIfNotSet() { - if d.MachineName == "" { - d.MachineName = fmt.Sprintf("docker-machine-unknown") - } -} - func (d *Driver) GetIP() (string, error) { command := []string{ "((", diff --git a/drivers/hyperv/hyperv_test.go b/drivers/hyperv/hyperv_test.go index 13777fb8ac..2728200650 100644 --- a/drivers/hyperv/hyperv_test.go +++ b/drivers/hyperv/hyperv_test.go @@ -16,7 +16,13 @@ func TestSetConfigFromFlags(t *testing.T) { } err := driver.SetConfigFromFlags(checkFlags) - assert.NoError(t, err) assert.Empty(t, checkFlags.InvalidFlags) + + sshUser := driver.GetSSHUsername() + assert.Equal(t, "docker", sshUser) + + sshPort, err := driver.GetSSHPort() + assert.Equal(t, 22, sshPort) + assert.NoError(t, err) }