Merge lp:~julian-edwards/maas/static-range-in-ui-api into lp:~maas-committers/maas/trunk
Proposed by
Julian Edwards
Status: | Merged | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Julian Edwards | ||||||||||||
Approved revision: | no longer in the source branch. | ||||||||||||
Merged at revision: | 2413 | ||||||||||||
Proposed branch: | lp:~julian-edwards/maas/static-range-in-ui-api | ||||||||||||
Merge into: | lp:~maas-committers/maas/trunk | ||||||||||||
Diff against target: |
237 lines (+65/-17) 7 files modified
src/maasserver/api.py (+19/-5) src/maasserver/forms.py (+2/-0) src/maasserver/models/nodegroup.py (+5/-2) src/maasserver/models/nodegroupinterface.py (+10/-4) src/maasserver/models/tests/test_nodegroup.py (+2/-0) src/maasserver/testing/factory.py (+22/-5) src/maasserver/tests/test_forms.py (+5/-1) |
||||||||||||
To merge this branch: | bzr merge lp:~julian-edwards/maas/static-range-in-ui-api | ||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raphaël Badin (community) | Approve | ||
Review via email: mp+222590@code.launchpad.net |
Commit message
Ensure static_
Description of the change
Mostly mechanical change to allow UI/API editing of the new static IP ranges in cluster interfaces. I added help text to some of the fields since it now seems prudent to differentiate the range types.
To post a comment you must log in.
Looks good. See my comments inline; I guess we will add validation for the new fields in a follow-up branch (check that the static range doesn't overlap with other ip ranges [static or dynamic])…?