openstack/ironic-python-agent
Code Issues Proposed changes

Merge "Fix off-by-one error in warning"

Browse Source
This commit is contained in:
Zuul 2017-11-13 07:22:20 +00:00 committed by Gerrit Code Review
commit 3b52a901bc
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ironic_python_agent/hardware.py
View File

@ -392,6 +392,7 @@ class HardwareManager(object):
if not CONF.disk_wait_attempts: if not CONF.disk_wait_attempts:
return return
max_waits = CONF.disk_wait_attempts - 1
for attempt in range(CONF.disk_wait_attempts): for attempt in range(CONF.disk_wait_attempts):
try: try:
self.get_os_install_device() self.get_os_install_device()
@ -400,13 +401,16 @@ class HardwareManager(object):
'attempt %d of %d', attempt + 1, 'attempt %d of %d', attempt + 1,
CONF.disk_wait_attempts) CONF.disk_wait_attempts)
if attempt < CONF.disk_wait_attempts - 1: if attempt < max_waits:
time.sleep(CONF.disk_wait_delay) time.sleep(CONF.disk_wait_delay)
else: else:
break break
else: else:
if max_waits:
LOG.warning('The root device was not detected in %d seconds', LOG.warning('The root device was not detected in %d seconds',
CONF.disk_wait_delay * CONF.disk_wait_attempts) CONF.disk_wait_delay * max_waits)
else:
LOG.warning('The root device was not detected')
def list_hardware_info(self): def list_hardware_info(self):
"""Return full hardware inventory as a serializable dict. """Return full hardware inventory as a serializable dict.

26
ironic_python_agent/tests/unit/test_hardware.py
View File

@ -1680,12 +1680,14 @@ class TestGenericHardwareManager(base.IronicAgentTest):
self.assertEqual(2, mocked_get_inst_dev.call_count) self.assertEqual(2, mocked_get_inst_dev.call_count)
mocked_sleep.assert_called_once_with(CONF.disk_wait_delay) mocked_sleep.assert_called_once_with(CONF.disk_wait_delay)
@mock.patch.object(hardware, 'LOG', autospec=True)
@mock.patch.object(hardware.GenericHardwareManager, @mock.patch.object(hardware.GenericHardwareManager,
'get_os_install_device', autospec=True) 'get_os_install_device', autospec=True)
@mock.patch.object(hardware, '_check_for_iscsi', autospec=True) @mock.patch.object(hardware, '_check_for_iscsi', autospec=True)
@mock.patch.object(time, 'sleep', autospec=True) @mock.patch.object(time, 'sleep', autospec=True)
def test_evaluate_hw_no_wait_for_disks( def test_evaluate_hw_no_wait_for_disks(
self, mocked_sleep, mocked_check_for_iscsi, mocked_get_inst_dev): self, mocked_sleep, mocked_check_for_iscsi, mocked_get_inst_dev,
mocked_log):
CONF.set_override('disk_wait_attempts', '0') CONF.set_override('disk_wait_attempts', '0')
result = self.hardware.evaluate_hardware_support() result = self.hardware.evaluate_hardware_support()
@ -1694,13 +1696,15 @@ class TestGenericHardwareManager(base.IronicAgentTest):
self.assertEqual(hardware.HardwareSupport.GENERIC, result) self.assertEqual(hardware.HardwareSupport.GENERIC, result)
self.assertFalse(mocked_get_inst_dev.called) self.assertFalse(mocked_get_inst_dev.called)
self.assertFalse(mocked_sleep.called) self.assertFalse(mocked_sleep.called)
self.assertFalse(mocked_log.called)
@mock.patch.object(hardware, 'LOG', autospec=True)
@mock.patch.object(hardware, '_check_for_iscsi', mock.Mock()) @mock.patch.object(hardware, '_check_for_iscsi', mock.Mock())
@mock.patch.object(hardware.GenericHardwareManager, @mock.patch.object(hardware.GenericHardwareManager,
'get_os_install_device', autospec=True) 'get_os_install_device', autospec=True)
@mock.patch.object(time, 'sleep', autospec=True) @mock.patch.object(time, 'sleep', autospec=True)
def test_evaluate_hw_waits_for_disks_nonconfigured( def test_evaluate_hw_waits_for_disks_nonconfigured(
self, mocked_sleep, mocked_get_inst_dev): self, mocked_sleep, mocked_get_inst_dev, mocked_log):
mocked_get_inst_dev.side_effect = [ mocked_get_inst_dev.side_effect = [
errors.DeviceNotFound('boom'), errors.DeviceNotFound('boom'),
errors.DeviceNotFound('boom'), errors.DeviceNotFound('boom'),
@ -1722,18 +1726,21 @@ class TestGenericHardwareManager(base.IronicAgentTest):
self.assertEqual(10, mocked_get_inst_dev.call_count) self.assertEqual(10, mocked_get_inst_dev.call_count)
expected_calls = [mock.call(CONF.disk_wait_delay)] * 9 expected_calls = [mock.call(CONF.disk_wait_delay)] * 9
mocked_sleep.assert_has_calls(expected_calls) mocked_sleep.assert_has_calls(expected_calls)
mocked_log.warning.assert_called_once_with(
'The root device was not detected in %d seconds',
CONF.disk_wait_delay * 9)
@mock.patch.object(hardware, 'LOG', autospec=True)
@mock.patch.object(hardware, '_check_for_iscsi', mock.Mock()) @mock.patch.object(hardware, '_check_for_iscsi', mock.Mock())
@mock.patch.object(hardware.GenericHardwareManager, @mock.patch.object(hardware.GenericHardwareManager,
'get_os_install_device', autospec=True) 'get_os_install_device', autospec=True)
@mock.patch.object(time, 'sleep', autospec=True) @mock.patch.object(time, 'sleep', autospec=True)
def test_evaluate_hw_waits_for_disks_configured(self, mocked_sleep, def test_evaluate_hw_waits_for_disks_configured(self, mocked_sleep,
mocked_get_inst_dev): mocked_get_inst_dev,
CONF.set_override('disk_wait_attempts', '2') mocked_log):
CONF.set_override('disk_wait_attempts', '1')
mocked_get_inst_dev.side_effect = [ mocked_get_inst_dev.side_effect = [
errors.DeviceNotFound('boom'),
errors.DeviceNotFound('boom'),
errors.DeviceNotFound('boom'), errors.DeviceNotFound('boom'),
errors.DeviceNotFound('boom'), errors.DeviceNotFound('boom'),
None None
@ -1742,9 +1749,10 @@ class TestGenericHardwareManager(base.IronicAgentTest):
self.hardware.evaluate_hardware_support() self.hardware.evaluate_hardware_support()
mocked_get_inst_dev.assert_called_with(mock.ANY) mocked_get_inst_dev.assert_called_with(mock.ANY)
self.assertEqual(2, mocked_get_inst_dev.call_count) self.assertEqual(1, mocked_get_inst_dev.call_count)
expected_calls = [mock.call(CONF.disk_wait_delay)] * 1 self.assertFalse(mocked_sleep.called)
mocked_sleep.assert_has_calls(expected_calls) mocked_log.warning.assert_called_once_with(
'The root device was not detected')
@mock.patch.object(hardware, '_check_for_iscsi', mock.Mock()) @mock.patch.object(hardware, '_check_for_iscsi', mock.Mock())
@mock.patch.object(hardware.GenericHardwareManager, @mock.patch.object(hardware.GenericHardwareManager,