openstack/ironic
Code Issues Proposed changes

Remove backward compat for Liberty cleaning

Browse Source 
In Liberty, we fetched the last clean step by comparing the current
clean step to the full list stored in the node. In Mitaka, we cleaned
this up with node.driver_internal_info['clean_step_index']. However, we
left a shim in for nodes that were cleaning during the Liberty to Mitaka
upgrade, and did not have the clean step index stored.

Now that we're in Newton, we can safely remove that shim.

Change-Id: I444cd5188a1dfb56fbad13f025179dfdc4cb5c85
This commit is contained in:
Jim Rollenhagen 2016-05-16 09:19:19 -04:00
parent 759e91632b
commit 04209eb27e
2 changed files with 7 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ironic/conductor/manager.py
View File

@ -689,26 +689,7 @@ class ConductorManager(base_manager.BaseConductorManager):
# index of the first step in the list. # index of the first step in the list.
return 0 return 0
ind = None ind = node.driver_internal_info.get('clean_step_index')
if 'clean_step_index' in node.driver_internal_info:
ind = node.driver_internal_info['clean_step_index']
else:
# TODO(rloo). driver_internal_info['clean_step_index'] was
# added in Mitaka. We need to maintain backwards compatibility
# so this uses the original code to get the index of the current
# step. This will be deleted in the Newton cycle.
try:
next_steps = node.driver_internal_info['clean_steps']
ind = next_steps.index(node.clean_step)
except (KeyError, ValueError):
msg = (_('Node %(node)s got an invalid last step for '
'%(state)s: %(step)s.') %
{'node': node.uuid, 'step': node.clean_step,
'state': node.provision_state})
LOG.exception(msg)
utils.cleaning_error_handler(task, msg)
raise exception.NodeCleaningFailure(node=node.uuid,
reason=msg)
if ind is None: if ind is None:
return None return None

48
ironic/tests/unit/conductor/test_manager.py
View File

@ -1557,7 +1557,8 @@ class DoNodeCleanTestCase(mgr_utils.ServiceSetUpMixin,
# test a node can continue cleaning via RPC # test a node can continue cleaning via RPC
prv_state = return_state prv_state = return_state
tgt_prv_state = states.MANAGEABLE if manual else states.AVAILABLE tgt_prv_state = states.MANAGEABLE if manual else states.AVAILABLE
driver_info = {'clean_steps': self.clean_steps} driver_info = {'clean_steps': self.clean_steps,
'clean_step_index': 0}
node = obj_utils.create_test_node(self.context, driver='fake', node = obj_utils.create_test_node(self.context, driver='fake',
provision_state=prv_state, provision_state=prv_state,
target_provision_state=tgt_prv_state, target_provision_state=tgt_prv_state,
@ -1582,7 +1583,8 @@ class DoNodeCleanTestCase(mgr_utils.ServiceSetUpMixin,
@mock.patch('ironic.conductor.manager.ConductorManager._spawn_worker') @mock.patch('ironic.conductor.manager.ConductorManager._spawn_worker')
def _continue_node_clean_skip_step(self, mock_spawn, skip=True): def _continue_node_clean_skip_step(self, mock_spawn, skip=True):
# test that skipping current step mechanism works # test that skipping current step mechanism works
driver_info = {'clean_steps': self.clean_steps} driver_info = {'clean_steps': self.clean_steps,
'clean_step_index': 0}
if not skip: if not skip:
driver_info['skip_current_clean_step'] = skip driver_info['skip_current_clean_step'] = skip
node = obj_utils.create_test_node( node = obj_utils.create_test_node(
@ -1612,7 +1614,8 @@ class DoNodeCleanTestCase(mgr_utils.ServiceSetUpMixin,
last_clean_step = self.clean_steps[0] last_clean_step = self.clean_steps[0]
last_clean_step['abortable'] = False last_clean_step['abortable'] = False
last_clean_step['abort_after'] = True last_clean_step['abort_after'] = True
driver_info = {'clean_steps': self.clean_steps} driver_info = {'clean_steps': self.clean_steps,
'clean_step_index': 0}
tgt_prov_state = states.MANAGEABLE if manual else states.AVAILABLE tgt_prov_state = states.MANAGEABLE if manual else states.AVAILABLE
node = obj_utils.create_test_node( node = obj_utils.create_test_node(
self.context, driver='fake', provision_state=states.CLEANWAIT, self.context, driver='fake', provision_state=states.CLEANWAIT,
@ -2213,45 +2216,6 @@ class DoNodeCleanTestCase(mgr_utils.ServiceSetUpMixin,
step_index = self.service._get_node_next_clean_steps(task) step_index = self.service._get_node_next_clean_steps(task)
self.assertEqual(0, step_index) self.assertEqual(0, step_index)
def __get_node_next_clean_steps_backwards_compat(self, skip=True):
driver_internal_info = {'clean_steps': self.clean_steps}
node = obj_utils.create_test_node(
self.context, driver='fake',
provision_state=states.CLEANWAIT,
target_provision_state=states.AVAILABLE,
driver_internal_info=driver_internal_info,
last_error=None,
clean_step=self.clean_steps[0])
with task_manager.acquire(self.context, node.uuid) as task:
step_index = self.service._get_node_next_clean_steps(
task, skip_current_step=skip)
expected_index = 1 if skip else 0
self.assertEqual(expected_index, step_index)
def test__get_node_next_clean_steps_backwards_compat(self):
self.__get_node_next_clean_steps_backwards_compat()
def test__get_node_next_clean_steps_no_skip_backwards_compat(self):
self.__get_node_next_clean_steps_backwards_compat(skip=False)
def test__get_node_next_clean_steps_bad_clean_step(self):
# NOTE(rloo) for backwards compatibility
driver_internal_info = {'clean_steps': self.clean_steps}
node = obj_utils.create_test_node(
self.context, driver='fake',
provision_state=states.CLEANWAIT,
target_provision_state=states.AVAILABLE,
driver_internal_info=driver_internal_info,
last_error=None,
clean_step={'interface': 'deploy',
'step': 'not_a_clean_step',
'priority': 100})
with task_manager.acquire(self.context, node.uuid) as task:
self.assertRaises(exception.NodeCleaningFailure,
self.service._get_node_next_clean_steps, task)
@mgr_utils.mock_record_keepalive @mgr_utils.mock_record_keepalive
class DoNodeVerifyTestCase(mgr_utils.ServiceSetUpMixin, class DoNodeVerifyTestCase(mgr_utils.ServiceSetUpMixin,