Merge ~ack/maas:1912727-2.9 into maas:2.9

[Alberto Donato]

LP: #1912727 - always include default_storage_pool/storage_pools in Pod websocket

[Alberto Donato (ack)]

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b 1912727-2.9 lp:~ack/maas/+git/maas into -b 2.9 lp:~maas-committers/maas

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

[MAAS Lander (maas-lander)]

UNIT TESTS
-b 1912727-2.9 lp:~ack/maas/+git/maas into -b 2.9 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/9234/console
COMMIT: 795387887bf5b531b7ed0c8cfe31d565daf3ecbf

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b 1912727-2.9 lp:~ack/maas/+git/maas into -b 2.9 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/9236/console
COMMIT: 6d704acd093a30c90ec9fde0ec3ce2b9a00f1a90

review: Needs Fixing

diff --git a/src/maasserver/websockets/handlers/pod.py b/src/maasserver/websockets/handlers/pod.py
index bfe3676..686f9a9 100644
--- a/src/maasserver/websockets/handlers/pod.py
+++ b/src/maasserver/websockets/handlers/pod.py
@@ -97,33 +97,37 @@ class PodHandler(TimestampedModelHandler):
         """Add extra fields to `data`."""
         if self.user.is_superuser:
             data.update(obj.power_parameters)
-        data["type"] = obj.power_type
-        data["total"] = self.dehydrate_total(obj)
-        data["used"] = self.dehydrate_used(obj)
-        data["available"] = self.dehydrate_available(obj)
-        data["composed_machines_count"] = obj.node_set.filter(
-            node_type=NODE_TYPE.MACHINE
-        ).count()
-        data["owners_count"] = (
-            obj.node_set.exclude(owner=None)
-            .values_list("owner")
-            .distinct()
-            .count()
+        data.update(
+            {
+                "type": obj.power_type,
+                "total": self.dehydrate_total(obj),
+                "used": self.dehydrate_used(obj),
+                "available": self.dehydrate_available(obj),
+                "composed_machines_count": obj.node_set.filter(
+                    node_type=NODE_TYPE.MACHINE
+                ).count(),
+                "owners_count": (
+                    obj.node_set.exclude(owner=None)
+                    .values_list("owner")
+                    .distinct()
+                    .count()
+                ),
+                "hints": self.dehydrate_hints(obj.hints),
+                "storage_pools": [
+                    self.dehydrate_storage_pool(pool)
+                    for pool in obj.storage_pools.all()
+                ],
+                "default_storage_pool": (
+                    obj.default_storage_pool.pool_id
+                    if obj.default_storage_pool
+                    else None
+                ),
+                "host": obj.host.system_id if obj.host else None,
+                "numa_pinning": self.dehydrate_numa_pinning(obj),
+            }
         )
-        data["hints"] = self.dehydrate_hints(obj.hints)
-        storage_pools = obj.storage_pools.all()
-        if len(storage_pools) > 0:
-            pools_data = []
-            for pool in storage_pools:
-                pools_data.append(self.dehydrate_storage_pool(pool))
-            data["storage_pools"] = pools_data
-            data["default_storage_pool"] = obj.default_storage_pool.pool_id
-        if obj.host is not None:
-            data["host"] = obj.host.system_id
-        else:
-            data["host"] = None
         if not for_list:
-            if obj.host is not None:
+            if obj.host:
                 data["attached_vlans"] = list(
                     obj.host.interface_set.all().values_list(
                         "vlan_id", flat=True
@@ -141,8 +145,6 @@ class PodHandler(TimestampedModelHandler):
                 data["attached_vlans"] = []
                 data["boot_vlans"] = []
 
-        data["numa_pinning"] = self.dehydrate_numa_pinning(obj)
-
         if self.user.has_perm(PodPermission.compose, obj):
             data["permissions"].append("compose")
 
diff --git a/src/maasserver/websockets/handlers/tests/test_pod.py b/src/maasserver/websockets/handlers/tests/test_pod.py
index 6137c38..f4e857f 100644
--- a/src/maasserver/websockets/handlers/tests/test_pod.py
+++ b/src/maasserver/websockets/handlers/tests/test_pod.py
@@ -14,6 +14,7 @@ from twisted.internet.defer import inlineCallbacks, succeed
 from maasserver.enum import INTERFACE_TYPE
 from maasserver.forms import pods
 from maasserver.forms.pods import PodForm
+from maasserver.models import PodStoragePool
 from maasserver.models.virtualmachine import MB, VirtualMachineInterface
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASTransactionServerTestCase
@@ -226,6 +227,21 @@ class TestPodHandler(MAASTransactionServerTestCase):
             ],
         )
 
+    def test_get_with_pod_host_no_storage_pools(self):
+        admin = factory.make_admin()
+        handler = PodHandler(admin, {}, None)
+        node = factory.make_Node()
+        pod = self.make_pod_with_hints(
+            pod_type="lxd",
+            host=node,
+        )
+        pod.default_storage_pool = None
+        pod.save()
+        PodStoragePool.objects.all().delete()
+        result = handler.get({"id": pod.id})
+        self.assertIsNone(result["default_storage_pool"])
+        self.assertEqual(result["storage_pools"], [])
+
     def test_get_host_interfaces_no_sriov(self):
         admin = factory.make_admin()
         handler = PodHandler(admin, {}, None)