diff options
| author | Shivanand Tendulker <stendulker@gmail.com> | 2017-11-16 13:23:05 -0500 |
|---|---|---|
| committer | Ruby Loo <ruby.loo@intel.com> | 2018-01-25 13:26:33 -0500 |
| commit | 4624c572e21f136db5df8ebcd0ddae03eed71a59 (patch) | |
| tree | 1294b186942437adf496c017a402be960a776377 /ironic/tests/unit/common/test_pxe_utils.py | |
| parent | f5654bfd00bd11564203657062d4c53803dcf0c7 (diff) | |
| download | ironic-4624c572e21f136db5df8ebcd0ddae03eed71a59.tar.gz | |
Agent rescue implementation
This implements agent based rescue interface.
Partial-Bug: #1526449
Co-Authored-By: Mario Villaplana <mario.villaplana@gmail.com>
Co-Authored-By: Aparna <aparnavtce@gmail.com>
Co-Authored-By: Shivanand Tendulker <stendulker@gmail.com>
Change-Id: I9b4c1278dc5fab7888fbfe586c15e31ed3958978
Diffstat (limited to 'ironic/tests/unit/common/test_pxe_utils.py')
| -rw-r--r-- | ironic/tests/unit/common/test_pxe_utils.py | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/ironic/tests/unit/common/test_pxe_utils.py b/ironic/tests/unit/common/test_pxe_utils.py index 8ca347dc4..9b16addc0 100644 --- a/ironic/tests/unit/common/test_pxe_utils.py +++ b/ironic/tests/unit/common/test_pxe_utils.py @@ -646,43 +646,53 @@ class TestPXEUtils(db_base.DbTestCase): def test_dhcp_options_for_instance_ipv6(self): self._dhcp_options_for_instance(ip_version=6) - def _test_get_deploy_kr_info(self, expected_dir): + def _test_get_kernel_ramdisk_info(self, expected_dir, mode='deploy'): node_uuid = 'fake-node' - driver_info = { - 'deploy_kernel': 'glance://deploy-kernel', - 'deploy_ramdisk': 'glance://deploy-ramdisk', - } - expected = { - 'deploy_kernel': ('glance://deploy-kernel', - expected_dir + '/fake-node/deploy_kernel'), - 'deploy_ramdisk': ('glance://deploy-ramdisk', - expected_dir + '/fake-node/deploy_ramdisk'), + driver_info = { + '%s_kernel' % mode: 'glance://%s-kernel' % mode, + '%s_ramdisk' % mode: 'glance://%s-ramdisk' % mode, } - kr_info = pxe_utils.get_deploy_kr_info(node_uuid, driver_info) + expected = {} + for k, v in driver_info.items(): + expected[k] = (v, expected_dir + '/fake-node/%s' % k) + kr_info = pxe_utils.get_kernel_ramdisk_info(node_uuid, + driver_info, + mode=mode) self.assertEqual(expected, kr_info) - def test_get_deploy_kr_info(self): + def test_get_kernel_ramdisk_info(self): expected_dir = '/tftp' self.config(tftp_root=expected_dir, group='pxe') - self._test_get_deploy_kr_info(expected_dir) + self._test_get_kernel_ramdisk_info(expected_dir) - def test_get_deploy_kr_info_ipxe(self): + def test_get_kernel_ramdisk_info_ipxe(self): expected_dir = '/http' self.config(ipxe_enabled=True, group='pxe') self.config(http_root=expected_dir, group='deploy') - self._test_get_deploy_kr_info(expected_dir) + self._test_get_kernel_ramdisk_info(expected_dir) - def test_get_deploy_kr_info_bad_driver_info(self): + def test_get_kernel_ramdisk_info_bad_driver_info(self): self.config(tftp_root='/tftp', group='pxe') node_uuid = 'fake-node' driver_info = {} self.assertRaises(KeyError, - pxe_utils.get_deploy_kr_info, + pxe_utils.get_kernel_ramdisk_info, node_uuid, driver_info) + def test_get_rescue_kr_info(self): + expected_dir = '/tftp' + self.config(tftp_root=expected_dir, group='pxe') + self._test_get_kernel_ramdisk_info(expected_dir, mode='rescue') + + def test_get_rescue_kr_info_ipxe(self): + expected_dir = '/http' + self.config(ipxe_enabled=True, group='pxe') + self.config(http_root=expected_dir, group='deploy') + self._test_get_kernel_ramdisk_info(expected_dir, mode='rescue') + def _dhcp_options_for_instance_ipxe(self, task, boot_file): self.config(tftp_server='192.0.2.1', group='pxe') self.config(ipxe_enabled=True, group='pxe') |