diff --git a/ironic/drivers/modules/drac/raid.py b/ironic/drivers/modules/drac/raid.py index 06ea7a1fa5..e7d2e0ca28 100644 --- a/ironic/drivers/modules/drac/raid.py +++ b/ironic/drivers/modules/drac/raid.py @@ -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__) diff --git a/ironic/tests/unit/drivers/modules/drac/test_raid.py b/ironic/tests/unit/drivers/modules/drac/test_raid.py index 5685706671..35467306f3 100644 --- a/ironic/tests/unit/drivers/modules/drac/test_raid.py +++ b/ironic/tests/unit/drivers/modules/drac/test_raid.py @@ -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