diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-16 09:00:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-16 09:00:23 +0000 |
| commit | c685f4032aeb7e0de4514873dee1866fb9c2ce48 (patch) | |
| tree | bee414f2a11ec96bf2c4c0627c202014fbde7876 | |
| parent | 7c216d035057b6a72e9c187f0898eb13e43719de (diff) | |
| parent | c81431c3477524f187d6febe2b230cf9948a3627 (diff) | |
| download | ironic-c685f4032aeb7e0de4514873dee1866fb9c2ce48.tar.gz | |
Merge "Disable clean_step if config option is set to 0" into stable/kilo
| -rw-r--r-- | ironic/drivers/modules/ilo/deploy.py | 2 | ||||
| -rw-r--r-- | ironic/tests/drivers/ilo/test_deploy.py | 18 |
2 files changed, 18 insertions, 2 deletions
diff --git a/ironic/drivers/modules/ilo/deploy.py b/ironic/drivers/modules/ilo/deploy.py index 86dc0c729..5f901184e 100644 --- a/ironic/drivers/modules/ilo/deploy.py +++ b/ironic/drivers/modules/ilo/deploy.py @@ -566,7 +566,7 @@ class IloVirtualMediaAgentDeploy(base.DeployInterface): :returns: A list of clean step dictionaries """ steps = deploy_utils.agent_get_clean_steps(task) - if CONF.ilo.clean_priority_erase_devices: + if CONF.ilo.clean_priority_erase_devices is not None: for step in steps: if (step.get('step') == 'erase_devices' and step.get('interface') == 'deploy'): diff --git a/ironic/tests/drivers/ilo/test_deploy.py b/ironic/tests/drivers/ilo/test_deploy.py index f44e532b9..e54d8a6e6 100644 --- a/ironic/tests/drivers/ilo/test_deploy.py +++ b/ironic/tests/drivers/ilo/test_deploy.py @@ -717,7 +717,23 @@ class IloVirtualMediaAgentDeployTestCase(db_base.DbTestCase): self.assertEqual(step[0].get('priority'), CONF.ilo.clean_priority_erase_devices) - @mock.patch.object(deploy_utils, 'agent_get_clean_steps') + @mock.patch.object(deploy_utils, 'agent_get_clean_steps', autospec=True) + def test_get_clean_steps_erase_devices_disable(self, get_clean_step_mock): + self.config(clean_priority_erase_devices=0, group='ilo') + get_clean_step_mock.return_value = [{ + 'step': 'erase_devices', + 'priority': 10, + 'interface': 'deploy', + 'reboot_requested': False + }] + with task_manager.acquire(self.context, self.node.uuid, + shared=False) as task: + step = task.driver.deploy.get_clean_steps(task) + get_clean_step_mock.assert_called_once_with(task) + self.assertEqual(step[0].get('priority'), + CONF.ilo.clean_priority_erase_devices) + + @mock.patch.object(deploy_utils, 'agent_get_clean_steps', autospec=True) def test_get_clean_steps_without_conf_option(self, get_clean_step_mock): get_clean_step_mock.return_value = [{ 'step': 'erase_devices', |