lp:~maas-maintainers/maas/maas-ha
Created by
Lee Trager
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
- Blake Rouse (community): Approve
-
Diff: 2841 lines (+582/-382)37 files modifiedsrc/maasserver/api/interfaces.py (+8/-7)
src/maasserver/api/nodes.py (+0/-6)
src/maasserver/api/tests/test_devices.py (+45/-45)
src/maasserver/api/tests/test_events.py (+5/-2)
src/maasserver/api/tests/test_interfaces.py (+20/-17)
src/maasserver/api/tests/test_node.py (+11/-10)
src/maasserver/api/tests/test_nodes.py (+7/-12)
src/maasserver/enum.py (+15/-0)
src/maasserver/fixtures/dev_fixture.yaml (+11/-11)
src/maasserver/forms.py (+2/-1)
src/maasserver/migrations/builtin/maasserver/0003_add_node_type_to_node.py (+22/-0)
src/maasserver/migrations/builtin/maasserver/0004_migrate_installable_to_node_type.py (+29/-0)
src/maasserver/migrations/builtin/maasserver/0005_delete_installable_from_node.py (+21/-0)
src/maasserver/models/__init__.py (+5/-2)
src/maasserver/models/interface.py (+4/-3)
src/maasserver/models/node.py (+30/-16)
src/maasserver/models/signals/power.py (+0/-5)
src/maasserver/models/staticipaddress.py (+1/-1)
src/maasserver/models/tests/test_node.py (+58/-21)
src/maasserver/models/tests/test_staticipaddress.py (+1/-1)
src/maasserver/models/tests/test_zone.py (+37/-12)
src/maasserver/models/zone.py (+10/-4)
src/maasserver/node_action.py (+28/-27)
src/maasserver/rpc/nodes.py (+0/-2)
src/maasserver/rpc/tests/test_nodes.py (+4/-4)
src/maasserver/static/partials/subnet-details.html (+9/-2)
src/maasserver/testing/factory.py (+19/-10)
src/maasserver/tests/test_auth.py (+4/-4)
src/maasserver/tests/test_listener.py (+23/-22)
src/maasserver/tests/test_node_action.py (+13/-12)
src/maasserver/triggers.py (+115/-103)
src/maasserver/websockets/handlers/device.py (+3/-2)
src/maasserver/websockets/handlers/general.py (+4/-4)
src/maasserver/websockets/handlers/node.py (+5/-5)
src/maasserver/websockets/handlers/tests/test_device.py (+4/-2)
src/maasserver/websockets/handlers/tests/test_general.py (+3/-3)
src/maasserver/websockets/handlers/tests/test_node.py (+6/-4)
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~maas-committers/maas/trunk