openstack
/
ironic
Code Issues Proposed changes

Add a missing error check in ipmitool driver's reboot 

This patch adds a missing error check into ipmitool power driver's
reboot so that the reboot can fail properly if power off failed.

Change-Id: Icd061fe51555be3200b154c5e43e0f082864c93f
Closes-bug: #1633992
(cherry picked from commit c073fb714d)
This commit is contained in:
Naohiro Tamura 2016-10-17 15:25:13 +09:00 committed by Dmitry Tantsur
parent 574a836f1c
commit 8df85facec
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ironic/drivers/modules/ipmitool.py
View File

@ -828,11 +828,13 @@ class IPMIPower(base.PowerInterface):
:raises: MissingParameterValue if required ipmi parameters are missing.
:raises: InvalidParameterValue if an invalid power state was specified.
:raises: PowerStateFailure if the final state of the node is not
POWER_ON.
POWER_ON or the intermediate state of the node is not POWER_OFF.
"""
driver_info = _parse_driver_info(task.node)
_power_off(driver_info)
intermediate_state = _power_off(driver_info)
if intermediate_state != states.POWER_OFF:
raise exception.PowerStateFailure(pstate=states.POWER_OFF)
driver_utils.ensure_next_boot_device(task, driver_info)
state = _power_on(driver_info)

22
ironic/tests/unit/drivers/modules/test_ipmitool.py
View File

@ -1456,6 +1456,7 @@ class IPMIToolDriverTestCase(db_base.DbTestCase):
def test_reboot_ok(self, mock_on, mock_off, mock_next_boot):
manager = mock.MagicMock()
# NOTE(rloo): if autospec is True, then manager.mock_calls is empty
mock_off.return_value = states.POWER_OFF
mock_on.return_value = states.POWER_ON
manager.attach_mock(mock_off, 'power_off')
manager.attach_mock(mock_on, 'power_on')
@ -1471,9 +1472,28 @@ class IPMIToolDriverTestCase(db_base.DbTestCase):
@mock.patch.object(ipmi, '_power_off', spec_set=types.FunctionType)
@mock.patch.object(ipmi, '_power_on', spec_set=types.FunctionType)
def test_reboot_fail(self, mock_on, mock_off):
def test_reboot_fail_power_off(self, mock_on, mock_off):
manager = mock.MagicMock()
# NOTE(rloo): if autospec is True, then manager.mock_calls is empty
mock_off.return_value = states.ERROR
manager.attach_mock(mock_off, 'power_off')
manager.attach_mock(mock_on, 'power_on')
expected = [mock.call.power_off(self.info)]
with task_manager.acquire(self.context,
self.node.uuid) as task:
self.assertRaises(exception.PowerStateFailure,
self.driver.power.reboot,
task)
self.assertEqual(manager.mock_calls, expected)
@mock.patch.object(ipmi, '_power_off', spec_set=types.FunctionType)
@mock.patch.object(ipmi, '_power_on', spec_set=types.FunctionType)
def test_reboot_fail_power_on(self, mock_on, mock_off):
manager = mock.MagicMock()
# NOTE(rloo): if autospec is True, then manager.mock_calls is empty
mock_off.return_value = states.POWER_OFF
mock_on.return_value = states.ERROR
manager.attach_mock(mock_off, 'power_off')
manager.attach_mock(mock_on, 'power_on')

4
releasenotes/notes/add-error-check-ipmitool-reboot-ca7823202c5ab71d.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- adds a missing error check into ipmitool power driver's reboot so
that the reboot can fail properly if power off failed.