diff options
| author | Zuul <zuul@review.opendev.org> | 2020-08-07 18:27:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-08-07 18:27:27 +0000 |
| commit | c967c14b1b610c6ba293a65d5f0131cd780138a8 (patch) | |
| tree | 7bb5e4c683b5176325eef67cc08a3ac901a4d140 | |
| parent | 49ac991d1d360faaedbc6303a487361b178279ab (diff) | |
| parent | 2c443946b450826aef34ab1a2fbb3e228f5712ab (diff) | |
| download | ironic-c967c14b1b610c6ba293a65d5f0131cd780138a8.tar.gz | |
Merge "Fix idrac-wsman RAID apply_configuration" into stable/ussuri
3 files changed, 22 insertions, 1 deletions
diff --git a/ironic/drivers/modules/drac/raid.py b/ironic/drivers/modules/drac/raid.py index c7cc08610..6b12e507a 100644 --- a/ironic/drivers/modules/drac/raid.py +++ b/ironic/drivers/modules/drac/raid.py @@ -1017,7 +1017,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 1cb50f129..1d2e3c0fb 100644 --- a/ironic/tests/unit/drivers/modules/drac/test_raid.py +++ b/ironic/tests/unit/drivers/modules/drac/test_raid.py @@ -22,6 +22,7 @@ import mock 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 @@ -2055,3 +2056,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 000000000..166bfbbda --- /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 <https://storyboard.openstack.org/#!/story/2007963>`_.
\ No newline at end of file |