From e443ddcb92f37ea116ea077cc714e6509409ee51 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Sat, 22 Feb 2025 12:55:41 -0600 Subject: [PATCH] Update DRAC RAID module import logic - Refactored the import logic for `sushy_oem_idrac` to use a direct import from `sushy.oem.dell` if available, falling back to `importutils.try_import` only if the module is not found. This improves clarity and ensures that the correct version of the library is preferred. - Adjusted corresponding tests in `test_raid.py` to reflect the changes in the import logic. Depends-On: https://review.opendev.org/c/openstack/sushy/+/940557 Change-Id: I0dbb0ad341059969b86a508a5ccd1e3654cf613b Signed-off-by: Doug Goldstein --- ironic/drivers/modules/drac/raid.py | 5 ++++- ironic/tests/unit/drivers/modules/drac/test_raid.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) 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