MAAS

Merge ~cgrabowski/maas:do_not_hide_enable_hw_sync_on_websocket into maas:master

  1. Git
  2. lp:~cgrabowski/maas
  3. do_not_hide_enable_hw_sync_on_websocket
  4. Merge into master
Proposed by Christian Grabowski
Status: Merged
Approved by: Christian Grabowski
Approved revision: bcbd506b6b27d7997e972d2e69da7378108fa23f
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~cgrabowski/maas:do_not_hide_enable_hw_sync_on_websocket
Merge into: maas:master
Diff against target: 24 lines (+1/-1)
2 files modified
src/maasserver/websockets/handlers/machine.py (+0/-1)
src/maasserver/websockets/handlers/tests/test_machine.py (+1/-0)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Alexsander de Souza Approve
Review via email: mp+417747@code.launchpad.net

Commit message

include enable_hw_sync in machine dehydrate

To post a comment you must log in.
Revision history for this message
Alexsander de Souza (alexsander-souza) wrote :

+1

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b do_not_hide_enable_hw_sync_on_websocket lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/12208/console
COMMIT: 4ba566d6555b55ce794ef4c9a57335ce74ea1e33

review: Needs Fixing
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b do_not_hide_enable_hw_sync_on_websocket lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/12211/console
COMMIT: 6998ca34dbc23525e44318ecf5642014ebbc1175

review: Needs Fixing
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b do_not_hide_enable_hw_sync_on_websocket lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: bcbd506b6b27d7997e972d2e69da7378108fa23f

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b do_not_hide_enable_hw_sync_on_websocket lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/12221/consoleText

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/websockets/handlers/machine.py b/src/maasserver/websockets/handlers/machine.py
2index 9b99616..5bbb6ad 100644
3--- a/src/maasserver/websockets/handlers/machine.py
4+++ b/src/maasserver/websockets/handlers/machine.py
5@@ -229,7 +229,6 @@ class MachineHandler(NodeHandler):
6 "install_kvm",
7 "register_vmhost",
8 "current_config",
9- "enable_hw_sync",
10 ]
11 list_fields = [
12 "id",
13diff --git a/src/maasserver/websockets/handlers/tests/test_machine.py b/src/maasserver/websockets/handlers/tests/test_machine.py
14index 7289bc2..8a6916b 100644
15--- a/src/maasserver/websockets/handlers/tests/test_machine.py
16+++ b/src/maasserver/websockets/handlers/tests/test_machine.py
17@@ -283,6 +283,7 @@ class TestMachineHandler(MAASServerTestCase):
18 key=itemgetter("fqdn"),
19 ),
20 "domain": handler.dehydrate_domain(node.domain),
21+ "enable_hw_sync": node.enable_hw_sync,
22 "permissions": permissions,
23 "physical_disk_count": node.physicalblockdevice_set.count(),
24 "disks": disks,

Subscribers

People subscribed via source and target branches