Merge lp:~mpontillo/maas/l2-spaces--phase1 into lp:~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: | 5594 |
Proposed branch: | lp:~mpontillo/maas/l2-spaces--phase1 |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
376 lines (+191/-15) 11 files modified
src/maasserver/api/tests/test_vlans.py (+62/-0) src/maasserver/api/vlans.py (+15/-0) src/maasserver/forms_vlan.py (+22/-11) src/maasserver/migrations/builtin/maasserver/0096_set_default_vlan_field.py (+1/-2) src/maasserver/migrations/builtin/maasserver/0098_add_space_to_vlan.py (+24/-0) src/maasserver/migrations/builtin/maasserver/0099_set_default_vlan_field.py (+24/-0) src/maasserver/models/vlan.py (+4/-0) src/maasserver/static/partials/vlan-details.html (+3/-0) src/maasserver/testing/factory.py (+2/-2) src/maasserver/tests/test_forms_vlan.py (+33/-0) src/maasserver/websockets/handlers/tests/test_vlan.py (+1/-0) |
To merge this branch: | bzr merge lp:~mpontillo/maas/l2-spaces--phase1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gavin Panella (community) | Approve | ||
Review via email: mp+312563@code.launchpad.net |
Commit message
L2 spaces: Phase 1
* Add 'space' reference to VLAN.
* Fix failing migration due to reference to maasserver.models.
* Allow modification via the Web UI and REST API.
Description of the change
Note: constraints will be done in a future branch.
To post a comment you must log in.
Seems good to me!