Merge ~cgrabowski/maas:add_filter_groups_and_options_to_allowed_methods into maas:master

[Christian Grabowski]

add filter groups and options to allowed_methods on Machine handler

[Alexsander de Souza (alexsander-souza)]

+1

review: Approve

[Adam Collard (adam-collard)]

I wonder if it's worth adding a test that lists the methods that are available but not allowed, so anyone adding a new method will see a failure and have to decide to either allow it or adjust the test to approve disallowing it

[Christian Grabowski (cgrabowski)]

> I wonder if it's worth adding a test that lists the methods that are available
> but not allowed, so anyone adding a new method will see a failure and have to
> decide to either allow it or adjust the test to approve disallowing it

I think that's a good idea, will add.

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 1549fd527add2f3cade9763622964695f78c8118

review: Approve

544e6b1... by Christian Grabowski on 2022-06-23

add test for allowed_methods on Machine handler

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 544e6b12e6e8ea2dc2370451138d6c18123e9d67

review: Approve

diff --git a/src/maasserver/websockets/handlers/machine.py b/src/maasserver/websockets/handlers/machine.py
index 262f7f9..495a43c 100644
--- a/src/maasserver/websockets/handlers/machine.py
+++ b/src/maasserver/websockets/handlers/machine.py
@@ -199,6 +199,8 @@ class MachineHandler(NodeHandler):
             "get_latest_failed_testing_script_results",
             "get_workload_annotations",
             "set_workload_annotations",
+            "filter_groups",
+            "filter_options",
         ]
         form = AdminMachineWithMACAddressesForm
         exclude = [
diff --git a/src/maasserver/websockets/handlers/tests/test_machine.py b/src/maasserver/websockets/handlers/tests/test_machine.py
index 0dd40ea..93835ef 100644
--- a/src/maasserver/websockets/handlers/tests/test_machine.py
+++ b/src/maasserver/websockets/handlers/tests/test_machine.py
@@ -9,6 +9,7 @@ import logging
 from operator import itemgetter
 import random
 import re
+from types import FunctionType
 from unittest.mock import ANY
 
 from django.core.exceptions import ValidationError
@@ -547,6 +548,67 @@ class TestMachineHandler(MAASServerTestCase):
                     node_type=NODE_TYPE.DEVICE, parent=node, interface=True
                 )
 
+    def test_allowed_methods(self):
+        not_allowed_methods = [
+            "dehydrate",
+            "dehydrate_all_ip_addresses",
+            "dehydrate_blockdevice",
+            "dehydrate_cache_set",
+            "dehydrate_created",
+            "dehydrate_device",
+            "dehydrate_domain",
+            "dehydrate_events",
+            "dehydrate_filesystem",
+            "dehydrate_hugepages",
+            "dehydrate_interface",
+            "dehydrate_ip_address",
+            "dehydrate_last_image_sync",
+            "dehydrate_numanode",
+            "dehydrate_owner",
+            "dehydrate_partitions",
+            "dehydrate_pod",
+            "dehydrate_pool",
+            "dehydrate_power_parameters",
+            "dehydrate_script_set_status",
+            "dehydrate_show_os_info",
+            "dehydrate_test_statuses",
+            "dehydrate_updated",
+            "dehydrate_vlan",
+            "dehydrate_volume_group",
+            "dehydrate_zone",
+            "delete",
+            "execute",
+            "full_dehydrate",
+            "full_hydrate",
+            "get_all_fabric_names",
+            "get_all_space_names",
+            "get_all_storage_tags",
+            "get_all_subnets",
+            "get_blockdevices_for",
+            "get_form_class",
+            "get_grouped_storages",
+            "get_mac_addresses",
+            "get_object",
+            "get_providing_dhcp",
+            "get_queryset",
+            "hydrate",
+            "listen",
+            "on_listen",
+            "on_listen_for_active_pk",
+            "preprocess_form",
+            "preprocess_node_form",
+            "refetch",
+            "update_blockdevice_filesystem",
+            "update_partition_filesystem",
+        ]
+        [
+            self.assertIn(attr, MachineHandler.Meta.allowed_methods)
+            for attr in dir(MachineHandler)
+            if isinstance(getattr(MachineHandler, attr), FunctionType)
+            and attr not in not_allowed_methods
+            and not attr.startswith("_")
+        ]
+
     def test_get_refresh_script_result_cache(self):
         owner = factory.make_User()
         node = factory.make_Node(owner=owner)