openstack/ironic
Code Issues Proposed changes

Merge "Take over console session if enabled"

Browse Source
This commit is contained in:
Jenkins 2015-11-25 14:58:45 +00:00 committed by Gerrit Code Review
commit 9e98c9c46a
2 changed files with 75 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ironic/conductor/manager.py
View File

@ -1366,6 +1366,20 @@ class ConductorManager(periodic_task.PeriodicTasks):
{'cdr': self.host, 'node': task.node.uuid}) {'cdr': self.host, 'node': task.node.uuid})
task.driver.deploy.prepare(task) task.driver.deploy.prepare(task)
task.driver.deploy.take_over(task) task.driver.deploy.take_over(task)
# NOTE(zhenguo): If console enabled, take over the console session
# as well.
if task.node.console_enabled:
try:
task.driver.console.start_console(task)
except Exception as err:
msg = (_('Failed to start console while taking over the '
'node %(node)s: %(err)s.') % {'node': task.node.uuid,
'err': err})
LOG.error(msg)
# If taking over console failed, set node's console_enabled
# back to False and set node's last error.
task.node.last_error = msg
task.node.console_enabled = False
# NOTE(lucasagomes): Set the ID of the new conductor managing # NOTE(lucasagomes): Set the ID of the new conductor managing
# this node # this node
task.node.conductor_affinity = self.conductor.id task.node.conductor_affinity = self.conductor.id

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

@ -4509,3 +4509,64 @@ class TestIndirectionApiConductor(tests_db_base.DbTestCase):
self.assertEqual(result, fake_backported_obj) self.assertEqual(result, fake_backported_obj)
test_obj.obj_to_primitive.assert_called_once_with( test_obj.obj_to_primitive.assert_called_once_with(
target_version='1.0', version_manifest=fake_version_manifest) target_version='1.0', version_manifest=fake_version_manifest)
@_mock_record_keepalive
class DoNodeTakeOverTestCase(_ServiceSetUpMixin,
tests_db_base.DbTestCase):
@mock.patch('ironic.drivers.modules.fake.FakeConsole.start_console')
@mock.patch('ironic.drivers.modules.fake.FakeDeploy.take_over')
@mock.patch('ironic.drivers.modules.fake.FakeDeploy.prepare')
def test__do_takeover(self, mock_prepare, mock_take_over,
mock_start_console):
self._start_service()
node = obj_utils.create_test_node(self.context, driver='fake')
task = task_manager.TaskManager(self.context, node.uuid)
self.service._do_takeover(task)
node.refresh()
self.assertIsNone(node.last_error)
self.assertFalse(node.console_enabled)
mock_prepare.assert_called_once_with(mock.ANY)
mock_take_over.assert_called_once_with(mock.ANY)
self.assertFalse(mock_start_console.called)
@mock.patch('ironic.drivers.modules.fake.FakeConsole.start_console')
@mock.patch('ironic.drivers.modules.fake.FakeDeploy.take_over')
@mock.patch('ironic.drivers.modules.fake.FakeDeploy.prepare')
def test__do_takeover_with_console_enabled(self, mock_prepare,
mock_take_over,
mock_start_console):
self._start_service()
node = obj_utils.create_test_node(self.context, driver='fake',
console_enabled=True)
task = task_manager.TaskManager(self.context, node.uuid)
self.service._do_takeover(task)
node.refresh()
self.assertIsNone(node.last_error)
self.assertTrue(node.console_enabled)
mock_prepare.assert_called_once_with(mock.ANY)
mock_take_over.assert_called_once_with(mock.ANY)
mock_start_console.assert_called_once_with(mock.ANY)
@mock.patch('ironic.drivers.modules.fake.FakeConsole.start_console')
@mock.patch('ironic.drivers.modules.fake.FakeDeploy.take_over')
@mock.patch('ironic.drivers.modules.fake.FakeDeploy.prepare')
def test__do_takeover_with_console_exception(self, mock_prepare,
mock_take_over,
mock_start_console):
self._start_service()
mock_start_console.side_effect = Exception()
node = obj_utils.create_test_node(self.context, driver='fake',
console_enabled=True)
task = task_manager.TaskManager(self.context, node.uuid)
self.service._do_takeover(task)
node.refresh()
self.assertIsNotNone(node.last_error)
self.assertFalse(node.console_enabled)
mock_prepare.assert_called_once_with(mock.ANY)
mock_take_over.assert_called_once_with(mock.ANY)
mock_start_console.assert_called_once_with(mock.ANY)