openstack/ironic
Code Issues Proposed changes

Merge "Fix heartbeat when clean step in progress"

Browse Source
This commit is contained in:
Jenkins 2015-04-16 10:32:46 +00:00 committed by Gerrit Code Review
commit 335c27dad5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ironic/drivers/modules/agent_base_vendor.py
View File

@ -318,7 +318,8 @@ class BaseAgentVendor(base.VendorInterface):
# processing so the command hasn't started yet
return
last_step = last_command['command_result'].get('clean_step')
last_result = last_command.get('command_result') or {}
last_step = last_result.get('clean_step')
if last_command['command_status'] == 'RUNNING':
return
elif (last_command['command_status'] == 'SUCCEEDED' and

2
ironic/tests/drivers/test_agent_base_vendor.py
View File

@ -513,7 +513,7 @@ class TestBaseAgentVendor(db_base.DbTestCase):
status_mock.return_value = [{
'command_status': 'RUNNING',
'command_name': 'execute_clean_step',
'command_result': {}
'command_result': None
}]
with task_manager.acquire(self.context, self.node['uuid'],
shared=False) as task: