MAAS

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

  1. Git
  2. lp:~d0ugal/maas
  3. machine-list-owner-data
  4. Merge into 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
diff --git a/src/maasserver/websockets/handlers/machine.py b/src/maasserver/websockets/handlers/machine.py
index 469e072..6e2598f 100644
--- a/src/maasserver/websockets/handlers/machine.py
+++ b/src/maasserver/websockets/handlers/machine.py
@@ -133,6 +133,7 @@ class MachineHandler(NodeHandler):
133 .prefetch_related("boot_interface__vlan__fabric")133 .prefetch_related("boot_interface__vlan__fabric")
134 .prefetch_related("tags")134 .prefetch_related("tags")
135 .prefetch_related("pool")135 .prefetch_related("pool")
136 .prefetch_related("ownerdata_set")
136 .annotate(137 .annotate(
137 status_event_type_description=Subquery(138 status_event_type_description=Subquery(
138 Event.objects.filter(139 Event.objects.filter(
@@ -361,6 +362,8 @@ class MachineHandler(NodeHandler):
361 node_script_results362 node_script_results
362 )363 )
363364
365 data["owner_data"] = OwnerData.objects.get_owner_data(obj)
366
364 if not for_list:367 if not for_list:
365 # Add info specific to a machine.368 # Add info specific to a machine.
366 data["show_os_info"] = self.dehydrate_show_os_info(obj)369 data["show_os_info"] = self.dehydrate_show_os_info(obj)
diff --git a/src/maasserver/websockets/handlers/tests/test_controller.py b/src/maasserver/websockets/handlers/tests/test_controller.py
index 84a157f..873fff1 100644
--- a/src/maasserver/websockets/handlers/tests/test_controller.py
+++ b/src/maasserver/websockets/handlers/tests/test_controller.py
@@ -108,12 +108,12 @@ class TestControllerHandler(MAASServerTestCase):
108 # and slowing down the client waiting for the response.108 # and slowing down the client waiting for the response.
109 self.assertEqual(109 self.assertEqual(
110 queries_one,110 queries_one,
111 4,111 5,
112 "Number of queries has changed; make sure this is expected.",112 "Number of queries has changed; make sure this is expected.",
113 )113 )
114 self.assertEqual(114 self.assertEqual(
115 queries_total,115 queries_total,
116 4,116 5,
117 "Number of queries has changed; make sure this is expected.",117 "Number of queries has changed; make sure this is expected.",
118 )118 )
119119
diff --git a/src/maasserver/websockets/handlers/tests/test_machine.py b/src/maasserver/websockets/handlers/tests/test_machine.py
index 8f46f16..3d3460f 100644
--- a/src/maasserver/websockets/handlers/tests/test_machine.py
+++ b/src/maasserver/websockets/handlers/tests/test_machine.py
@@ -61,6 +61,7 @@ from maasserver.models.nodeprobeddetails import (
61 get_single_probed_details,61 get_single_probed_details,
62 script_output_nsmap,62 script_output_nsmap,
63)63)
64from maasserver.models.ownerdata import OwnerData
64from maasserver.models.partition import Partition, PARTITION_ALIGNMENT_SIZE65from maasserver.models.partition import Partition, PARTITION_ALIGNMENT_SIZE
65import maasserver.node_action as node_action_module66import maasserver.node_action as node_action_module
66from maasserver.node_action import compile_node_actions67from maasserver.node_action import compile_node_actions
@@ -321,6 +322,7 @@ class TestMachineHandler(MAASServerTestCase):
321 "zone": handler.dehydrate_zone(node.zone),322 "zone": handler.dehydrate_zone(node.zone),
322 "pool": handler.dehydrate_pool(node.pool),323 "pool": handler.dehydrate_pool(node.pool),
323 "default_user": node.default_user,324 "default_user": node.default_user,
325 "owner_data": OwnerData.objects.get_owner_data(node),
324 }326 }
325 if "module" in driver and "comment" in driver:327 if "module" in driver and "comment" in driver:
326 data["third_party_driver"] = {328 data["third_party_driver"] = {
@@ -354,6 +356,7 @@ class TestMachineHandler(MAASServerTestCase):
354 "ip_addresses",356 "ip_addresses",
355 "link_type",357 "link_type",
356 "metadata",358 "metadata",
359 "owner_data",
357 "node_type_display",360 "node_type_display",
358 "numa_nodes_count",361 "numa_nodes_count",
359 "osystem",362 "osystem",
@@ -577,14 +580,15 @@ class TestMachineHandler(MAASServerTestCase):
577 # It is important to keep this number as low as possible. A larger580 # It is important to keep this number as low as possible. A larger
578 # number means regiond has to do more work slowing down its process581 # number means regiond has to do more work slowing down its process
579 # and slowing down the client waiting for the response.582 # and slowing down the client waiting for the response.
583 expected_query_count = 24
580 self.assertEqual(584 self.assertEqual(
581 queries_one,585 queries_one,
582 23,586 expected_query_count,
583 "Number of queries has changed; make sure this is expected.",587 "Number of queries has changed; make sure this is expected.",
584 )588 )
585 self.assertEqual(589 self.assertEqual(
586 queries_total,590 queries_total,
587 23,591 expected_query_count,
588 "Number of queries has changed; make sure this is expected.",592 "Number of queries has changed; make sure this is expected.",
589 )593 )
590594
@@ -629,7 +633,7 @@ class TestMachineHandler(MAASServerTestCase):
629 # It is important to keep this number as low as possible. A larger633 # It is important to keep this number as low as possible. A larger
630 # number means regiond has to do more work slowing down its process634 # number means regiond has to do more work slowing down its process
631 # and slowing down the client waiting for the response.635 # and slowing down the client waiting for the response.
632 expected_query_count = 23636 expected_query_count = 24
633 self.assertEqual(637 self.assertEqual(
634 queries_one,638 queries_one,
635 expected_query_count,639 expected_query_count,
@@ -673,7 +677,7 @@ class TestMachineHandler(MAASServerTestCase):
673 # and slowing down the client waiting for the response.677 # and slowing down the client waiting for the response.
674 self.assertEqual(678 self.assertEqual(
675 queries,679 queries,
676 51,680 52,
677 "Number of queries has changed; make sure this is expected.",681 "Number of queries has changed; make sure this is expected.",
678 )682 )
679683

Subscribers

People subscribed via source and target branches