Merge ~d0ugal/maas:machine-list-owner-data into maas:master

Proposed by Dougal Matthews
Status: Rejected
Rejected by: Adam Collard
Proposed branch: ~d0ugal/maas:machine-list-owner-data
Merge into: maas:master
Diff against target: 103 lines (+13/-6)
3 files modified
src/maasserver/websockets/handlers/machine.py (+3/-0)
src/maasserver/websockets/handlers/tests/test_controller.py (+2/-2)
src/maasserver/websockets/handlers/tests/test_machine.py (+8/-4)
Reviewer Review Type Date Requested Status
MAAS Lander Needs Fixing
Björn Tillenius Approve
Review via email: mp+395529@code.launchpad.net

Commit message

Add OwnerData to the machine list websocket handler

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b machine-list-owner-data lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/8935/console
COMMIT: 8b219ef09e3fe1af403bee696a3824869aa4706c

review: Needs Fixing
~d0ugal/maas:machine-list-owner-data updated
3a2820f... by Dougal Matthews

isort

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

UNIT TESTS
-b machine-list-owner-data lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/8937/console
COMMIT: 3a2820f3390f478574d1f5f186bb77a8e72c9e38

review: Needs Fixing
~d0ugal/maas:machine-list-owner-data updated
1568bac... by Dougal Matthews

Fix count

Revision history for this message
Dougal Matthews (d0ugal) wrote :

jenkins: !test

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

UNIT TESTS
-b machine-list-owner-data lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/8941/console
COMMIT: 1568bac3b2e88d1ecd6d81ce6fc4172b4b419f9d

review: Needs Fixing
Revision history for this message
Dougal Matthews (d0ugal) wrote :

jenkins: !test

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

UNIT TESTS
-b machine-list-owner-data lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/8943/console
COMMIT: 1568bac3b2e88d1ecd6d81ce6fc4172b4b419f9d

review: Needs Fixing
Revision history for this message
Björn Tillenius (bjornt) wrote :

I think this can be landed, but please see comment inline.

review: Approve
Revision history for this message
Adam Collard (adam-collard) wrote :

jenkins: !test

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

UNIT TESTS
-b machine-list-owner-data lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/8952/console
COMMIT: 1568bac3b2e88d1ecd6d81ce6fc4172b4b419f9d

review: Needs Fixing
Revision history for this message
Adam Collard (adam-collard) wrote :

I've grabbed this and fixed the review comments, pushed to https://code.launchpad.net/~adam-collard/maas/+git/maas/+merge/395698

Unmerged commits

1568bac... by Dougal Matthews

Fix count

3a2820f... by Dougal Matthews

isort

8b219ef... by Dougal Matthews

Add OwnerData to the machine list websocket handler

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 469e072..6e2598f 100644
3--- a/src/maasserver/websockets/handlers/machine.py
4+++ b/src/maasserver/websockets/handlers/machine.py
5@@ -133,6 +133,7 @@ class MachineHandler(NodeHandler):
6 .prefetch_related("boot_interface__vlan__fabric")
7 .prefetch_related("tags")
8 .prefetch_related("pool")
9+ .prefetch_related("ownerdata_set")
10 .annotate(
11 status_event_type_description=Subquery(
12 Event.objects.filter(
13@@ -361,6 +362,8 @@ class MachineHandler(NodeHandler):
14 node_script_results
15 )
16
17+ data["owner_data"] = OwnerData.objects.get_owner_data(obj)
18+
19 if not for_list:
20 # Add info specific to a machine.
21 data["show_os_info"] = self.dehydrate_show_os_info(obj)
22diff --git a/src/maasserver/websockets/handlers/tests/test_controller.py b/src/maasserver/websockets/handlers/tests/test_controller.py
23index 84a157f..873fff1 100644
24--- a/src/maasserver/websockets/handlers/tests/test_controller.py
25+++ b/src/maasserver/websockets/handlers/tests/test_controller.py
26@@ -108,12 +108,12 @@ class TestControllerHandler(MAASServerTestCase):
27 # and slowing down the client waiting for the response.
28 self.assertEqual(
29 queries_one,
30- 4,
31+ 5,
32 "Number of queries has changed; make sure this is expected.",
33 )
34 self.assertEqual(
35 queries_total,
36- 4,
37+ 5,
38 "Number of queries has changed; make sure this is expected.",
39 )
40
41diff --git a/src/maasserver/websockets/handlers/tests/test_machine.py b/src/maasserver/websockets/handlers/tests/test_machine.py
42index 8f46f16..3d3460f 100644
43--- a/src/maasserver/websockets/handlers/tests/test_machine.py
44+++ b/src/maasserver/websockets/handlers/tests/test_machine.py
45@@ -61,6 +61,7 @@ from maasserver.models.nodeprobeddetails import (
46 get_single_probed_details,
47 script_output_nsmap,
48 )
49+from maasserver.models.ownerdata import OwnerData
50 from maasserver.models.partition import Partition, PARTITION_ALIGNMENT_SIZE
51 import maasserver.node_action as node_action_module
52 from maasserver.node_action import compile_node_actions
53@@ -321,6 +322,7 @@ class TestMachineHandler(MAASServerTestCase):
54 "zone": handler.dehydrate_zone(node.zone),
55 "pool": handler.dehydrate_pool(node.pool),
56 "default_user": node.default_user,
57+ "owner_data": OwnerData.objects.get_owner_data(node),
58 }
59 if "module" in driver and "comment" in driver:
60 data["third_party_driver"] = {
61@@ -354,6 +356,7 @@ class TestMachineHandler(MAASServerTestCase):
62 "ip_addresses",
63 "link_type",
64 "metadata",
65+ "owner_data",
66 "node_type_display",
67 "numa_nodes_count",
68 "osystem",
69@@ -577,14 +580,15 @@ class TestMachineHandler(MAASServerTestCase):
70 # It is important to keep this number as low as possible. A larger
71 # number means regiond has to do more work slowing down its process
72 # and slowing down the client waiting for the response.
73+ expected_query_count = 24
74 self.assertEqual(
75 queries_one,
76- 23,
77+ expected_query_count,
78 "Number of queries has changed; make sure this is expected.",
79 )
80 self.assertEqual(
81 queries_total,
82- 23,
83+ expected_query_count,
84 "Number of queries has changed; make sure this is expected.",
85 )
86
87@@ -629,7 +633,7 @@ class TestMachineHandler(MAASServerTestCase):
88 # It is important to keep this number as low as possible. A larger
89 # number means regiond has to do more work slowing down its process
90 # and slowing down the client waiting for the response.
91- expected_query_count = 23
92+ expected_query_count = 24
93 self.assertEqual(
94 queries_one,
95 expected_query_count,
96@@ -673,7 +677,7 @@ class TestMachineHandler(MAASServerTestCase):
97 # and slowing down the client waiting for the response.
98 self.assertEqual(
99 queries,
100- 51,
101+ 52,
102 "Number of queries has changed; make sure this is expected.",
103 )
104

Subscribers

People subscribed via source and target branches