Merge lp:~julian-edwards/maas/stop-even-when-ready-bug-1368400 into lp:~maas-committers/maas/trunk

[Julian Edwards]

Allow nodes in the READY state to accept a NodeStop action. This is so admins can power down nodes that are erroneously on for some reason.

[Graham Binns (gmb)]

Lovely!

review: Approve

[Christian Reis (kiko)]

Well, I'm not so sure about this one. The reason is that I think power control should be handled somewhat independently of node status, and presented as a separate set of administrative actions on the nodes. And in fact, I think we have this planned or at least in other bug reports.

review: Needs Information

[Julian Edwards (julian-edwards)]

I think you're right to a certain extent, but we don't want people hitting that button during some operations, such as deployment and during disk erasing. So I don't think we can get away from it completely, but this change at least helps people out in the short term.

=== modified file 'src/maasserver/node_action.py'
--- src/maasserver/node_action.py	2014-10-21 07:15:09 +0000
+++ src/maasserver/node_action.py	2014-10-23 05:56:06 +0000
@@ -365,7 +365,7 @@
     display = "Stop node"
     display_bulk = "Stop selected nodes"
     actionable_statuses = (
-        [NODE_STATUS.DEPLOYED] +
+        [NODE_STATUS.DEPLOYED, NODE_STATUS.READY] +
         # Also let a user ask a failed node to shutdown: this
         # is useful to try to recover from power failures.
         FAILED_STATUSES

=== modified file 'src/maasserver/tests/test_node_action.py'
--- src/maasserver/tests/test_node_action.py	2014-10-21 07:15:09 +0000
+++ src/maasserver/tests/test_node_action.py	2014-10-23 05:56:06 +0000
@@ -396,7 +396,7 @@
 
 class TestStopNodeNodeAction(MAASServerTestCase):
 
-    def test_StopNode_stops_deployed_node(self):
+    def test__stops_deployed_node(self):
         user = factory.make_User()
         params = dict(
             power_address=factory.make_string(),
@@ -412,7 +412,22 @@
 
         self.assertThat(node_stop, MockCalledOnceWith(user))
 
-    def test_StopNode_actionnable_for_failed_states(self):
+    def test__stops_Ready_node(self):
+        admin = factory.make_admin()
+        params = dict(
+            power_address=factory.make_string(),
+            power_user=factory.make_string(),
+            power_pass=factory.make_string())
+        node = factory.make_Node(
+            mac=True, status=NODE_STATUS.READY,
+            power_type='ipmi', power_parameters=params)
+        node_stop = self.patch_autospec(node, 'stop')
+
+        StopNode(node, admin).execute()
+
+        self.assertThat(node_stop, MockCalledOnceWith(admin))
+
+    def test__actionnable_for_failed_states(self):
         status = random.choice(FAILED_STATUSES)
         node = factory.make_Node(status=status, power_type='ipmi')
         actions = compile_node_actions(