diff options
author | Dmitry Tantsur <divius.inside@gmail.com> | 2019-01-31 13:29:39 +0100 |
---|---|---|
committer | Dmitry Tantsur <divius.inside@gmail.com> | 2019-01-31 14:33:11 +0100 |
commit | cede60388c2947ca882f53f3d647a5f41e259703 (patch) | |
tree | d84838105fa9488ea2686ff04fceab4c7ca58d15 /ironic/tests/unit/common | |
parent | 7794e29ed6027d5fcf7b8e8ffa46677bccddcb9b (diff) | |
download | ironic-cede60388c2947ca882f53f3d647a5f41e259703.tar.gz |
Fix iPXE boot interface with ipxe_enabled=False
If ipxe_enabled=False, Ironic still tried to download images into
the TFTP location, which could fail. This patch fixes it.
Story: #2004905
Task: #29253
Change-Id: I5958eeb0d9de59a34145dd899354bf2a1a115dde
Diffstat (limited to 'ironic/tests/unit/common')
-rw-r--r-- | ironic/tests/unit/common/test_pxe_utils.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ironic/tests/unit/common/test_pxe_utils.py b/ironic/tests/unit/common/test_pxe_utils.py index f0eebb21d..6f1372ee0 100644 --- a/ironic/tests/unit/common/test_pxe_utils.py +++ b/ironic/tests/unit/common/test_pxe_utils.py @@ -1114,6 +1114,20 @@ class PXEInterfacesTestCase(db_base.DbTestCase): image_info = pxe_utils.get_image_info(self.node) self.assertEqual(expected_info, image_info) + def test__get_deploy_image_info_ipxe(self): + expected_info = {'deploy_ramdisk': + (DRV_INFO_DICT['deploy_ramdisk'], + os.path.join(CONF.deploy.http_root, + self.node.uuid, + 'deploy_ramdisk')), + 'deploy_kernel': + (DRV_INFO_DICT['deploy_kernel'], + os.path.join(CONF.deploy.http_root, + self.node.uuid, + 'deploy_kernel'))} + image_info = pxe_utils.get_image_info(self.node, ipxe_enabled=True) + self.assertEqual(expected_info, image_info) + def test__get_deploy_image_info_missing_deploy_kernel(self): del self.node.driver_info['deploy_kernel'] self.assertRaises(exception.MissingParameterValue, |