openstack/ironic
Code Issues Proposed changes

Merge "DRAC : Fix issue for RAID-0 creation for multiple disks for PERC H740P"

Browse Source
This commit is contained in:
Zuul 2019-08-10 00:33:05 +00:00 committed by Gerrit Code Review
commit 227290004d
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ironic/drivers/modules/drac/raid.py
View File

@ -885,7 +885,8 @@ class DracRAID(base.RAIDInterface):
controller['raid_controller'] = logical_disk['controller']
controller['is_reboot_required'] = controller_cap[
'is_reboot_required']
controllers.append(controller)
if controller not in controllers:
controllers.append(controller)
return _commit_to_controllers(node, controllers)

10
ironic/tests/unit/drivers/modules/drac/test_raid.py
View File

@ -968,7 +968,7 @@ class DracRaidInterfaceTestCase(test_utils.BaseDracTest):
reboot=False, realtime=True)
self.node.refresh()
self.assertEqual(['42', '12', '13'],
self.assertEqual(['42'],
self.node.driver_internal_info['raid_config_job_ids'])
@mock.patch.object(drac_common, 'get_drac_client', spec_set=True,
@ -1027,7 +1027,7 @@ class DracRaidInterfaceTestCase(test_utils.BaseDracTest):
reboot=False, realtime=True)
self.node.refresh()
self.assertEqual(['42', '12'],
self.assertEqual(['42'],
self.node.driver_internal_info['raid_config_job_ids'])
@mock.patch.object(drac_common, 'get_drac_client', spec_set=True,
@ -1097,7 +1097,7 @@ class DracRaidInterfaceTestCase(test_utils.BaseDracTest):
realtime=True)
self.node.refresh()
self.assertEqual(['42', '12', '13'],
self.assertEqual(['42'],
self.node.driver_internal_info['raid_config_job_ids'])
@mock.patch.object(drac_common, 'get_drac_client', spec_set=True,
@ -1184,7 +1184,7 @@ class DracRaidInterfaceTestCase(test_utils.BaseDracTest):
realtime=True)
self.node.refresh()
self.assertEqual(['42', '12'],
self.assertEqual(['42'],
self.node.driver_internal_info['raid_config_job_ids'])
@mock.patch.object(drac_common, 'get_drac_client', spec_set=True,
@ -1285,7 +1285,7 @@ class DracRaidInterfaceTestCase(test_utils.BaseDracTest):
realtime=True)
self.node.refresh()
self.assertEqual(['42', '42'],
self.assertEqual(['42'],
self.node.driver_internal_info['raid_config_job_ids'])
@mock.patch.object(drac_common, 'get_drac_client', spec_set=True,

7
releasenotes/notes/fix_raid0_creation_for_multiple_disks-f47957754fca0312.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
Fixed a bug when executing ``create_configuration`` cleaning step for disks
of PERC H740P controller, first disks get created and then controller
doesn't allow to create next couple disks because controller is getting
busy.