openstack/ironic
Code Issues Proposed changes

Merge "Refactor RAID configuration via iRMC driver"

Browse Source
This commit is contained in:
Zuul 2018-07-27 10:01:12 +00:00 committed by Gerrit Code Review
commit 01948beb7a
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ironic/drivers/modules/irmc/common.py
View File

@ -21,8 +21,6 @@ import six
from ironic.common import exception from ironic.common import exception
from ironic.common.i18n import _ from ironic.common.i18n import _
from ironic.common import raid as raid_common
from ironic.conductor import utils as manager_utils
from ironic.conf import CONF from ironic.conf import CONF
scci = importutils.try_import('scciclient.irmc.scci') scci = importutils.try_import('scciclient.irmc.scci')
@ -221,9 +219,3 @@ def set_secure_boot_mode(node, enable):
raise exception.IRMCOperationError( raise exception.IRMCOperationError(
operation=_("setting secure boot mode"), operation=_("setting secure boot mode"),
error=irmc_exception) error=irmc_exception)
def resume_cleaning(task):
raid_common.update_raid_info(
task.node, task.node.raid_config)
manager_utils.notify_conductor_resume_clean(task)

8
ironic/drivers/modules/irmc/raid.py
View File

@ -25,6 +25,7 @@ from ironic.common import exception
from ironic.common import raid as raid_common from ironic.common import raid as raid_common
from ironic.common import states from ironic.common import states
from ironic.conductor import task_manager from ironic.conductor import task_manager
from ironic.conductor import utils as manager_utils
from ironic import conf from ironic import conf
from ironic.drivers import base from ironic.drivers import base
from ironic.drivers.modules.irmc import common as irmc_common from ironic.drivers.modules.irmc import common as irmc_common
@ -478,11 +479,10 @@ class IRMCRAID(base.RAIDInterface):
if all(fgi_status == 'Idle' for fgi_status in if all(fgi_status == 'Idle' for fgi_status in
fgi_status_dict.values()): fgi_status_dict.values()):
raid_config.update({'fgi_status': RAID_COMPLETED}) raid_config.update({'fgi_status': RAID_COMPLETED})
raid_common.update_raid_info(node, raid_config)
LOG.info('RAID configuration has completed on ' LOG.info('RAID configuration has completed on '
'node %(node)s with fgi_status is %(fgi)s', 'node %(node)s with fgi_status is %(fgi)s',
{'node': node_uuid, 'fgi': RAID_COMPLETED}) {'node': node_uuid, 'fgi': RAID_COMPLETED})
irmc_common.resume_cleaning(task) self._resume_cleaning(task)
except exception.NodeNotFound: except exception.NodeNotFound:
LOG.info('During query_raid_config_job_status, node ' LOG.info('During query_raid_config_job_status, node '
@ -500,3 +500,7 @@ class IRMCRAID(base.RAIDInterface):
fgi_message = 'ServerViewRAID not available in Baremetal Server' fgi_message = 'ServerViewRAID not available in Baremetal Server'
task.node.last_error = fgi_message task.node.last_error = fgi_message
task.process_event('fail') task.process_event('fail')
def _resume_cleaning(self, task):
raid_common.update_raid_info(task.node, task.node.raid_config)
manager_utils.notify_conductor_resume_clean(task)

6
ironic/tests/unit/drivers/modules/irmc/test_periodic_task.py
View File

@ -202,7 +202,7 @@ class iRMCPeriodicTaskTestCase(test_common.BaseIRMCTest):
fgi_mock.assert_called_once_with(report_mock.return_value, fgi_mock.assert_called_once_with(report_mock.return_value,
self.node.uuid) self.node.uuid)
@mock.patch.object(irmc_common, 'resume_cleaning') @mock.patch('ironic.drivers.modules.irmc.raid.IRMCRAID._resume_cleaning')
@mock.patch('ironic.drivers.modules.irmc.raid.IRMCRAID._set_clean_failed') @mock.patch('ironic.drivers.modules.irmc.raid.IRMCRAID._set_clean_failed')
@mock.patch('ironic.drivers.modules.irmc.raid._get_fgi_status') @mock.patch('ironic.drivers.modules.irmc.raid._get_fgi_status')
@mock.patch.object(irmc_common, 'get_irmc_report') @mock.patch.object(irmc_common, 'get_irmc_report')
@ -230,7 +230,7 @@ class iRMCPeriodicTaskTestCase(test_common.BaseIRMCTest):
self.node.uuid) self.node.uuid)
clean_mock.assert_called_once_with(task) clean_mock.assert_called_once_with(task)
@mock.patch.object(irmc_common, 'resume_cleaning') @mock.patch('ironic.drivers.modules.irmc.raid.IRMCRAID._resume_cleaning')
@mock.patch('ironic.drivers.modules.irmc.raid.IRMCRAID._set_clean_failed') @mock.patch('ironic.drivers.modules.irmc.raid.IRMCRAID._set_clean_failed')
@mock.patch('ironic.drivers.modules.irmc.raid._get_fgi_status') @mock.patch('ironic.drivers.modules.irmc.raid._get_fgi_status')
@mock.patch.object(irmc_common, 'get_irmc_report') @mock.patch.object(irmc_common, 'get_irmc_report')
@ -260,7 +260,7 @@ class iRMCPeriodicTaskTestCase(test_common.BaseIRMCTest):
self.node.uuid) self.node.uuid)
clean_mock.assert_called_once_with(task) clean_mock.assert_called_once_with(task)
@mock.patch.object(irmc_common, 'resume_cleaning') @mock.patch('ironic.drivers.modules.irmc.raid.IRMCRAID._resume_cleaning')
@mock.patch('ironic.drivers.modules.irmc.raid.IRMCRAID._set_clean_failed') @mock.patch('ironic.drivers.modules.irmc.raid.IRMCRAID._set_clean_failed')
@mock.patch('ironic.drivers.modules.irmc.raid._get_fgi_status') @mock.patch('ironic.drivers.modules.irmc.raid._get_fgi_status')
@mock.patch.object(irmc_common, 'get_irmc_report') @mock.patch.object(irmc_common, 'get_irmc_report')