openstack/ironic
Code Issues Proposed changes

Merge "Remove instance image after deployment"

Browse Source
This commit is contained in:
Zuul 2023-08-29 11:54:59 +00:00 committed by Gerrit Code Review
commit 3d2601cd01
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ironic/drivers/modules/agent.py
View File

@ -615,8 +615,8 @@ class AgentDeploy(CustomAgentDeploy):
else: else:
manager_utils.node_set_boot_device(task, 'disk', persistent=True) manager_utils.node_set_boot_device(task, 'disk', persistent=True)
# Remove symbolic link when deploy is done. # Remove symbolic link and image when deploy is done.
deploy_utils.remove_http_instance_symlink(task.node.uuid) deploy_utils.destroy_http_instance_images(task.node)
class AgentRAID(base.RAIDInterface): class AgentRAID(base.RAIDInterface):

19
ironic/tests/unit/drivers/modules/test_agent.py
View File

@ -1400,7 +1400,7 @@ class TestAgentDeploy(CommonTestsMixin, db_base.DbTestCase):
mock_build_configdrive.assert_called_once_with( mock_build_configdrive.assert_called_once_with(
task.node, {'meta_data': {}}) task.node, {'meta_data': {}})
@mock.patch.object(deploy_utils, 'remove_http_instance_symlink', @mock.patch.object(deploy_utils, 'destroy_http_instance_images',
autospec=True) autospec=True)
@mock.patch.object(agent.LOG, 'warning', spec_set=True, autospec=True) @mock.patch.object(agent.LOG, 'warning', spec_set=True, autospec=True)
@mock.patch.object(agent_client.AgentClient, 'get_partition_uuids', @mock.patch.object(agent_client.AgentClient, 'get_partition_uuids',
@ -1408,7 +1408,7 @@ class TestAgentDeploy(CommonTestsMixin, db_base.DbTestCase):
@mock.patch.object(agent.AgentDeploy, 'prepare_instance_to_boot', @mock.patch.object(agent.AgentDeploy, 'prepare_instance_to_boot',
autospec=True) autospec=True)
def test_prepare_instance_boot(self, prepare_instance_mock, def test_prepare_instance_boot(self, prepare_instance_mock,
uuid_mock, log_mock, remove_symlink_mock): uuid_mock, log_mock, destroy_image_mock):
self.config(manage_agent_boot=True, group='agent') self.config(manage_agent_boot=True, group='agent')
self.config(image_download_source='http', group='agent') self.config(image_download_source='http', group='agent')
uuid_mock.return_value = {} uuid_mock.return_value = {}
@ -1427,8 +1427,9 @@ class TestAgentDeploy(CommonTestsMixin, db_base.DbTestCase):
None, None, None) None, None, None)
self.assertEqual(states.DEPLOYING, task.node.provision_state) self.assertEqual(states.DEPLOYING, task.node.provision_state)
self.assertEqual(states.ACTIVE, task.node.target_provision_state) self.assertEqual(states.ACTIVE, task.node.target_provision_state)
self.assertTrue(remove_symlink_mock.called) destroy_image_mock.assert_called_once_with(task.node)
@mock.patch.object(deploy_utils, 'destroy_images', autospec=True)
@mock.patch.object(agent.LOG, 'warning', spec_set=True, autospec=True) @mock.patch.object(agent.LOG, 'warning', spec_set=True, autospec=True)
@mock.patch.object(manager_utils, 'node_set_boot_device', autospec=True) @mock.patch.object(manager_utils, 'node_set_boot_device', autospec=True)
@mock.patch.object(agent_client.AgentClient, 'get_partition_uuids', @mock.patch.object(agent_client.AgentClient, 'get_partition_uuids',
@ -1437,7 +1438,7 @@ class TestAgentDeploy(CommonTestsMixin, db_base.DbTestCase):
autospec=True) autospec=True)
def test_prepare_instance_boot_no_manage_agent_boot( def test_prepare_instance_boot_no_manage_agent_boot(
self, prepare_instance_mock, uuid_mock, self, prepare_instance_mock, uuid_mock,
bootdev_mock, log_mock): bootdev_mock, log_mock, destroy_image_mock):
self.config(manage_agent_boot=False, group='agent') self.config(manage_agent_boot=False, group='agent')
uuid_mock.return_value = {} uuid_mock.return_value = {}
self.node.provision_state = states.DEPLOYING self.node.provision_state = states.DEPLOYING
@ -1456,6 +1457,7 @@ class TestAgentDeploy(CommonTestsMixin, db_base.DbTestCase):
self.assertEqual(states.DEPLOYING, task.node.provision_state) self.assertEqual(states.DEPLOYING, task.node.provision_state)
self.assertEqual(states.ACTIVE, task.node.target_provision_state) self.assertEqual(states.ACTIVE, task.node.target_provision_state)
@mock.patch.object(deploy_utils, 'destroy_images', autospec=True)
@mock.patch.object(agent.LOG, 'warning', spec_set=True, autospec=True) @mock.patch.object(agent.LOG, 'warning', spec_set=True, autospec=True)
@mock.patch.object(boot_mode_utils, 'get_boot_mode_for_deploy', @mock.patch.object(boot_mode_utils, 'get_boot_mode_for_deploy',
autospec=True) autospec=True)
@ -1465,7 +1467,8 @@ class TestAgentDeploy(CommonTestsMixin, db_base.DbTestCase):
autospec=True) autospec=True)
def test_prepare_instance_boot_partition_image(self, prepare_instance_mock, def test_prepare_instance_boot_partition_image(self, prepare_instance_mock,
uuid_mock, boot_mode_mock, uuid_mock, boot_mode_mock,
log_mock): log_mock,
destroy_image_mock):
uuid_mock.return_value = { uuid_mock.return_value = {
'command_result': {'root uuid': 'root_uuid'} 'command_result': {'root uuid': 'root_uuid'}
} }
@ -1492,6 +1495,7 @@ class TestAgentDeploy(CommonTestsMixin, db_base.DbTestCase):
self.assertEqual(states.DEPLOYING, task.node.provision_state) self.assertEqual(states.DEPLOYING, task.node.provision_state)
self.assertEqual(states.ACTIVE, task.node.target_provision_state) self.assertEqual(states.ACTIVE, task.node.target_provision_state)
@mock.patch.object(deploy_utils, 'destroy_images', autospec=True)
@mock.patch.object(agent.LOG, 'warning', spec_set=True, autospec=True) @mock.patch.object(agent.LOG, 'warning', spec_set=True, autospec=True)
@mock.patch.object(boot_mode_utils, 'get_boot_mode_for_deploy', @mock.patch.object(boot_mode_utils, 'get_boot_mode_for_deploy',
autospec=True) autospec=True)
@ -1501,7 +1505,7 @@ class TestAgentDeploy(CommonTestsMixin, db_base.DbTestCase):
autospec=True) autospec=True)
def test_prepare_instance_boot_partition_localboot_ppc64( def test_prepare_instance_boot_partition_localboot_ppc64(
self, prepare_instance_mock, self, prepare_instance_mock,
uuid_mock, boot_mode_mock, log_mock): uuid_mock, boot_mode_mock, log_mock, destroy_image_mock):
uuid_mock.return_value = { uuid_mock.return_value = {
'command_result': { 'command_result': {
'root uuid': 'root_uuid', 'root uuid': 'root_uuid',
@ -1536,6 +1540,7 @@ class TestAgentDeploy(CommonTestsMixin, db_base.DbTestCase):
self.assertEqual(states.DEPLOYING, task.node.provision_state) self.assertEqual(states.DEPLOYING, task.node.provision_state)
self.assertEqual(states.ACTIVE, task.node.target_provision_state) self.assertEqual(states.ACTIVE, task.node.target_provision_state)
@mock.patch.object(deploy_utils, 'destroy_images', autospec=True)
@mock.patch.object(agent.LOG, 'warning', spec_set=True, autospec=True) @mock.patch.object(agent.LOG, 'warning', spec_set=True, autospec=True)
@mock.patch.object(boot_mode_utils, 'get_boot_mode_for_deploy', @mock.patch.object(boot_mode_utils, 'get_boot_mode_for_deploy',
autospec=True) autospec=True)
@ -1545,7 +1550,7 @@ class TestAgentDeploy(CommonTestsMixin, db_base.DbTestCase):
autospec=True) autospec=True)
def test_prepare_instance_boot_localboot(self, prepare_instance_mock, def test_prepare_instance_boot_localboot(self, prepare_instance_mock,
uuid_mock, boot_mode_mock, uuid_mock, boot_mode_mock,
log_mock): log_mock, destroy_image_mock):
uuid_mock.return_value = { uuid_mock.return_value = {
'command_result': { 'command_result': {
'root uuid': 'root_uuid', 'root uuid': 'root_uuid',