Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the correct VLAN in machine.CreateDevice #47

Merged
merged 2 commits into from
Apr 27, 2016
Merged

Use the correct VLAN in machine.CreateDevice #47

merged 2 commits into from
Apr 27, 2016

Conversation

voidspace
Copy link

machine.CreateDevice was using the wrong VLAN in the update call.

@@ -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())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to chase it down to check, but are you sure the subnet vlan id was different from the interface vlan id to start with? Did this fail before the fix?

@babbageclunk
Copy link
Contributor

Looks good to me!

@voidspace
Copy link
Author

$$merge$$

@jujubot
Copy link
Contributor

jujubot commented Apr 27, 2016

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju-gomaasapi

@jujubot jujubot merged commit 794d847 into juju:master Apr 27, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants