diff --git a/ironic/drivers/modules/drac/raid.py b/ironic/drivers/modules/drac/raid.py index cd831af6cb..5d2d023414 100644 --- a/ironic/drivers/modules/drac/raid.py +++ b/ironic/drivers/modules/drac/raid.py @@ -1171,7 +1171,7 @@ class DracWSManRAID(base.RAIDInterface): def apply_configuration(self, task, raid_config, create_root_volume=True, create_nonroot_volumes=False, delete_existing=True): - return super(DracRAID, self).apply_configuration( + return super(DracWSManRAID, self).apply_configuration( task, raid_config, create_root_volume=create_root_volume, create_nonroot_volumes=create_nonroot_volumes, delete_existing=delete_existing) diff --git a/ironic/tests/unit/drivers/modules/drac/test_raid.py b/ironic/tests/unit/drivers/modules/drac/test_raid.py index d741b491f0..48f38a09b5 100644 --- a/ironic/tests/unit/drivers/modules/drac/test_raid.py +++ b/ironic/tests/unit/drivers/modules/drac/test_raid.py @@ -24,6 +24,7 @@ from dracclient import exceptions as drac_exceptions from ironic.common import exception from ironic.common import states from ironic.conductor import task_manager +from ironic.drivers import base from ironic.drivers.modules.drac import common as drac_common from ironic.drivers.modules.drac import job as drac_job from ironic.drivers.modules.drac import raid as drac_raid @@ -2224,3 +2225,17 @@ class DracRaidInterfaceTestCase(test_utils.BaseDracTest): mock_commit_config.assert_called_once_with( self.node, raid_controller='RAID.Integrated.1-1', reboot=False, realtime=True) + + @mock.patch.object(base.RAIDInterface, 'apply_configuration', + autospec=True) + def test_apply_configuration(self, mock_apply_configuration): + with task_manager.acquire(self.context, self.node.uuid, + shared=False) as task: + task.driver.raid.apply_configuration( + task, self.target_raid_configuration, + create_root_volume=False, create_nonroot_volumes=True, + delete_existing=False) + + mock_apply_configuration.assert_called_once_with( + task.driver.raid, task, + self.target_raid_configuration, False, True, False) diff --git a/releasenotes/notes/bug-2007963-idrac-wsman-raid-apply-configuration-792ccf195057016b.yaml b/releasenotes/notes/bug-2007963-idrac-wsman-raid-apply-configuration-792ccf195057016b.yaml new file mode 100644 index 0000000000..166bfbbdad --- /dev/null +++ b/releasenotes/notes/bug-2007963-idrac-wsman-raid-apply-configuration-792ccf195057016b.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes RAID ``apply_configuration`` deploy step for ``idrac-wsman`` where + deployment failed with ``TypeError``. + See `story 2007963 `_. \ No newline at end of file