Merge lp:~gmb/maas/backport-fix-bug-1402243 into lp:maas/1.7

[Graham Binns]

Ensure that BROKEN nodes are not checked by the power query service. Previously, nodes marked as BROKEN -- which could be marked as such due to BMC issues -- were continually checked by the power service, even though there could be no way to query them.

Backported from lp:maas/trunk r3428.

[Graham Binns (gmb)]

Straightforward backport; self-reviewing.

review: Approve

=== modified file 'src/maasserver/rpc/nodes.py'
--- src/maasserver/rpc/nodes.py	2014-12-02 15:55:34 +0000
+++ src/maasserver/rpc/nodes.py	2014-12-15 14:31:20 +0000
@@ -22,6 +22,7 @@
 from django.core.exceptions import ValidationError
 from maasserver import exceptions
 from maasserver.api.utils import get_overridden_query_dict
+from maasserver.enum import NODE_STATUS
 from maasserver.forms import AdminNodeWithMACAddressesForm
 from maasserver.models import (
     MACAddress,
@@ -71,7 +72,7 @@
     else:
         power_info_by_node = (
             (node, node.get_effective_power_info())
-            for node in nodegroup.node_set.all()
+            for node in nodegroup.node_set.exclude(status=NODE_STATUS.BROKEN)
         )
         return [
             {

=== modified file 'src/maasserver/rpc/tests/test_nodes.py'
--- src/maasserver/rpc/tests/test_nodes.py	2014-12-02 16:47:25 +0000
+++ src/maasserver/rpc/tests/test_nodes.py	2014-12-15 14:31:20 +0000
@@ -20,6 +20,7 @@
 from maasserver.enum import NODE_STATUS
 from maasserver.rpc.nodes import (
     create_node,
+    list_cluster_nodes_power_parameters,
     mark_node_failed,
     request_node_info_by_mac_address,
     )
@@ -41,6 +42,10 @@
     )
 from provisioningserver.rpc.testing import always_succeed_with
 from simplejson import dumps
+from testtools.matchers import (
+    Contains,
+    Not,
+    )
 
 
 class TestCreateNode(MAASServerTestCase):
@@ -191,3 +196,25 @@
         node, boot_purpose = request_node_info_by_mac_address(
             mac_address.mac_address.get_raw())
         self.assertEqual(node, mac_address.node)
+
+
+class TestListClusterNodesPowerParameters(MAASServerTestCase):
+    """Tests for the `list_cluster_nodes_power_parameters()` function."""
+
+    # Note that there are other, one-level-removed tests for this
+    # function in the TestRegionProtocol_ListNodePowerParameters
+    # testcase in maasserver.rpc.tests.test_regionservice.
+    # Those tests have been left there for now because they also check
+    # that the return values are being formatted correctly for RPC.
+
+    def test_does_not_return_power_info_for_broken_nodes(self):
+        cluster = factory.make_NodeGroup()
+        broken_node = factory.make_Node(
+            nodegroup=cluster, status=NODE_STATUS.BROKEN)
+
+        power_parameters = list_cluster_nodes_power_parameters(cluster.uuid)
+        returned_system_ids = [
+            power_params['system_id'] for power_params in power_parameters]
+
+        self.assertThat(
+            returned_system_ids, Not(Contains(broken_node.system_id)))