Merge ~troyanov/maas:fix-2003940-3.3 into maas:3.3

[Anton Troyanov]

fix(ws): incorrect storage amount

Combining multiple aggregations with annotate() will yield the wrong results
because joins are used instead of subqueries.

See related Django bug: https://code.djangoproject.com/ticket/10060

Resolves LP:2003940

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix-2003940-3.3 lp:~troyanov/maas/+git/maas into -b 3.3 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 68957d1035d803a2b9dbeb3f4000d4a5375f3469

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix-2003940-3.3 lp:~troyanov/maas/+git/maas into -b 3.3 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/2418/console
COMMIT: 478dc737be6a05c10c31e55fff5370b82d93cb2e

review: Needs Fixing

[Anton Troyanov (troyanov)]

jenkins: !test

[Anton Troyanov (troyanov)]

Self approving, since this backport is almost identical (but not a cherry-pick tho)
https://git.launchpad.net/maas/commit/?id=66663a3f3a99523aab3720697f9f0859def16b61

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix-2003940-3.3 lp:~troyanov/maas/+git/maas into -b 3.3 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 478dc737be6a05c10c31e55fff5370b82d93cb2e

review: Approve

diff --git a/src/maasserver/websockets/handlers/machine.py b/src/maasserver/websockets/handlers/machine.py
index d5ae491..9365a64 100644
--- a/src/maasserver/websockets/handlers/machine.py
+++ b/src/maasserver/websockets/handlers/machine.py
@@ -15,6 +15,7 @@ from django.db.models import (
     Count,
     Exists,
     F,
+    IntegerField,
     OuterRef,
     Subquery,
     Sum,
@@ -127,6 +128,15 @@ class MachineHandler(NodeHandler):
                 "partitiontable_set__partitions"
             )
         )
+        node_storage_query_set = (
+            Machine.objects.select_related("current_config")
+            .annotate(
+                storage=Sum(
+                    "current_config__blockdevice__physicalblockdevice__size"
+                )
+            )
+            .filter(pk=OuterRef("pk"))
+        )
         list_queryset = (
             Machine.objects.all()
             .select_related("owner", "zone", "domain", "bmc", "current_config")
@@ -157,10 +167,12 @@ class MachineHandler(NodeHandler):
             .prefetch_related("ownerdata_set")
             .alias(
                 physical_disk_count=Count(
-                    "current_config__blockdevice__physicalblockdevice"
+                    "current_config__blockdevice__physicalblockdevice",
+                    distinct=True,
                 ),
-                storage=Sum(
-                    "current_config__blockdevice__physicalblockdevice__size"
+                storage=Subquery(
+                    node_storage_query_set.values("storage"),
+                    output_field=IntegerField(),
                 ),
                 pxe_mac=F("boot_interface__mac_address"),
                 fabric_name=F("boot_interface__vlan__fabric__name"),
diff --git a/src/maasserver/websockets/handlers/tests/test_machine.py b/src/maasserver/websockets/handlers/tests/test_machine.py
index 08afc62..f7a5b79 100644
--- a/src/maasserver/websockets/handlers/tests/test_machine.py
+++ b/src/maasserver/websockets/handlers/tests/test_machine.py
@@ -6041,6 +6041,24 @@ class TestMachineHandlerNewSchema(MAASServerTestCase):
         self.assertEqual(2, result["count"])
         self.assertEqual(2, result["groups"][0]["count"])
 
+    def test_filter_storage_counters(self):
+        user = factory.make_User()
+        node = factory.make_Machine(owner=user)
+        [node.tags.add(factory.make_Tag()) for _ in range(2)]
+
+        handler = MachineHandler(user, {}, None)
+        result = handler.list({"filter": {"free_text": node.hostname}})
+
+        self.assertEqual(1, result["count"])
+        self.assertEqual(
+            node.physicalblockdevice_set.count(),
+            result["groups"][0]["items"][0]["physical_disk_count"],
+        )
+        self.assertEqual(
+            round(node.physicalblockdevice_set.first().size / (1000**3), 1),
+            result["groups"][0]["items"][0]["storage"],
+        )
+
     def test_sort_alias(self):
         user = factory.make_User()
         fabrics = [factory.make_Fabric() for _ in range(2)]