Merge ~lloydwaltersj/maas:controller-certificate-metadata into maas:master

[Jack Lloyd-Walters]

add certificate metadata to controller websocket model

[Anton Troyanov (troyanov)]

Oh, probably this branch was not started from master? I see some changes referenced here, but they are from different MP `test_create_logical_volume_creates_max_logical_volume_if_size_empty`

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: d04618b0defab2eaaa5d4007d57c68e9689e4a8e

review: Approve

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 299ddd09135d8d43120a84d4064f55b724c0a950

review: Approve

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: b98e12068fc14f01dd9e17434d6c75e342971b22

review: Approve

[Alexsander de Souza (alexsander-souza)]

+1

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b controller-certificate-metadata lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

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

[Jack Lloyd-Walters (lloydwaltersj)]

jenkins: !test

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: b98e12068fc14f01dd9e17434d6c75e342971b22

review: Approve

diff --git a/src/maasserver/websockets/handlers/controller.py b/src/maasserver/websockets/handlers/controller.py
index 872ff1c..dad5976 100644
--- a/src/maasserver/websockets/handlers/controller.py
+++ b/src/maasserver/websockets/handlers/controller.py
@@ -24,8 +24,13 @@ from maasserver.models import Config, Controller, Event, RackController, VLAN
 from maasserver.models.controllerinfo import get_target_version
 from maasserver.node_action import compile_node_actions
 from maasserver.permissions import NodePermission
-from maasserver.websockets.base import HandlerError, HandlerPermissionError
+from maasserver.websockets.base import (
+    dehydrate_certificate,
+    HandlerError,
+    HandlerPermissionError,
+)
 from maasserver.websockets.handlers.node import node_prefetch, NodeHandler
+from provisioningserver.certificates import Certificate
 
 # return the list of VLAN ids connected to a controller
 _vlan_ids_aggr = ArrayAgg(
@@ -183,6 +188,14 @@ class ControllerHandler(NodeHandler):
                 interface.vlan_id
                 for interface in obj.current_config.interface_set.all()
             ]
+
+            # include certificate info if present
+            certificate = obj.power_parameters.get("certificate")
+            key = obj.power_parameters.get("key")
+            if certificate and key:
+                cert = Certificate.from_pem(certificate, key)
+                data["certificate"] = dehydrate_certificate(cert)
+
         return data
 
     def dehydrate_versions(self, info):