From 7e7c83427af389a3f10cbac82179dfe2b830afac Mon Sep 17 00:00:00 2001 From: David Gageot Date: Wed, 23 Dec 2015 09:25:41 +0100 Subject: [PATCH] VSwitch name should be saved to config.json Signed-off-by: David Gageot --- drivers/hyperv/hyperv.go | 12 ++++++------ drivers/hyperv/hyperv_test.go | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/hyperv/hyperv.go b/drivers/hyperv/hyperv.go index c0bb24b7f7..29708caf90 100644 --- a/drivers/hyperv/hyperv.go +++ b/drivers/hyperv/hyperv.go @@ -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 { diff --git a/drivers/hyperv/hyperv_test.go b/drivers/hyperv/hyperv_test.go index b8d7a38c87..ab4659594b 100644 --- a/drivers/hyperv/hyperv_test.go +++ b/drivers/hyperv/hyperv_test.go @@ -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)