Merge "Add maintenance check before call do_node_deploy"

2 files changed, 12 insertions, 10 deletions

diff --git a/ironic/api/controllers/v1/node.py b/ironic/api/controllers/v1/node.py
index 4712d62d2..ce48e0916 100644
--- a/ironic/api/controllers/v1/node.py
+++ b/ironic/api/controllers/v1/node.py
@@ -391,6 +391,11 @@ class NodeStatesController(rest.RestController):
             raise exception.NodeLocked(node=rpc_node.uuid,
                                        host=rpc_node.reservation)
 
+        if (target in (ir_states.ACTIVE, ir_states.REBUILD)
+                and rpc_node.maintenance):
+            raise exception.NodeInMaintenance(op=_('provisioning'),
+                                              node=rpc_node.uuid)
+
         m = ir_states.machine.copy()
         m.initialize(rpc_node.provision_state)
         if not m.is_valid_event(ir_states.VERBS.get(target, target)):
diff --git a/ironic/tests/api/v1/test_nodes.py b/ironic/tests/api/v1/test_nodes.py
index c2b510173..dbb95daaf 100644
--- a/ironic/tests/api/v1/test_nodes.py
+++ b/ironic/tests/api/v1/test_nodes.py
@@ -1813,17 +1813,14 @@ class TestPut(test_api_base.FunctionalTest):
                                              True, 'test-topic')
 
     def test_provision_node_in_maintenance_fail(self):
-        with mock.patch.object(rpcapi.ConductorAPI, 'do_node_deploy') as dnd:
-            self.node.maintenance = True
-            self.node.save()
-            dnd.side_effect = exception.NodeInMaintenance(op='provisioning',
-                                                          node=self.node.uuid)
+        self.node.maintenance = True
+        self.node.save()
 
-            ret = self.put_json('/nodes/%s/states/provision' % self.node.uuid,
-                                {'target': states.ACTIVE},
-                                expect_errors=True)
-            self.assertEqual(400, ret.status_code)
-            self.assertTrue(ret.json['error_message'])
+        ret = self.put_json('/nodes/%s/states/provision' % self.node.uuid,
+                            {'target': states.ACTIVE},
+                            expect_errors=True)
+        self.assertEqual(400, ret.status_code)
+        self.assertTrue(ret.json['error_message'])
 
     @mock.patch.object(rpcapi.ConductorAPI, 'set_boot_device')
     def test_set_boot_device(self, mock_sbd):