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

[Blake Rouse]

Prevent starting commissioning of a node that is new and on.

[Mike Pontillo (mpontillo)]

Code looks good, but minor nit about the wording of the error.

review: Approve

=== modified file 'src/maasserver/node_action.py'
--- src/maasserver/node_action.py	2015-05-23 01:54:39 +0000
+++ src/maasserver/node_action.py	2015-05-27 01:29:13 +0000
@@ -236,6 +236,9 @@
 
     def execute(self):
         """See `NodeAction.execute`."""
+        if self.node.power_state == POWER_STATE.ON:
+            raise NodeActionError(
+                "Unable to be commissioned because the power is currently on.")
         try:
             self.node.start_commissioning(self.user)
         except RPC_EXCEPTIONS + (ExternalProcessError,) as exception:

=== modified file 'src/maasserver/tests/test_node_action.py'
--- src/maasserver/tests/test_node_action.py	2015-05-22 17:08:29 +0000
+++ src/maasserver/tests/test_node_action.py	2015-05-27 01:29:13 +0000
@@ -263,6 +263,14 @@
         ("READY", {"status": NODE_STATUS.READY}),
     )
 
+    def test_raise_NodeActionError_if_on(self):
+        node = factory.make_Node(
+            status=self.status, power_state=POWER_STATE.ON)
+        user = factory.make_admin()
+        action = Commission(node, user)
+        self.assertTrue(action.is_permitted())
+        self.assertRaises(NodeActionError, action.execute)
+
     def test_Commission_starts_commissioning(self):
         node = factory.make_Node(
             mac=True, status=self.status,
@@ -793,7 +801,8 @@
         self.addCleanup(node_query.enable)
         node_query.disable()
 
-        action = self.make_action(Commission, NODE_STATUS.READY)
+        action = self.make_action(
+            Commission, NODE_STATUS.READY, POWER_STATE.OFF)
         self.patch_rpc_methods(action.node)
         exception = self.assertRaises(NodeActionError, action.execute)
         self.assertEqual(