openstack
/
ironic
Code Issues Proposed changes

Merge "iLO firmware update fails with 'update_firmware_sum' clean step" into stable/rocky

This commit is contained in:
Zuul 2019-08-20 01:16:29 +00:00 committed by Gerrit Code Review
parent 1b4d8effa8 3f2b81e9d5
commit a303778f15
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ironic/drivers/modules/ilo/management.py
View File

@ -472,6 +472,9 @@ class IloManagement(base.ManagementInterface):
url = firmware_processor.get_swift_url(urlparse.urlparse(url))
node.clean_step['args']['url'] = url
# Insert SPP ISO into virtual media CDROM
ilo_common.attach_vmedia(node, 'CDROM', url)
step = node.clean_step
return deploy_utils.agent_execute_clean_step(task, step)

22
ironic/tests/unit/drivers/modules/ilo/test_management.py
View File

@ -539,9 +539,12 @@ class IloManagementTestCase(test_common.BaseIloTest):
remove_mock.assert_has_calls([mock.call(fw_loc_obj_1),
mock.call(fw_loc_obj_2)])
@mock.patch.object(ilo_common, 'attach_vmedia', spec_set=True,
autospec=True)
@mock.patch.object(deploy_utils, 'agent_execute_clean_step',
autospec=True)
def test_update_firmware_sum_mode_with_component(self, execute_mock):
def test_update_firmware_sum_mode_with_component(
self, execute_mock, attach_vmedia_mock):
with task_manager.acquire(self.context, self.node.uuid,
shared=False) as task:
execute_mock.return_value = states.CLEANWAIT
@ -558,15 +561,19 @@ class IloManagementTestCase(test_common.BaseIloTest):
return_value = task.driver.management.update_firmware_sum(
task, **firmware_update_args)
# | THEN |
attach_vmedia_mock.assert_any_call(
task.node, 'CDROM', 'http://any_url')
self.assertEqual(states.CLEANWAIT, return_value)
execute_mock.assert_called_once_with(task, clean_step)
@mock.patch.object(ilo_common, 'attach_vmedia', spec_set=True,
autospec=True)
@mock.patch.object(ilo_management.firmware_processor,
'get_swift_url', autospec=True)
@mock.patch.object(deploy_utils, 'agent_execute_clean_step',
autospec=True)
def test_update_firmware_sum_mode_swift_url(self, execute_mock,
swift_url_mock):
def test_update_firmware_sum_mode_swift_url(
self, execute_mock, swift_url_mock, attach_vmedia_mock):
with task_manager.acquire(self.context, self.node.uuid,
shared=False) as task:
swift_url_mock.return_value = "http://path-to-file"
@ -584,13 +591,18 @@ class IloManagementTestCase(test_common.BaseIloTest):
return_value = task.driver.management.update_firmware_sum(
task, **firmware_update_args)
# | THEN |
attach_vmedia_mock.assert_any_call(
task.node, 'CDROM', 'http://path-to-file')
self.assertEqual(states.CLEANWAIT, return_value)
self.assertEqual(task.node.clean_step['args']['url'],
"http://path-to-file")
@mock.patch.object(ilo_common, 'attach_vmedia', spec_set=True,
autospec=True)
@mock.patch.object(deploy_utils, 'agent_execute_clean_step',
autospec=True)
def test_update_firmware_sum_mode_without_component(self, execute_mock):
def test_update_firmware_sum_mode_without_component(
self, execute_mock, attach_vmedia_mock):
with task_manager.acquire(self.context, self.node.uuid,
shared=False) as task:
execute_mock.return_value = states.CLEANWAIT
@ -606,6 +618,8 @@ class IloManagementTestCase(test_common.BaseIloTest):
return_value = task.driver.management.update_firmware_sum(
task, **firmware_update_args)
# | THEN |
attach_vmedia_mock.assert_any_call(
task.node, 'CDROM', 'any_valid_url')
self.assertEqual(states.CLEANWAIT, return_value)
execute_mock.assert_called_once_with(task, clean_step)

8
releasenotes/notes/story-2006223-ilo-hpsum-firmware-update-fails-622883e4785313c1.yaml Normal file
View File

@ -0,0 +1,8 @@
---
fixes:
- |
Fixes an issue in updating firmware using ``update_firmware_sum`` clean
step from management interface of ``ilo`` hardware type with an error
stating that unable to connect to iLO address due to authentication
failure. See `story 2006223
<https://storyboard.openstack.org/#!/story/2006223>`__ for details.