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

[Jack Lloyd-Walters]

Fixes 2002550 and introduce test to ensure UI component is found

1c7dd7a... by Jack Lloyd-Walters on 2023-01-11

ensure controllers still define their node types

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 1c7dd7a741dc79cfc1ff30c543592abb3245088a

review: Approve

[Adam Collard (adam-collard)]

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

review: Needs Information

92febeb... by Jack Lloyd-Walters on 2023-01-12

change dehydrate

[MAAS Lander (maas-lander)]

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

[Adam Collard (adam-collard)]

Tests need updating

review: Needs Fixing

079fee1... by Jack Lloyd-Walters on 2023-01-17

behaviour as expected

[Jack Lloyd-Walters (lloydwaltersj)]

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

[MAAS Lander (maas-lander)]

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

[Jack Lloyd-Walters (lloydwaltersj)]

jenkins: !test

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 079fee1169a0f96d060c6d94f724b041f2a67c1e

review: Approve

[Adam Collard (adam-collard)]

review: Abstain

[Alberto Donato (ack)]

+1, with a nit inline

review: Approve

816a9e4... by Jack Lloyd-Walters on 2023-01-18

respond to feedback

[MAAS Lander (maas-lander)]

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 on 2023-01-18

Revert "respond to feedback"

This reverts commit 816a9e4ab8f80a27ff4b3aa5bea2c163ddcca1e9.

637b081... by Jack Lloyd-Walters on 2023-01-18

respond to feedback

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 637b081eb4a9e7e43e4e0fa286b7ac34040187bd

review: Approve

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):
 
         data.update(
             {
+                "node_type_display": obj.get_node_type_display(),
                 "vlans_ha": {
                     "true": vlan_counts[True],
                     "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):
             list_results[0]["tags"], [tag.id for tag in tags]
         )
 
+    def test_dehydrate_includes_node_display_type(self):
+        owner = factory.make_admin()
+        handler = ControllerHandler(owner, {}, None)
+        region = factory.make_RegionRackController()
+        list_results = handler.list({})
+        self.assertIn("node_type_display", list_results[0])
+        self.assertEqual(
+            list_results[0]["node_type_display"],
+            region.get_node_type_display(),
+        )
+
     def test_register_info_non_admin(self):
         user = factory.make_User()
         handler = ControllerHandler(user, {}, None)