openstack
/
ironic
Code Issues Proposed changes

Add maintenance check before call do_node_deploy 

Currently if we set provision state to active or rebuild, there is
no maintenance check before signal to conductor, so add the check
on api side to save a rpc call.

Closes-Bug: #1441413
Change-Id: I2898b874b92f865d7e566fac0ede568d1b6c3831
This commit is contained in:
Zhenguo Niu 2015-04-02 22:35:37 +08:00
parent 0bac0ac02e
commit 6aace9c774
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ironic/api/controllers/v1/node.py
View File

@ -426,6 +426,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)):

17
ironic/tests/api/v1/test_nodes.py
View File

@ -1899,17 +1899,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):