Merge lp:~julian-edwards/maas/1.2-backport-stop-button into lp:maas/1.2

[Julian Edwards]

Backport r1489 from trunk: Add stop button in UI

[Julian Edwards (julian-edwards)]

Self-approving no-change backport.

review: Approve

=== modified file 'src/maasserver/node_action.py'
--- src/maasserver/node_action.py	2012-05-08 16:22:48 +0000
+++ src/maasserver/node_action.py	2013-09-06 04:33:49 +0000
@@ -196,11 +196,26 @@
             """)
 
 
+class StopNode(NodeAction):
+    """Stop and release a node."""
+    display = "Stop node"
+    actionable_statuses = (NODE_STATUS.ALLOCATED, )
+    permission = NODE_PERMISSION.EDIT
+
+    def execute(self):
+        self.node.release()
+        return dedent("""\
+            This node is no longer allocated to you.
+            It has been asked to shut down.
+            """)
+
+
 ACTION_CLASSES = (
     Delete,
     AcceptAndCommission,
     RetryCommissioning,
     StartNode,
+    StopNode,
     )
 
 

=== modified file 'src/maasserver/tests/test_node_action.py'
--- src/maasserver/tests/test_node_action.py	2012-06-07 11:44:14 +0000
+++ src/maasserver/tests/test_node_action.py	2013-09-06 04:33:49 +0000
@@ -28,10 +28,12 @@
     NodeAction,
     RetryCommissioning,
     StartNode,
+    StopNode,
     )
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import TestCase
 from provisioningserver.enum import POWER_TYPE
+from provisioningserver.power.poweraction import PowerAction
 
 
 ALL_STATUSES = NODE_STATUS_CHOICES_DICT.keys()
@@ -162,6 +164,9 @@
         action.fake_inhibition = factory.getRandomString()
         self.assertIsNone(action.inhibition)
 
+
+class TestDeleteNodeAction(TestCase):
+
     def test_Delete_inhibit_when_node_is_allocated(self):
         node = factory.make_node(status=NODE_STATUS.ALLOCATED)
         action = Delete(node, factory.make_admin())
@@ -186,6 +191,9 @@
             reverse('node-delete', args=[node.system_id]),
             urlparse(unicode(e)).path)
 
+
+class TestAcceptAndCommissionNodeAction(TestCase):
+
     def test_AcceptAndCommission_starts_commissioning(self):
         node = factory.make_node(
             mac=True, status=NODE_STATUS.DECLARED,
@@ -197,6 +205,9 @@
             'provisioningserver.tasks.power_on',
             self.celery.tasks[0]['task'].name)
 
+
+class TestRetryCommissioningNodeAction(TestCase):
+
     def test_RetryCommissioning_starts_commissioning(self):
         node = factory.make_node(
             mac=True, status=NODE_STATUS.FAILED_TESTS,
@@ -208,6 +219,9 @@
             'provisioningserver.tasks.power_on',
             self.celery.tasks[0]['task'].name)
 
+
+class TestStartNodeNodeAction(TestCase):
+
     def test_StartNode_inhibit_allows_user_with_SSH_key(self):
         user_with_key = factory.make_user()
         factory.make_sshkey(user_with_key)
@@ -232,3 +246,25 @@
         self.assertEqual(
             'provisioningserver.tasks.power_on',
             self.celery.tasks[0]['task'].name)
+
+
+class TestStopNodeNodeAction(TestCase):
+
+    def test_StopNode_stops_and_releases_node(self):
+        self.patch(PowerAction, 'run_shell', lambda *args, **kwargs: ('', ''))
+        user = factory.make_user()
+        params = dict(
+            power_address=factory.getRandomString(),
+            power_user=factory.getRandomString(),
+            power_pass=factory.getRandomString())
+        node = factory.make_node(
+            mac=True, status=NODE_STATUS.ALLOCATED,
+            power_type=POWER_TYPE.IPMI,
+            owner=user, power_parameters=params)
+        StopNode(node, user).execute()
+
+        self.assertEqual(NODE_STATUS.READY, node.status)
+        self.assertIsNone(node.owner)
+        self.assertEqual(
+            'provisioningserver.tasks.power_off',
+            self.celery.tasks[0]['task'].name)