~blake-rouse/maas:rbac-websocket-part3

Branch merges

Propose for merging

Merged into maas:rbac-integration

Mike Pontillo (community): Approve on 2018-11-21

MAAS Lander: Approve on 2018-11-21

Diff: 1463 lines (+288/-257)

22 files modified

src/maasserver/websockets/base.py (+56/-10)
src/maasserver/websockets/handlers/config.py (+3/-2)
src/maasserver/websockets/handlers/device.py (+12/-26)
src/maasserver/websockets/handlers/dhcpsnippet.py (+4/-5)
src/maasserver/websockets/handlers/general.py (+2/-4)
src/maasserver/websockets/handlers/machine.py (+59/-42)
src/maasserver/websockets/handlers/notification.py (+1/-3)
src/maasserver/websockets/handlers/packagerepository.py (+3/-4)
src/maasserver/websockets/handlers/pod.py (+1/-1)
src/maasserver/websockets/handlers/resourcepool.py (+3/-0)
src/maasserver/websockets/handlers/sshkey.py (+3/-2)
src/maasserver/websockets/handlers/staticroute.py (+3/-4)
src/maasserver/websockets/handlers/subnet.py (+1/-3)
src/maasserver/websockets/handlers/switch.py (+1/-2)
src/maasserver/websockets/handlers/tests/test_config.py (+2/-1)
src/maasserver/websockets/handlers/tests/test_device.py (+1/-1)
src/maasserver/websockets/handlers/tests/test_machine.py (+47/-45)
src/maasserver/websockets/handlers/tests/test_notification.py (+0/-20)
src/maasserver/websockets/handlers/tests/test_vlan.py (+3/-56)
src/maasserver/websockets/handlers/user.py (+2/-3)
src/maasserver/websockets/handlers/vlan.py (+9/-9)
src/maasserver/websockets/tests/test_base.py (+72/-14)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

cf7b3a2... by Blake Rouse on 2018-11-21

Refresh user on_listen.

7cba35c... by Blake Rouse on 2018-11-21

Fix bad merge.

02e664b... by Blake Rouse on 2018-11-20

Fix all permissions in websocket.

6c81ca3... by Blake Rouse on 2018-11-20

Fix the node actions to use permission checks instead of handling the checks internally. Add permission checks to the device and machine forms.

Squashed commit of the following:

commit 44e16161a849baa28eb085ae0fe7cea7abc31c9d
Author: Blake Rouse <email address hidden>
Date: Tue Nov 20 13:33:20 2018 -0500

    Part 2.

34d4a76... by Blake Rouse on 2018-11-20

Use a thread-local cache to cache resource pool identifiers per request. Prevent administrators from editing locked machines. Add global permissions levels for NodePermission.admin and NodePermission.view.

Squashed commit of the following:

commit 73408d5588c64a82ee99e8c74b7ffb3a9d76af5d
Author: Blake Rouse <email address hidden>
Date: Tue Nov 20 13:26:05 2018 -0500

    Move private method.

commit 37c1e2a58582e3c06cf83e2d06402721d6160445
Author: Blake Rouse <email address hidden>
Date: Tue Nov 20 12:58:17 2018 -0500

    Add tests.

commit bcd535dcf2f0731f5a8b57aed20bb0f052fc9366
Author: Blake Rouse <email address hidden>
Date: Tue Nov 20 11:52:10 2018 -0500

    Split 1.

b2b9b63... by Spencer Seidel on 2018-11-21

Fixed incorrect formatting of CLI help for docstrings containing API annotations.

3def6e3... by Mike Pontillo on 2018-11-20

Add connectivity check and retry behavior to web UI.

 * Periodically send WebSocket requests to ensure connectivity.
 * Attempt to retry connection if requests are not answered in a timely manner.
 * Fix tests to ensure real WebSocket connections are not attempted.
 * Change .gitattributes to ensure built JavaScript and bundles and CSS are not included in text-based diff output.
 * Enable cache to make webpack builds faster.

Partial fix for bug #1802325.

ede2761... by Spencer Seidel on 2018-11-20

Added API annotations to regioncontrollers and example update output.

70c14ae... by Andres Rodriguez on 2018-11-20

LP: 1781598 - Virtual scrolling for subnet details page, IP address table

93c7bad... by Lee Trager on 2018-11-20

LP: #1793478 - Ask for confirmation before deleting a controller which manages a VLAN.