Merge ~cgrabowski/maas:machine_filter_count_endpoint into maas:master

[Christian Grabowski]

add count endpoint to machine handler

[MAAS Lander (maas-lander)]

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

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/39/consoleText
COMMIT: c02017503ae92de4a9e29c3ede3213756519c339

review: Needs Fixing

[Alexsander de Souza (alexsander-souza)]

+1

review: Approve

[Anton Troyanov (troyanov)]

jenkins: !test

[MAAS Lander (maas-lander)]

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

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/105/consoleText
COMMIT: dd8e822617371a0f22f707f1c3c016d0fab92cff

review: Needs Fixing

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 37f765f313d20b6be2b5e13d02a835733576aa3e

review: Approve

diff --git a/src/maasserver/websockets/handlers/machine.py b/src/maasserver/websockets/handlers/machine.py
index 955c350..5a67786 100644
--- a/src/maasserver/websockets/handlers/machine.py
+++ b/src/maasserver/websockets/handlers/machine.py
@@ -203,6 +203,7 @@ class MachineHandler(NodeHandler):
             "set_workload_annotations",
             "filter_groups",
             "filter_options",
+            "count",
         ]
         form = AdminMachineWithMACAddressesForm
         exclude = [
@@ -1204,3 +1205,9 @@ class MachineHandler(NodeHandler):
         except ValueError as e:
             raise HandlerValidationError(str(e))
         return OwnerData.objects.get_owner_data(machine)
+
+    def count(self, params):
+        qs = self.get_queryset()
+        if "filter" in params:
+            qs = self._filter(qs, "list", params["filter"])
+        return {"count": qs.count()}
diff --git a/src/maasserver/websockets/handlers/tests/test_machine.py b/src/maasserver/websockets/handlers/tests/test_machine.py
index c4d3c6f..369ae81 100644
--- a/src/maasserver/websockets/handlers/tests/test_machine.py
+++ b/src/maasserver/websockets/handlers/tests/test_machine.py
@@ -6342,3 +6342,24 @@ class TestMachineHandlerFilter(MAASServerTestCase):
         self.assertIsNotNone(
             handler.on_listen("machine", "update", node2.system_id)
         )
+
+    def test_count_endpoint_no_filter(self):
+        owner = factory.make_User()
+        nodes = [factory.make_Node(owner=owner) for _ in range(3)]
+        handler = MachineHandler(owner, {}, None)
+        self.assertEqual(len(nodes), handler.count({})["count"])
+
+    def test_count_endpoint_filter(self):
+        owner = factory.make_User()
+        zone = factory.make_Zone()
+        nodes_without_zone = [factory.make_Node() for _ in range(2)]
+        nodes_in_zone = [factory.make_Node(zone=zone) for _ in range(2)]
+        handler = MachineHandler(owner, {}, None)
+        self.assertEqual(
+            len(nodes_without_zone) + len(nodes_in_zone),
+            handler.count({})["count"],
+        )
+        self.assertEqual(
+            len(nodes_in_zone),
+            handler.count({"filter": {"zone": zone.name}})["count"],
+        )