docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant code 

Signed-off-by: David Gageot <david@gageot.net>
This commit is contained in:
David Gageot 2015-12-22 13:32:04 +01:00
parent 9f6764ccd3
commit 19fc64d583
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/hyperv/hyperv.go
View File

@ -82,7 +82,6 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
d.SwarmHost = flags.String("swarm-host") d.SwarmHost = flags.String("swarm-host")
d.SwarmDiscovery = flags.String("swarm-discovery") d.SwarmDiscovery = flags.String("swarm-discovery")
d.SSHUser = "docker" d.SSHUser = "docker"
d.SSHPort = 22
return nil return nil
} }
@ -90,14 +89,6 @@ func (d *Driver) GetSSHHostname() (string, error) {
return d.GetIP() return d.GetIP()
} }
func (d *Driver) GetSSHUsername() string {
if d.SSHUser == "" {
d.SSHUser = "docker"
}
return d.SSHUser
}
// DriverName returns the name of the driver // DriverName returns the name of the driver
func (d *Driver) DriverName() string { func (d *Driver) DriverName() string {
return "hyperv" return "hyperv"
@ -156,8 +147,6 @@ func (d *Driver) PreCreateCheck() error {
} }
func (d *Driver) Create() error { func (d *Driver) Create() error {
d.setMachineNameIfNotSet()
b2dutils := mcnutils.NewB2dUtils(d.StorePath) b2dutils := mcnutils.NewB2dUtils(d.StorePath)
if err := b2dutils.CopyIsoToMachineDir(d.Boot2DockerURL, d.MachineName); err != nil { if err := b2dutils.CopyIsoToMachineDir(d.Boot2DockerURL, d.MachineName); err != nil {
return err return err
@ -347,12 +336,6 @@ func (d *Driver) Kill() error {
return nil return nil
} }
func (d *Driver) setMachineNameIfNotSet() {
if d.MachineName == "" {
d.MachineName = fmt.Sprintf("docker-machine-unknown")
}
}
func (d *Driver) GetIP() (string, error) { func (d *Driver) GetIP() (string, error) {
command := []string{ command := []string{
"((", "((",

8
drivers/hyperv/hyperv_test.go
View File

@ -16,7 +16,13 @@ func TestSetConfigFromFlags(t *testing.T) {
} }
err := driver.SetConfigFromFlags(checkFlags) err := driver.SetConfigFromFlags(checkFlags)
assert.NoError(t, err) assert.NoError(t, err)
assert.Empty(t, checkFlags.InvalidFlags) 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)
} }