1
diff --git a/src/maasserver/websockets/handlers/pod.py b/src/maasserver/websockets/handlers/pod.py
2
index ab9b876..8180a69 100644
3
--- a/src/maasserver/websockets/handlers/pod.py
4
+++ b/src/maasserver/websockets/handlers/pod.py
5
@@ -102,33 +102,37 @@ class PodHandler(TimestampedModelHandler):
6
102
        """Add extra fields to `data`."""
102
        """Add extra fields to `data`."""
7
103
        if self.user.is_superuser:
103
        if self.user.is_superuser:
8
104
            data.update(obj.power_parameters)
104
            data.update(obj.power_parameters)
21
105
        data["type"] = obj.power_type
105
        data.update(
22
106
        data["total"] = self.dehydrate_total(obj)
106
            {
23
107
        data["used"] = self.dehydrate_used(obj)
107
                "type": obj.power_type,
24
108
        data["available"] = self.dehydrate_available(obj)
108
                "total": self.dehydrate_total(obj),
25
109
        data["composed_machines_count"] = obj.node_set.filter(
109
                "used": self.dehydrate_used(obj),
26
110
            node_type=NODE_TYPE.MACHINE
110
                "available": self.dehydrate_available(obj),
27
111
        ).count()
111
                "composed_machines_count": obj.node_set.filter(
28
112
        data["owners_count"] = (
112
                    node_type=NODE_TYPE.MACHINE
29
113
            obj.node_set.exclude(owner=None)
113
                ).count(),
30
114
            .values_list("owner")
114
                "owners_count": (
31
115
            .distinct()
115
                    obj.node_set.exclude(owner=None)
32
116
            .count()
116
                    .values_list("owner")
33
117
                    .distinct()
34
118
                    .count()
35
119
                ),
36
120
                "hints": self.dehydrate_hints(obj.hints),
37
121
                "storage_pools": [
38
122
                    self.dehydrate_storage_pool(pool)
39
123
                    for pool in obj.storage_pools.all()
40
124
                ],
41
125
                "default_storage_pool": (
42
126
                    obj.default_storage_pool.pool_id
43
127
                    if obj.default_storage_pool
44
128
                    else None
45
129
                ),
46
130
                "host": obj.host.system_id if obj.host else None,
47
131
                "numa_pinning": self.dehydrate_numa_pinning(obj),
48
132
            }
49
117
        )
133
        )
50
118
        data["hints"] = self.dehydrate_hints(obj.hints)
51
119
        storage_pools = obj.storage_pools.all()
52
120
        if len(storage_pools) > 0:
53
121
            pools_data = []
54
122
            for pool in storage_pools:
55
123
                pools_data.append(self.dehydrate_storage_pool(pool))
56
124
            data["storage_pools"] = pools_data
57
125
            data["default_storage_pool"] = obj.default_storage_pool.pool_id
58
126
        if obj.host is not None:
59
127
            data["host"] = obj.host.system_id
60
128
        else:
61
129
            data["host"] = None
62
130
        if not for_list:
134
        if not for_list:
64
131
            if obj.host is not None:
135
            if obj.host:
65
132
                data["attached_vlans"] = list(
136
                data["attached_vlans"] = list(
66
133
                    obj.host.interface_set.filter(
137
                    obj.host.interface_set.filter(
67
134
                        vlan_id__isnull=False
138
                        vlan_id__isnull=False
68
@@ -146,8 +150,6 @@ class PodHandler(TimestampedModelHandler):
69
146
                data["attached_vlans"] = []
150
                data["attached_vlans"] = []
70
147
                data["boot_vlans"] = []
151
                data["boot_vlans"] = []
71
148
152
72
149
        data["numa_pinning"] = self.dehydrate_numa_pinning(obj)
73
150
74
151
        if self.user.has_perm(PodPermission.compose, obj):
153
        if self.user.has_perm(PodPermission.compose, obj):
75
152
            data["permissions"].append("compose")
154
            data["permissions"].append("compose")
76
153
155
77
diff --git a/src/maasserver/websockets/handlers/tests/test_pod.py b/src/maasserver/websockets/handlers/tests/test_pod.py
78
index 9e91f34..f76be47 100644
79
--- a/src/maasserver/websockets/handlers/tests/test_pod.py
80
+++ b/src/maasserver/websockets/handlers/tests/test_pod.py
81
@@ -14,7 +14,7 @@ from twisted.internet.defer import inlineCallbacks, succeed
82
14
from maasserver.enum import INTERFACE_TYPE
14
from maasserver.enum import INTERFACE_TYPE
83
15
from maasserver.forms import pods
15
from maasserver.forms import pods
84
16
from maasserver.forms.pods import PodForm
16
from maasserver.forms.pods import PodForm
86
17
from maasserver.models import Pod
17
from maasserver.models import Pod, PodStoragePool
87
18
from maasserver.models.virtualmachine import MB, VirtualMachineInterface
18
from maasserver.models.virtualmachine import MB, VirtualMachineInterface
88
19
from maasserver.testing.factory import factory
19
from maasserver.testing.factory import factory
89
20
from maasserver.testing.testcase import MAASTransactionServerTestCase
20
from maasserver.testing.testcase import MAASTransactionServerTestCase
90
@@ -228,6 +228,21 @@ class TestPodHandler(MAASTransactionServerTestCase):
91
228
            ],
228
            ],
92
229
        )
229
        )
93
230
230
94
231
    def test_get_with_pod_host_no_storage_pools(self):
95
232
        admin = factory.make_admin()
96
233
        handler = PodHandler(admin, {}, None)
97
234
        node = factory.make_Node()
98
235
        pod = self.make_pod_with_hints(
99
236
            pod_type="lxd",
100
237
            host=node,
101
238
        )
102
239
        pod.default_storage_pool = None
103
240
        pod.save()
104
241
        PodStoragePool.objects.all().delete()
105
242
        result = handler.get({"id": pod.id})
106
243
        self.assertIsNone(result["default_storage_pool"])
107
244
        self.assertEqual(result["storage_pools"], [])
108
245
109
231
    def test_get_with_pod_host_no_vlan(self):
246
    def test_get_with_pod_host_no_vlan(self):
110
232
        admin = factory.make_admin()
247
        admin = factory.make_admin()
111
233
        handler = PodHandler(admin, {}, None)
248
        handler = PodHandler(admin, {}, None)
Reviewer	Date Requested	Status
Adam Collard (community)	2021-02-09	Approve on 2021-02-15
MAAS Lander		Approve on 2021-02-09
Review via email: mp+397726@code.launchpad.net