Merge ~cgrabowski/maas:fix_vmcluster_full_dehydrate into maas:master

[Christian Grabowski]

have vmcluster's websocket handler call its dehydrate on full_dehydrate

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix_vmcluster_full_dehydrate lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11381/console
COMMIT: 16c73095bc0c30e45537a46ca0b1720c6797e48e

review: Needs Fixing

[Alexsander de Souza (alexsander-souza)]

+1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix_vmcluster_full_dehydrate lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 174b727a06ac07443f32d9a7132cd2ee92e4b376

review: Approve

diff --git a/src/maasserver/websockets/handlers/tests/test_vmcluster.py b/src/maasserver/websockets/handlers/tests/test_vmcluster.py
index 97ca628..f9dbe08 100644
--- a/src/maasserver/websockets/handlers/tests/test_vmcluster.py
+++ b/src/maasserver/websockets/handlers/tests/test_vmcluster.py
@@ -151,6 +151,24 @@ class TestVMClusterHandler(MAASTransactionServerTestCase):
                 result["total_resources"]["storage_pools"][name]["free"],
             )
 
+    def test_full_dehydrate(self):
+        cluster = factory.make_VMCluster(pods=3)
+        vmhosts = cluster.hosts()
+        _ = [factory.make_PodStoragePool(pod=vmhost) for vmhost in vmhosts]
+
+        vms = [
+            factory.make_VirtualMachine(
+                bmc=vmhost.as_bmc(), machine=factory.make_Machine()
+            )
+            for vmhost in vmhosts
+        ]
+
+        handler = VMClusterHandler(factory.make_admin(), {}, None)
+
+        result = handler.full_dehydrate(cluster)
+
+        self._assert_dehydrated_cluster_equal(result, cluster, vmhosts, vms)
+
     def test_dehydrate(self):
         cluster = factory.make_VMCluster(pods=0)
         vmhosts = [factory.make_Pod(cluster=cluster) for _ in range(3)]
diff --git a/src/maasserver/websockets/handlers/vmcluster.py b/src/maasserver/websockets/handlers/vmcluster.py
index 7ed0ac2..2b08605 100644
--- a/src/maasserver/websockets/handlers/vmcluster.py
+++ b/src/maasserver/websockets/handlers/vmcluster.py
@@ -73,6 +73,11 @@ class VMClusterHandler(TimestampedModelHandler):
             },
         }
 
+    def full_dehydrate(self, obj, for_list=False):
+        return self.dehydrate(
+            obj, obj.hosts(), obj.total_resources(), obj.virtual_machines()
+        )
+
     def dehydrate(self, cluster, vmhosts, resources, vms):
         return {
             "id": cluster.id,