diff options
| author | Aija Jauntēva <aija.jaunteva@dell.com> | 2020-07-29 12:00:54 -0400 |
|---|---|---|
| committer | Aija Jauntēva <aija.jaunteva@dell.com> | 2020-07-30 04:22:51 -0400 |
| commit | 328cb9291a8c19d18321fde1e2323f4682363789 (patch) | |
| tree | d7f3ae15f29dfa75219a9a7382e8d03a84cc1a41 /ironic | |
| parent | ebae6a40f1131f2b4602e7deddd2a8bd6382ae22 (diff) | |
| download | ironic-328cb9291a8c19d18321fde1e2323f4682363789.tar.gz | |
Fix idrac-wsman RAID apply_configuration
Deploy step `apply_configuration` was failing with
TypeError: super(type, obj): obj must be an instance
or subtype of type.
Change-Id: I4de034c38585275543ab603a3ed45de1adf1d15b
Story: 2007963
Task: 40456
Diffstat (limited to 'ironic')
| -rw-r--r-- | ironic/drivers/modules/drac/raid.py | 2 | ||||
| -rw-r--r-- | ironic/tests/unit/drivers/modules/drac/test_raid.py | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/ironic/drivers/modules/drac/raid.py b/ironic/drivers/modules/drac/raid.py index cd831af6c..5d2d02341 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 d741b491f..48f38a09b 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) |