openstack
/
ironic
Code Issues Proposed changes

Merge "opt: Enhance old stable branches to use latest python-ibmcclient" into stable/train

This commit is contained in:
Zuul 2020-10-30 22:24:18 +00:00 committed by Gerrit Code Review
parent 416588f97d 9c017c146f
commit aa68e1b504
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
driver-requirements.txt
View File

@ -17,5 +17,5 @@ sushy>=1.9.0
ansible>=2.5 ansible>=2.5
# HUAWEI iBMC hardware type uses the python-ibmcclient library # HUAWEI iBMC hardware type uses the python-ibmcclient library
python-ibmcclient>=0.1.0,<0.2.0 python-ibmcclient>=0.1.0,!=0.2.1,<0.3.0

9
ironic/drivers/modules/ibmc/utils.py
View File

@ -31,6 +31,13 @@ from ironic.conf import CONF
ibmc_client = importutils.try_import('ibmcclient') ibmc_client = importutils.try_import('ibmcclient')
ibmc_error = importutils.try_import('ibmc_client.exceptions') ibmc_error = importutils.try_import('ibmc_client.exceptions')
try:
# NOTE(Qianbiao.NG) from python-ibmcclient>=0.2.2, ConnectionError is
# renamed to IBMCConnectionError
ibmc_error.IBMCConnectionError
except AttributeError:
ibmc_error.IBMCConnectionError = ibmc_error.ConnectionError
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
REQUIRED_PROPERTIES = { REQUIRED_PROPERTIES = {
@ -153,7 +160,7 @@ def handle_ibmc_exception(action):
try: try:
return f(*args, **kwargs) return f(*args, **kwargs)
except ibmc_error.ConnectionError as e: except ibmc_error.IBMCConnectionError as e:
error = (_('Failed to connect to iBMC for node %(node)s, ' error = (_('Failed to connect to iBMC for node %(node)s, '
'Error: %(error)s') 'Error: %(error)s')
% {'node': node.uuid, 'error': e}) % {'node': node.uuid, 'error': e})

4
ironic/tests/unit/drivers/modules/ibmc/test_utils.py
View File

@ -144,8 +144,8 @@ class IBMCUtilsTestCase(base.IBMCTestCase):
conn = self.mock_ibmc_conn(connect_ibmc) conn = self.mock_ibmc_conn(connect_ibmc)
# Mocks # Mocks
conn.system.get.side_effect = [ conn.system.get.side_effect = [
ibmc_error.ConnectionError(url=self.ibmc['address'], ibmc_error.IBMCConnectionError(url=self.ibmc['address'],
error='Failed to connect to host'), error='Failed to connect to host'),
mock.PropertyMock( mock.PropertyMock(
boot_source_override=mock.PropertyMock( boot_source_override=mock.PropertyMock(
target=constants.BOOT_SOURCE_TARGET_PXE, target=constants.BOOT_SOURCE_TARGET_PXE,

4
ironic/tests/unit/drivers/third_party_driver_mocks.py
View File

@ -262,8 +262,8 @@ if not ibmc_client:
# Mock iBMC client exceptions # Mock iBMC client exceptions
exceptions = mock.MagicMock() exceptions = mock.MagicMock()
exceptions.ConnectionError = ( exceptions.IBMCConnectionError = (
type('ConnectionError', (MockKwargsException,), {})) type('IBMCConnectionError', (MockKwargsException,), {}))
exceptions.IBMCClientError = ( exceptions.IBMCClientError = (
type('IBMCClientError', (MockKwargsException,), {})) type('IBMCClientError', (MockKwargsException,), {}))
sys.modules['ibmc_client.exceptions'] = exceptions sys.modules['ibmc_client.exceptions'] = exceptions