openstack/ironic
Code Issues Proposed changes

Merge "Update DRAC RAID module import logic"

Browse Source
This commit is contained in:
Zuul 2025-04-11 16:41:35 +00:00 committed by Gerrit Code Review
commit c79f2d00c2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,10 @@ from ironic.drivers.modules.drac import utils as drac_utils
from ironic.drivers.modules.redfish import raid as redfish_raid
from ironic.drivers.modules.redfish import utils as redfish_utils
sushy_oem_idrac = importutils.try_import('sushy_oem_idrac')
try:
from sushy.oem import dell as sushy_oem_idrac
except ModuleNotFoundError:
sushy_oem_idrac = importutils.try_import('sushy_oem_idrac')
LOG = logging.getLogger(__name__)

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

@ -34,7 +34,10 @@ from ironic.drivers.modules.redfish import utils as redfish_utils
from ironic.tests.unit.drivers.modules.drac import utils as test_utils
from ironic.tests.unit.objects import utils as obj_utils
sushy_oem_idrac = importutils.try_import('sushy_oem_idrac')
try:
from sushy.oem import dell as sushy_oem_idrac
except ModuleNotFoundError:
sushy_oem_idrac = importutils.try_import('sushy_oem_idrac')
INFO_DICT = test_utils.INFO_DICT