openstack/ironic-python-agent
Code Issues Proposed changes

Fix nvidia hardware manager url parser to permit https

Browse Source 
Change-Id: I9a10e543d3256ceaa78c6fbdb01fc0d88c0ee6e6
This commit is contained in:
Julia Kreger 2023-04-24 17:16:04 -07:00
parent 78c1343a54
commit b83678c968
3 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ironic_python_agent/hardware_managers/nvidia/nvidia_fw_update.py
View File

@ -436,7 +436,7 @@ class NvidiaNicFirmwareBinary(object):
"""Process the firmware url and download the image to a temporary
destination in the system.
The supported firmware URL schemes are (file://, http://)
The supported firmware URL schemes are (file://, http://, https://)
:returns: None
:raises: InvalidURLScheme, for unsupported firmware url
"""
@ -448,12 +448,12 @@ class NvidiaNicFirmwareBinary(object):
url_scheme = parsed_url.scheme
if url_scheme == 'file':
self._download_file_based_fw()
elif url_scheme == 'http':
elif url_scheme == 'http' or url_scheme == 'https':
self._download_http_based_fw()
else:
err = 'Firmware URL scheme %s is not supported.' \
'The supported firmware URL schemes are' \
'(http://, file://)' % url_scheme
'(http://, https://, file://)' % url_scheme
raise InvalidURLScheme(error_msg=_(err))
def _get_info(self):

34
ironic_python_agent/tests/unit/hardware_managers/nvidia/test_nvidia_fw_update.py
View File

@ -365,6 +365,40 @@ PSID: MT_0000000228
self.assertEqual(nvidia_nic_fw_binary.dest_file_path,
'/tmp/nvidia_firmware123/fw1.bin')
@mock.patch.object(nvidia_fw_update.request, 'urlopen', autospec=True)
@mock.patch.object(builtins, 'open', autospec=True)
@mock.patch.object(utils, 'execute', autospec=True)
@mock.patch.object(fileutils, 'compute_file_checksum', autospec=True)
@mock.patch.object(tempfile, 'mkdtemp', autospec=True)
def test_nvidia_nic_firmware_binray_https(
self, mocked_mkdtemp, mocked_compute_file_checksum,
mocked_execute, open_mock, mocked_url_open):
mocked_mkdtemp.return_value = '/tmp/nvidia_firmware123/'
a = mock.Mock()
a.read.return_value = 'dummy data'
mocked_url_open.return_value = a
mocked_execute.return_value = ("""Image type: FS4
FW Version: 20.35.1012
PSID: MT_0000000228
""", '')
mocked_compute_file_checksum.return_value = \
'a94e683ea16d9ae44768f0a65942234c'
fd_mock = mock.MagicMock(spec=io.BytesIO)
open_mock.return_value = fd_mock
nvidia_nic_fw_binary = nvidia_fw_update.NvidiaNicFirmwareBinary(
'https://10.10.10.10/firmware_images/fw1.bin',
'a94e683ea16d9ae44768f0a65942234c',
'sha512',
'MT_0000000228',
'20.35.1012')
mocked_execute.assert_called_once()
mocked_compute_file_checksum.assert_called_once()
open_mock.assert_called_once()
mocked_url_open.assert_called_once()
mocked_mkdtemp.assert_called_once()
self.assertEqual(nvidia_nic_fw_binary.dest_file_path,
'/tmp/nvidia_firmware123/fw1.bin')
def test_nvidia_nic_firmware_binray_invalid_url_scheme(self):
self.assertRaises(nvidia_fw_update.InvalidURLScheme,
nvidia_fw_update.NvidiaNicFirmwareBinary,

5
releasenotes/notes/fix-nvidia-hw-mgr-https-38825a4161a8561b.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes the nvidia hardware manager firmware upgrade support to permit
URLs with an "https" schema.