Merge pull request #47 from voidspace/maas2-create-device-vlan

Use the correct VLAN in machine.CreateDevice machine.CreateDevice was using the wrong VLAN in the update call.
juju · Apr 27, 2016 · 794d847 · 794d847
2 parents 9ec917c + 1db7b18
commit 794d847
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/machine.go b/machine.go
@@ -308,7 +308,7 @@ func (m *machine) CreateDevice(args CreateMachineDeviceArgs) (_ Device, err erro
 		updateArgs.Name = args.InterfaceName
 	}
 	if iface.VLAN().ID() != args.Subnet.VLAN().ID() {
-		updateArgs.VLAN = iface.VLAN()
+		updateArgs.VLAN = args.Subnet.VLAN()
 	}
 	err = iface.Update(updateArgs)
 	if err != nil {

diff --git a/machine_test.go b/machine_test.go
@@ -270,6 +270,7 @@ func (s *machineSuite) TestCreateDevice(c *gc.C) {
 	})
 	c.Assert(err, jc.ErrorIsNil)
 	c.Assert(device.InterfaceSet()[0].Name(), gc.Equals, "eth4")
+	c.Assert(device.InterfaceSet()[0].VLAN().ID(), gc.Equals, subnet.VLAN().ID())
 }
 
 func (s *machineSuite) TestCreateDeviceTriesToDeleteDeviceOnError(c *gc.C) {