diff options
Diffstat (limited to 'ironic/tests/unit/common/test_pxe_utils.py')
-rw-r--r-- | ironic/tests/unit/common/test_pxe_utils.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ironic/tests/unit/common/test_pxe_utils.py b/ironic/tests/unit/common/test_pxe_utils.py index 822c5f4ff..85afdd6b8 100644 --- a/ironic/tests/unit/common/test_pxe_utils.py +++ b/ironic/tests/unit/common/test_pxe_utils.py @@ -1791,9 +1791,10 @@ class iPXEBuildConfigOptionsTestCase(db_base.DbTestCase): self.config(ipxe_use_swift=True, group='pxe') glance = mock.Mock() glance_mock.return_value = glance - glance.swift_temp_url.side_effect = [ - pxe_kernel, pxe_ramdisk] = [ - 'swift_kernel', 'swift_ramdisk'] + glance.swift_temp_url.side_effect = [pxe_kernel, pxe_ramdisk] = [ + 'http://example.com/account/swift_kernel', + 'http://example.com/account/swift_ramdisk' + ] image_info = { kernel_label: (uuidutils.generate_uuid(), os.path.join(root_dir, @@ -1804,6 +1805,7 @@ class iPXEBuildConfigOptionsTestCase(db_base.DbTestCase): self.node.uuid, ramdisk_label)) } + expected_initrd_filename = 'swift_ramdisk' else: pxe_kernel = os.path.join(http_url, self.node.uuid, kernel_label) @@ -1819,6 +1821,7 @@ class iPXEBuildConfigOptionsTestCase(db_base.DbTestCase): self.node.uuid, ramdisk_label)) } + expected_initrd_filename = ramdisk_label kernel = os.path.join(http_url, self.node.uuid, 'kernel') ramdisk = os.path.join(http_url, self.node.uuid, 'ramdisk') @@ -1853,7 +1856,7 @@ class iPXEBuildConfigOptionsTestCase(db_base.DbTestCase): 'ipxe_timeout': ipxe_timeout_in_ms, 'ari_path': ramdisk, 'aki_path': kernel, - 'initrd_filename': ramdisk_label, + 'initrd_filename': expected_initrd_filename, } if mode == 'rescue': |