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

VSwitch name should be saved to config.json 

Signed-off-by: David Gageot <david@gageot.net>
This commit is contained in:
David Gageot 2015-12-23 09:25:41 +01:00
parent 40ab483a35
commit 7e7c83427a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/hyperv/hyperv.go
View File

@ -20,7 +20,7 @@ import (
type Driver struct {
*drivers.BaseDriver
Boot2DockerURL string
vSwitch string
VSwitch string
diskImage string
DiskSize int
MemSize int
@ -77,7 +77,7 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
d.Boot2DockerURL = flags.String("hyperv-boot2docker-url")
d.vSwitch = flags.String("hyperv-virtual-switch")
d.VSwitch = flags.String("hyperv-virtual-switch")
d.DiskSize = flags.Int("hyperv-disk-size")
d.MemSize = flags.Int("hyperv-memory")
d.CPU = flags.Int("hyperv-cpu-count")
@ -220,7 +220,7 @@ func (d *Driver) chooseVirtualSwitch() (string, error) {
switches := parseLines(stdout)
if d.vSwitch == "" {
if d.VSwitch == "" {
if len(switches) < 1 {
return "", fmt.Errorf("no vswitch found")
}
@ -230,17 +230,17 @@ func (d *Driver) chooseVirtualSwitch() (string, error) {
found := false
for _, name := range switches {
if name == d.vSwitch {
if name == d.VSwitch {
found = true
break
}
}
if !found {
return "", fmt.Errorf("vswitch %q not found", d.vSwitch)
return "", fmt.Errorf("vswitch %q not found", d.VSwitch)
}
return d.vSwitch, nil
return d.VSwitch, nil
}
func (d *Driver) wait() error {

4
drivers/hyperv/hyperv_test.go
View File

@ -24,7 +24,7 @@ func TestSetConfigFromDefaultFlags(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, "", driver.Boot2DockerURL)
assert.Equal(t, "", driver.vSwitch)
assert.Equal(t, "", driver.VSwitch)
assert.Equal(t, defaultDiskSize, driver.DiskSize)
assert.Equal(t, defaultMemory, driver.MemSize)
assert.Equal(t, defaultCPU, driver.CPU)
@ -54,7 +54,7 @@ func TestSetConfigFromCustomFlags(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, "B2D_URL", driver.Boot2DockerURL)
assert.Equal(t, "TheSwitch", driver.vSwitch)
assert.Equal(t, "TheSwitch", driver.VSwitch)
assert.Equal(t, 100000, driver.DiskSize)
assert.Equal(t, 4096, driver.MemSize)
assert.Equal(t, 4, driver.CPU)