Merge lp://staging/~mpontillo/maas/subnet-restrictions-when-dhcp-enabled-bug-1583392 into lp://staging/~maas-committers/maas/trunk

Proposed by Mike Pontillo
Status: Merged
Approved by: Mike Pontillo
Approved revision: no longer in the source branch.
Merged at revision: 5063
Proposed branch: lp://staging/~mpontillo/maas/subnet-restrictions-when-dhcp-enabled-bug-1583392
Merge into: lp://staging/~maas-committers/maas/trunk
Diff against target: 50 lines (+16/-2)
3 files modified
src/maasserver/models/subnet.py (+8/-0)
src/maasserver/models/tests/test_subnet.py (+5/-0)
src/maasserver/testing/factory.py (+3/-2)
To merge this branch: bzr merge lp://staging/~mpontillo/maas/subnet-restrictions-when-dhcp-enabled-bug-1583392
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+295899@code.staging.launchpad.net

Commit message

Prevent users from deleting a subnet where the VLAN has DHCP enabled and a dynamic range is currently being serviced.

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

Looks good!

review: Approve
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Thanks for the comments.

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.