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