Merge ~lloydwaltersj/maas:undefined-controller-type into maas:master

Proposed by Jack Lloyd-Walters
Status: Merged
Approved by: Jack Lloyd-Walters
Approved revision: 637b081eb4a9e7e43e4e0fa286b7ac34040187bd
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~lloydwaltersj/maas:undefined-controller-type
Merge into: maas:master
Diff against target: 34 lines (+12/-0)
2 files modified
src/maasserver/websockets/handlers/controller.py (+1/-0)
src/maasserver/websockets/handlers/tests/test_controller.py (+11/-0)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Alberto Donato (community) Approve
Adam Collard (community) Abstain
Review via email: mp+435593@code.launchpad.net

Commit message

Fixes 2002550 and introduce test to ensure UI component is found

To post a comment you must log in.
1c7dd7a... by Jack Lloyd-Walters

ensure controllers still define their node types

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

UNIT TESTS
-b undefined-controller-type lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 1c7dd7a741dc79cfc1ff30c543592abb3245088a

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

Why the explicit else: clause here and not adding to controller.ControllerHandler.list_fields?

review: Needs Information
92febeb... by Jack Lloyd-Walters

change dehydrate

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

UNIT TESTS
-b undefined-controller-type lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/1758/consoleText
COMMIT: 92febeb3cf6f4d6b3087eb2dbacd462552f81d60

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

Tests need updating

review: Needs Fixing
079fee1... by Jack Lloyd-Walters

behaviour as expected

Revision history for this message
Jack Lloyd-Walters (lloydwaltersj) wrote :

That should use the list_fields as expected, not sure what I broke that made this take so long

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

UNIT TESTS
-b undefined-controller-type lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/1783/consoleText
COMMIT: 079fee1169a0f96d060c6d94f724b041f2a67c1e

review: Needs Fixing
Revision history for this message
Jack Lloyd-Walters (lloydwaltersj) wrote :

jenkins: !test

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

UNIT TESTS
-b undefined-controller-type lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 079fee1169a0f96d060c6d94f724b041f2a67c1e

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

+1, with a nit inline

review: Approve
816a9e4... by Jack Lloyd-Walters

respond to feedback

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

UNIT TESTS
-b undefined-controller-type lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/1801/consoleText
COMMIT: 816a9e4ab8f80a27ff4b3aa5bea2c163ddcca1e9

review: Needs Fixing
0587de3... by Jack Lloyd-Walters

Revert "respond to feedback"

This reverts commit 816a9e4ab8f80a27ff4b3aa5bea2c163ddcca1e9.

637b081... by Jack Lloyd-Walters

respond to feedback

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

UNIT TESTS
-b undefined-controller-type lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 637b081eb4a9e7e43e4e0fa286b7ac34040187bd

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/maasserver/websockets/handlers/controller.py b/src/maasserver/websockets/handlers/controller.py
index 0e54ff9..5bf4c7b 100644
--- a/src/maasserver/websockets/handlers/controller.py
+++ b/src/maasserver/websockets/handlers/controller.py
@@ -183,6 +183,7 @@ class ControllerHandler(NodeHandler):
183183
184 data.update(184 data.update(
185 {185 {
186 "node_type_display": obj.get_node_type_display(),
186 "vlans_ha": {187 "vlans_ha": {
187 "true": vlan_counts[True],188 "true": vlan_counts[True],
188 "false": vlan_counts[False],189 "false": vlan_counts[False],
diff --git a/src/maasserver/websockets/handlers/tests/test_controller.py b/src/maasserver/websockets/handlers/tests/test_controller.py
index 114d03a..038d2c8 100644
--- a/src/maasserver/websockets/handlers/tests/test_controller.py
+++ b/src/maasserver/websockets/handlers/tests/test_controller.py
@@ -436,6 +436,17 @@ class TestControllerHandler(MAASServerTestCase):
436 list_results[0]["tags"], [tag.id for tag in tags]436 list_results[0]["tags"], [tag.id for tag in tags]
437 )437 )
438438
439 def test_dehydrate_includes_node_display_type(self):
440 owner = factory.make_admin()
441 handler = ControllerHandler(owner, {}, None)
442 region = factory.make_RegionRackController()
443 list_results = handler.list({})
444 self.assertIn("node_type_display", list_results[0])
445 self.assertEqual(
446 list_results[0]["node_type_display"],
447 region.get_node_type_display(),
448 )
449
439 def test_register_info_non_admin(self):450 def test_register_info_non_admin(self):
440 user = factory.make_User()451 user = factory.make_User()
441 handler = ControllerHandler(user, {}, None)452 handler = ControllerHandler(user, {}, None)

Subscribers

People subscribed via source and target branches