MAAS

Merge lp://qastaging/~newell-jensen/maas/fix-1621635 into lp://qastaging/~maas-committers/maas/trunk

  1. fix-1621635
  2. Merge into trunk
Proposed by Newell Jensen
Status: Merged
Approved by: Newell Jensen
Approved revision: no longer in the source branch.
Merged at revision: 5555
Proposed branch: lp://qastaging/~newell-jensen/maas/fix-1621635
Merge into: lp://qastaging/~maas-committers/maas/trunk
Diff against target: 61 lines (+18/-0)
3 files modified
src/maasserver/static/partials/node-details.html (+7/-0)
src/maasserver/websockets/handlers/node.py (+9/-0)
src/maasserver/websockets/handlers/tests/test_machine.py (+2/-0)
To merge this branch: bzr merge lp://qastaging/~newell-jensen/maas/fix-1621635
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+310605@code.qastaging.launchpad.net

Commit message

Add dhcp_on to the node websocket handler dehydrate method so that we can see when a node has a VLAN which is providing DHCP.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

I've made a suggestion for an improvement. Needs tests though.

review: Needs Fixing
Revision history for this message
Newell Jensen (newell-jensen) wrote :

> I've made a suggestion for an improvement. Needs tests though.

Because of the unit tests and limiting the amount of queries that are induced when dehydrating the node, I actually ended up getting the information of whether or not MAAS is providing DHCP in a slightly different way. Thanks for looking at this.

Revision history for this message
Gavin Panella (allenap) :
review: Needs Fixing
Revision history for this message
Blake Rouse (blake-rouse) :
Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.