Merge ~adam-collard/maas:remove-unused-machine-list-fields into maas:master

[Adam Collard]

Remove unused fields from machine list
- cpu_speed
- commissioning_start_time
- commissioning_status

[Alexsander de Souza (alexsander-souza)]

+1

review: Approve

diff --git a/src/maasserver/websockets/handlers/machine.py b/src/maasserver/websockets/handlers/machine.py
index b625225..77f9167 100644
--- a/src/maasserver/websockets/handlers/machine.py
+++ b/src/maasserver/websockets/handlers/machine.py
@@ -238,7 +238,6 @@ class MachineHandler(NodeHandler):
             "locked",
             "owner",
             "cpu_count",
-            "cpu_speed",
             "description",
             "error_description",
             "memory",
@@ -247,6 +246,10 @@ class MachineHandler(NodeHandler):
             "pool",
             "zone",
         ]
+        list_exclude = [
+            "commissioning_start_time",
+            "commissioning_status",
+        ] + exclude
         listen_channels = ["machine"]
         create_permission = NodePermission.admin
         view_permission = NodePermission.view
diff --git a/src/maasserver/websockets/handlers/node.py b/src/maasserver/websockets/handlers/node.py
index a5d1f06..8877140 100644
--- a/src/maasserver/websockets/handlers/node.py
+++ b/src/maasserver/websockets/handlers/node.py
@@ -284,15 +284,16 @@ class NodeHandler(TimestampedModelHandler):
                             and script_result.started < testing_start_time
                         ):
                             testing_start_time = script_result.started
-            data["commissioning_status"] = self.dehydrate_test_statuses(
-                commissioning_script_results
-            )
+            if not for_list:
+                data["commissioning_status"] = self.dehydrate_test_statuses(
+                    commissioning_script_results
+                )
+                data["commissioning_start_time"] = dehydrate_datetime(
+                    commissioning_start_time
+                )
             data["testing_status"] = self.dehydrate_test_statuses(
                 testing_script_results
             )
-            data["commissioning_start_time"] = dehydrate_datetime(
-                commissioning_start_time
-            )
             data["testing_start_time"] = dehydrate_datetime(testing_start_time)
             data["installation_start_time"] = dehydrate_datetime(
                 installation_start_time
diff --git a/src/maasserver/websockets/handlers/tests/test_machine.py b/src/maasserver/websockets/handlers/tests/test_machine.py
index 9b29ceb..16b94fb 100644
--- a/src/maasserver/websockets/handlers/tests/test_machine.py
+++ b/src/maasserver/websockets/handlers/tests/test_machine.py
@@ -388,46 +388,49 @@ class TestMachineHandler(MAASServerTestCase):
                 data["sriov_support"] = any(
                     iface["sriov_max_vf"] > 0 for iface in data["interfaces"]
                 )
-            allowed_fields = MachineHandler.Meta.list_fields + [
-                "actions",
-                "architecture",
-                "commissioning_script_count",
-                "commissioning_start_time",
-                "commissioning_status",
-                "dhcp_on",
-                "distro_series",
-                "extra_macs",
-                "link_speeds",
-                "fabrics",
-                "fqdn",
-                "has_logs",
-                "installation_start_time",
-                "ip_addresses",
-                "link_type",
-                "metadata",
-                "node_type_display",
-                "numa_nodes_count",
-                "osystem",
-                "permissions",
-                "physical_disk_count",
-                "pod",
-                "pxe_mac",
-                "pxe_mac_vendor",
-                "spaces",
-                "sriov_support",
-                "status",
-                "status_code",
-                "status_message",
-                "storage",
-                "storage_tags",
-                "subnets",
-                "tags",
-                "testing_script_count",
-                "testing_start_time",
-                "testing_status",
-                "vlan",
-                "workload_annotations",
-            ]
+            list_fields = set(MachineHandler.Meta.list_fields) - set(
+                MachineHandler.Meta.list_exclude
+            )
+            allowed_fields = list_fields.union(
+                {
+                    "actions",
+                    "architecture",
+                    "commissioning_script_count",
+                    "dhcp_on",
+                    "distro_series",
+                    "extra_macs",
+                    "link_speeds",
+                    "fabrics",
+                    "fqdn",
+                    "has_logs",
+                    "installation_start_time",
+                    "ip_addresses",
+                    "link_type",
+                    "metadata",
+                    "node_type_display",
+                    "numa_nodes_count",
+                    "osystem",
+                    "permissions",
+                    "physical_disk_count",
+                    "pod",
+                    "pxe_mac",
+                    "pxe_mac_vendor",
+                    "spaces",
+                    "sriov_support",
+                    "status",
+                    "status_code",
+                    "status_message",
+                    "storage",
+                    "storage_tags",
+                    "subnets",
+                    "tags",
+                    "testing_script_count",
+                    "testing_start_time",
+                    "testing_status",
+                    "vlan",
+                    "workload_annotations",
+                }
+            )
             for key in list(data):
                 if key not in allowed_fields:
                     del data[key]
@@ -2249,14 +2252,17 @@ class TestMachineHandler(MAASServerTestCase):
         handler = MachineHandler(user, {}, None)
         factory.make_PhysicalBlockDevice(node=node)
         self.assertNotIn(node.id, handler._script_results.keys())
-        self.assertCountEqual(
-            [self.dehydrate_node(node, handler, for_list=True)],
-            handler.list({}),
-        )
+        list_results = handler.list({})
         self.assertDictEqual(
             {node.id: {script_result.script.hardware_type: [script_result]}},
             handler._script_results,
         )
+        self.assertNotIn("commissioning_status", list_results[0])
+        self.assertNotIn("commissioning_start_time", list_results[0])
+        self.assertNotIn("cpu_speed", list_results[0])
+        self.assertCountEqual(
+            [self.dehydrate_node(node, handler, for_list=True)], list_results
+        )
 
     def test_list_includes_numa_node_info(self):
         user = factory.make_User()