Merge ~newell-jensen/maas:lp1834500-1468830 into maas:master

[Newell Jensen]

LP: #1834500, #1468830 -- Mark previously deployed machines deployed when mark fixed. Allow marking a machine fixed if power is not on.

[Alberto Donato (ack)]

lgtm, +1

review: Approve

[Lee Trager (ltrager)]

LGTM!

review: Approve

diff --git a/src/maasserver/models/node.py b/src/maasserver/models/node.py
index 2a2a53b..fdafba9 100644
--- a/src/maasserver/models/node.py
+++ b/src/maasserver/models/node.py
@@ -3291,7 +3291,10 @@ class Node(CleanSave, TimestampedModel):
             raise NodeStateViolation(
                 "Can't mark a non-broken node as 'Ready'.")
         maaslog.info("%s: Marking node fixed", self.hostname)
-        self.status = NODE_STATUS.READY
+        if self.previous_status == NODE_STATUS.DEPLOYED:
+            self.status = NODE_STATUS.DEPLOYED
+        else:
+            self.status = NODE_STATUS.READY
         self.error_description = ''
         self.osystem = ''
         self.distro_series = ''
diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index c71407e..593fd5d 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -3715,6 +3715,12 @@ class TestNode(MAASServerTestCase):
         node.mark_fixed(factory.make_User())
         self.assertEqual(NODE_STATUS.READY, reload_object(node).status)
 
+    def test_mark_fixed_changes_status_to_deployed_if_previous_status(self):
+        node = factory.make_Node(
+            status=NODE_STATUS.BROKEN, previous_status=NODE_STATUS.DEPLOYED)
+        node.mark_fixed(factory.make_User())
+        self.assertEqual(NODE_STATUS.DEPLOYED, reload_object(node).status)
+
     def test_mark_fixed_logs_user_request(self):
         owner = factory.make_User()
         node = factory.make_Node(status=NODE_STATUS.BROKEN, owner=owner)
diff --git a/src/maasserver/node_action.py b/src/maasserver/node_action.py
index 730d8b2..02bc99b 100644
--- a/src/maasserver/node_action.py
+++ b/src/maasserver/node_action.py
@@ -670,9 +670,6 @@ class MarkFixed(NodeAction):
 
     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.")
         if not self.has_commissioning_data():
             raise NodeActionError(
                 "Unable to be mark fixed because it has not been commissioned "
diff --git a/src/maasserver/node_status.py b/src/maasserver/node_status.py
index 615ab03..9c44a70 100644
--- a/src/maasserver/node_status.py
+++ b/src/maasserver/node_status.py
@@ -176,6 +176,7 @@ NODE_TRANSITIONS = {
         NODE_STATUS.RELEASING,
         NODE_STATUS.ENTERING_RESCUE_MODE,
         NODE_STATUS.TESTING,
+        NODE_STATUS.DEPLOYED,
         ],
     NODE_STATUS.FAILED_RELEASING: [
         NODE_STATUS.RELEASING,
diff --git a/src/maasserver/tests/test_node_action.py b/src/maasserver/tests/test_node_action.py
index bb09d2c..eeec31a 100644
--- a/src/maasserver/tests/test_node_action.py
+++ b/src/maasserver/tests/test_node_action.py
@@ -1301,7 +1301,7 @@ class TestMarkFixedAction(MAASServerTestCase):
 
     def test_changes_status(self):
         node = factory.make_Node(
-            status=NODE_STATUS.BROKEN, power_state=POWER_STATE.OFF)
+            status=NODE_STATUS.BROKEN, power_state=POWER_STATE.ON)
         self.make_commissioning_data(node)
         user = factory.make_admin()
         request = factory.make_fake_request('/')