openstack/ironic
Code Issues Proposed changes

Merge "Fix use of urlparse.urljoin"

Browse Source
This commit is contained in:
Zuul 2019-12-16 08:35:11 +00:00 committed by Gerrit Code Review
commit 2edb84db23
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/drivers/modules/redfish/boot.py
View File

@ -291,7 +291,7 @@ class RedfishVirtualMediaBoot(base.BootInterface):
shutil.copyfile(image_file, published_file)
image_url = urlparse.urljoin(
image_url = os.path.join(
CONF.deploy.http_url, cls.IMAGE_SUBDIR, object_name)
image_url = cls._append_filename_param(

4
ironic/tests/unit/drivers/modules/redfish/test_boot.py
View File

@ -250,7 +250,7 @@ class RedfishVirtualMediaBootTestCase(db_base.DbTestCase):
url = task.driver.boot._publish_image('file.iso', 'boot.iso')
self.assertEqual(
'http://localhost/redfish?filename=file.iso', url)
'http://localhost/redfish/boot.iso?filename=file.iso', url)
mock_mkdir.assert_called_once_with('/httpboot/redfish', 0x755)
mock_link.assert_called_once_with(
@ -272,7 +272,7 @@ class RedfishVirtualMediaBootTestCase(db_base.DbTestCase):
url = task.driver.boot._publish_image('file.iso', 'boot.iso')
self.assertEqual(
'http://localhost/redfish?filename=file.iso', url)
'http://localhost/redfish/boot.iso?filename=file.iso', url)
mock_mkdir.assert_called_once_with('/httpboot/redfish', 0x755)

5
releasenotes/notes/fix-path-a3a0cfd2c135ace9.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fix path used to virtual media iso, when served over
local HTTP server([redfish]use_swift=false).