Merge lp:~blake-rouse/maas/fix-1456698 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Raise error when marking a node fixed when the power is on. Drive-by fix for the mis-alignment of the error icon on the nodes listing for actions.

[Mike Pontillo (mpontillo)]

Code looks good in general, but I'm worried that we're focused on this one corner case without seeing the big picture. (see question below)

review: Needs Information

[Mike Pontillo (mpontillo)]

review: Approve

=== modified file 'src/maasserver/node_action.py'
--- src/maasserver/node_action.py	2015-05-13 11:33:20 +0000
+++ src/maasserver/node_action.py	2015-05-22 16:17:28 +0000
@@ -422,6 +422,9 @@
 
     def execute(self):
         """See `NodeAction.execute`."""
+        if self.node.power_state == POWER_STATE.ON:
+            raise NodeActionError(
+                "Unable to be mark fixed because the power is currently on.")
         self.node.mark_fixed()
 
 

=== modified file 'src/maasserver/static/partials/nodes-list.html'
--- src/maasserver/static/partials/nodes-list.html	2015-05-17 23:45:55 +0000
+++ src/maasserver/static/partials/nodes-list.html	2015-05-22 16:17:28 +0000
@@ -95,7 +95,7 @@
                         {$ tabs.nodes.actionProgress.completed $} of {$ tabs.nodes.actionProgress.total $}
                         nodes have been {$ tabs.nodes.actionOption.sentence $}.
                     </p>
-                    <p class="page-header__feedback-message error progress"
+                    <p class="page-header__feedback-message error"
                         data-ng-repeat="(error, nodes) in tabs.nodes.actionProgress.errors">
                         The {$ tabs.nodes.actionOption.title.toLowerCase() $} action for {$ nodes.length $}
                         <span data-ng-pluralize count="nodes.length" when="{'one': 'node', 'other': 'nodes'}"></span>

=== modified file 'src/maasserver/tests/test_node_action.py'
--- src/maasserver/tests/test_node_action.py	2015-05-21 19:32:24 +0000
+++ src/maasserver/tests/test_node_action.py	2015-05-22 16:17:28 +0000
@@ -683,13 +683,22 @@
 class TestMarkFixedAction(MAASServerTestCase):
 
     def test_changes_status(self):
-        node = factory.make_Node(status=NODE_STATUS.BROKEN)
+        node = factory.make_Node(
+            status=NODE_STATUS.BROKEN, power_state=POWER_STATE.OFF)
         user = factory.make_admin()
         action = MarkFixed(node, user)
         self.assertTrue(action.is_permitted())
         action.execute()
         self.assertEqual(NODE_STATUS.READY, reload_object(node).status)
 
+    def test_raise_NodeActionError_if_on(self):
+        node = factory.make_Node(
+            status=NODE_STATUS.BROKEN, power_state=POWER_STATE.ON)
+        user = factory.make_admin()
+        action = MarkFixed(node, user)
+        self.assertTrue(action.is_permitted())
+        self.assertRaises(NodeActionError, action.execute)
+
     def test_requires_admin_permission(self):
         user = factory.make_User()
         node = factory.make_Node()