diff options
| author | Kaifeng Wang <kaifeng.w@gmail.com> | 2019-12-10 19:14:18 +0800 |
|---|---|---|
| committer | Kaifeng Wang <kaifeng.w@gmail.com> | 2020-02-21 14:25:01 +0800 |
| commit | 34d34b3a9d346c76d5cd9b126273f9b9e04c44e8 (patch) | |
| tree | 2a8adb4e26b255a41b9f56b624506cd3a2a4263c /ironic/tests/unit/drivers/modules/test_ipxe.py | |
| parent | 6ba983b615a75c2be69ced795ecde3681dd8f79c (diff) | |
| download | ironic-34d34b3a9d346c76d5cd9b126273f9b9e04c44e8.tar.gz | |
Finalize removal of ipxe_enabled option
Remove the dynamically registered ipxe_enabled option and say goodbye.
Further extracts common bits to the PXEBaseMixin, tuning tests here and
there.
Story: 2007003
Task: 37779
Change-Id: I7c1b2a984d45bd63b4e95b62ce02960924c2ce17
Diffstat (limited to 'ironic/tests/unit/drivers/modules/test_ipxe.py')
| -rw-r--r-- | ironic/tests/unit/drivers/modules/test_ipxe.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ironic/tests/unit/drivers/modules/test_ipxe.py b/ironic/tests/unit/drivers/modules/test_ipxe.py index 1273bbef4..1b81784fd 100644 --- a/ironic/tests/unit/drivers/modules/test_ipxe.py +++ b/ironic/tests/unit/drivers/modules/test_ipxe.py @@ -86,7 +86,7 @@ class iPXEBootTestCase(db_base.DbTestCase): self.config(group='conductor', api_url='http://127.0.0.1:1234/') def test_get_properties(self): - expected = ipxe.COMMON_PROPERTIES + expected = pxe_base.COMMON_PROPERTIES expected.update(agent_base.VENDOR_PROPERTIES) with task_manager.acquire(self.context, self.node.uuid, shared=True) as task: @@ -415,7 +415,6 @@ class iPXEBootTestCase(db_base.DbTestCase): self, render_mock, write_mock): self.node.provision_state = states.DEPLOYING self.node.save() - self.config(group='pxe', ipxe_enabled=False) render_mock.return_value = 'foo' self._test_prepare_ramdisk() write_mock.assert_called_once_with( @@ -435,7 +434,6 @@ class iPXEBootTestCase(db_base.DbTestCase): self, render_mock, write_mock, file_has_content_mock): self.node.provision_state = states.DEPLOYING self.node.save() - self.config(group='pxe', ipxe_enabled=False) render_mock.return_value = 'foo' self._test_prepare_ramdisk() self.assertFalse(file_has_content_mock.called) @@ -456,7 +454,6 @@ class iPXEBootTestCase(db_base.DbTestCase): self, render_mock, write_mock): self.node.provision_state = states.DEPLOYING self.node.save() - self.config(group='pxe', ipxe_enabled=False) self._test_prepare_ramdisk() self.assertFalse(write_mock.called) @@ -465,7 +462,6 @@ class iPXEBootTestCase(db_base.DbTestCase): def test_prepare_ramdisk_ipxe_swift(self, write_mock): self.node.provision_state = states.DEPLOYING self.node.save() - self.config(group='pxe', ipxe_enabled=False) self.config(group='pxe', ipxe_use_swift=True) self._test_prepare_ramdisk(ipxe_use_swift=True) write_mock.assert_called_once_with( @@ -480,7 +476,6 @@ class iPXEBootTestCase(db_base.DbTestCase): self, write_mock): self.node.provision_state = states.DEPLOYING self.node.save() - self.config(group='pxe', ipxe_enabled=False) self.config(group='pxe', ipxe_use_swift=True) self._test_prepare_ramdisk(ipxe_use_swift=True, whole_disk_image=True) write_mock.assert_called_once_with( @@ -774,7 +769,6 @@ class iPXEBootTestCase(db_base.DbTestCase): dhcp_factory_mock, switch_pxe_config_mock, set_boot_device_mock, create_pxe_config_mock): http_url = 'http://192.1.2.3:1234' - self.config(ipxe_enabled=False, group='pxe') self.config(http_url=http_url, group='deploy') provider_mock = mock.MagicMock() dhcp_factory_mock.return_value = provider_mock |