MAAS

Merge lp://staging/~mpontillo/maas/ip-allocation-fixes-trunk into lp://staging/~maas-committers/maas/trunk

ip-allocation-fixes-trunk
Merge into trunk

Proposed by Mike Pontillo on 2015-12-04

Status:

Merged

Approved by:

Mike Pontillo on 2015-12-09

Approved revision:

no longer in the source branch.

Merged at revision:

4547

Proposed branch:

lp://staging/~mpontillo/maas/ip-allocation-fixes-trunk

Merge into:

lp://staging/~maas-committers/maas/trunk

Diff against target:

982 lines (+548/-54)

15 files modified

.idea/encodings.xml (+3/-1)
.idea/maas.iml (+1/-1)
.idea/misc.xml (+1/-1)
.idea/vcs.xml (+0/-6)
src/maasserver/api/devices.py (+17/-7)
src/maasserver/api/tests/test_devices.py (+133/-0)
src/maasserver/models/interface.py (+98/-20)
src/maasserver/models/node.py (+5/-1)
src/maasserver/models/nodegroupinterface.py (+37/-3)
src/maasserver/models/staticipaddress.py (+9/-4)
src/maasserver/models/subnet.py (+8/-1)
src/maasserver/models/tests/test_interface.py (+115/-5)
src/maasserver/models/tests/test_nodegroupinterface.py (+35/-0)
src/maasserver/testing/factory.py (+14/-4)
utilities/remote-reinstall (+72/-0)

To merge this branch:

bzr merge lp://staging/~mpontillo/maas/ip-allocation-fixes-trunk

Related bugs:

Bug #1519077: MAAS assigns IP addresses on unmanaged subnets without consideration for some addresses known to be in use	High	Fix Released
Bug #1519090: [1.9] DHCP interface automatically obtains an IP even when the subnet is unmanaged	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Blake Rouse (community)		2015-12-04	Approve on 2015-12-09
Review via email: mp+279652@code.staging.launchpad.net

Commit message

Merge revision 4520 from MAAS 1.9 (IP allocation fixes, bug #1519090, bug #1519077)

Revision history for this message

Mike Pontillo (mpontillo) wrote on 2015-12-04:

So for trunk/xenial... I assume remote-reinstall should use /usr/lib/python3.5/dist-packages. Is that correct? Is there a way to determine this at runtime, so I don't have to guess? I looked in the packaging branch but it wasn't obvious. We have lines like this in the *.install files:

debian/tmp/usr/lib/python*/dist-packages/maasserver

But I don't know how it determines how to get the appropriate python version.

Revision history for this message

Blake Rouse (blake-rouse) wrote on 2015-12-04:

It should be /usr/lib/python3/dist-packages the "3.5" is not used for python 3 its just "3".

This will not pass in the new python3 landed you cannot use json.loads directly in the tests. A helper has been created for this:

from maasserver.utils.converters import json_load_bytes

json_load_bytes(response.content)

This is because response.content is a bytes object not a unicode string and json.loads only accepts unicode strings. That helper decodes the response.content from a bytes string in to a unicode string using the settings.DEFAULT_CHARSET.

review: Needs Fixing

Revision history for this message

Mike Pontillo (mpontillo) wrote on 2015-12-09:

Blake, I think this is ready for another look. Thanks in advance.

Revision history for this message

Blake Rouse (blake-rouse) wrote on 2015-12-09:

Thanks for the fixes.

review: Approve