openstack/ironic
Code Issues Proposed changes

Update DRAC RAID module import logic

Browse Source 
- 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 <cardoe@cardoe.com>
This commit is contained in:
Doug Goldstein 2025-02-22 12:55:41 -06:00
parent d3c74c6a4b
commit e443ddcb92
No known key found for this signature in database
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