openstack/cinder
Code Issues Proposed changes

Hitachi: Support AIX as host OS type

Browse Source 
This patch support AIX as host OS type for the Hitachi VSP driver.
When running "cinder attachment-create" command with the option "--ostype aix",
"AIX" is set as host OS type.

Implements: blueprint hitachi-vsp-aix-os-type
Change-Id: Ia3378099789f13d60ba3657d1d3a626e7bc9dced
This commit is contained in:
Atsushi Kawai 2022-02-25 07:31:22 +00:00
parent 11d26b9f59
commit 5c48b6fc32
6 changed files with 111 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
cinder/tests/unit/volume/drivers/hitachi/test_hitachi_hbsd_rest_fc.py
View File

@ -73,6 +73,14 @@ DEFAULT_CONNECTOR = {
'multipath': False,
}
DEFAULT_CONNECTOR_AIX = {
'os_type': 'aix',
'host': 'host',
'ip': CONFIG_MAP['my_ip'],
'wwpns': [CONFIG_MAP['host_wwn']],
'multipath': False,
}
CTXT = cinder_context.get_admin_context()
TEST_VOLUME = []
@ -318,6 +326,12 @@ def _brick_get_connector_properties(multipath=False, enforce_multipath=False):
return DEFAULT_CONNECTOR
def _brick_get_connector_properties_aix(
multipath=False, enforce_multipath=False):
"""Return a predefined connector object."""
return DEFAULT_CONNECTOR_AIX
def reduce_retrying_time(func):
@functools.wraps(func)
def wrapper(*args, **kwargs):
@ -579,6 +593,36 @@ class HBSDRESTFCDriverTest(test.TestCase):
self.driver.common.client.keep_session_loop.stop()
self.driver.common.client.keep_session_loop.wait()
@mock.patch.object(requests.Session, "request")
@mock.patch.object(
volume_utils, 'brick_get_connector_properties',
side_effect=_brick_get_connector_properties_aix)
def test_do_setup_create_hg_aix(
self, brick_get_connector_properties, request):
"""Normal case: The host group not exists in AIX."""
drv = hbsd_fc.HBSDFCDriver(
configuration=self.configuration)
self._setup_config()
request.side_effect = [FakeResponse(200, POST_SESSIONS_RESULT),
FakeResponse(200, GET_PORTS_RESULT),
FakeResponse(200, NOTFOUND_RESULT),
FakeResponse(200, NOTFOUND_RESULT),
FakeResponse(200, NOTFOUND_RESULT),
FakeResponse(202, COMPLETED_SUCCEEDED_RESULT),
FakeResponse(202, COMPLETED_SUCCEEDED_RESULT),
FakeResponse(202, COMPLETED_SUCCEEDED_RESULT)]
drv.do_setup(None)
self.assertEqual(
{CONFIG_MAP['port_id']: CONFIG_MAP['target_wwn']},
drv.common.storage_info['wwns'])
self.assertEqual(1, brick_get_connector_properties.call_count)
self.assertEqual(8, request.call_count)
kargs1 = request.call_args_list[6][1]
self.assertEqual('AIX', kargs1['json']['hostMode'])
# stop the Loopingcall within the do_setup treatment
self.driver.common.client.keep_session_loop.stop()
self.driver.common.client.keep_session_loop.wait()
@mock.patch.object(requests.Session, "request")
@mock.patch.object(
volume_utils, 'brick_get_connector_properties',

47
cinder/tests/unit/volume/drivers/hitachi/test_hitachi_hbsd_rest_iscsi.py
View File

@ -64,6 +64,14 @@ DEFAULT_CONNECTOR = {
'multipath': False,
}
DEFAULT_CONNECTOR_AIX = {
'os_type': 'aix',
'host': 'host',
'ip': CONFIG_MAP['my_ip'],
'initiator': CONFIG_MAP['host_iscsi_name'],
'multipath': False,
}
CTXT = cinder_context.get_admin_context()
TEST_VOLUME = []
@ -264,6 +272,12 @@ def _brick_get_connector_properties(multipath=False, enforce_multipath=False):
return DEFAULT_CONNECTOR
def _brick_get_connector_properties_aix(
multipath=False, enforce_multipath=False):
"""Return a predefined connector object."""
return DEFAULT_CONNECTOR_AIX
class FakeResponse():
def __init__(self, status_code, data=None, headers=None):
@ -486,6 +500,39 @@ class HBSDRESTISCSIDriverTest(test.TestCase):
self.driver.common.client.keep_session_loop.stop()
self.driver.common.client.keep_session_loop.wait()
@mock.patch.object(requests.Session, "request")
@mock.patch.object(
volume_utils, 'brick_get_connector_properties',
side_effect=_brick_get_connector_properties_aix)
def test_do_setup_create_hg_aix(
self, brick_get_connector_properties, request):
"""Normal case: The host group not exists in AIX."""
drv = hbsd_iscsi.HBSDISCSIDriver(
configuration=self.configuration)
self._setup_config()
request.side_effect = [FakeResponse(200, POST_SESSIONS_RESULT),
FakeResponse(200, GET_PORTS_RESULT),
FakeResponse(200, GET_PORT_RESULT),
FakeResponse(200, NOTFOUND_RESULT),
FakeResponse(200, NOTFOUND_RESULT),
FakeResponse(202, COMPLETED_SUCCEEDED_RESULT),
FakeResponse(202, COMPLETED_SUCCEEDED_RESULT),
FakeResponse(202, COMPLETED_SUCCEEDED_RESULT)]
drv.do_setup(None)
self.assertEqual(
{CONFIG_MAP['port_id']:
'%(ip)s:%(port)s' % {
'ip': CONFIG_MAP['ipv4Address'],
'port': CONFIG_MAP['tcpPort']}},
drv.common.storage_info['portals'])
self.assertEqual(1, brick_get_connector_properties.call_count)
self.assertEqual(8, request.call_count)
kargs1 = request.call_args_list[6][1]
self.assertEqual('AIX', kargs1['json']['hostMode'])
# stop the Loopingcall within the do_setup treatment
self.driver.common.client.keep_session_loop.stop()
self.driver.common.client.keep_session_loop.wait()
@mock.patch.object(requests.Session, "request")
def test_extend_volume(self, request):
request.side_effect = [FakeResponse(200, GET_LDEV_RESULT),

4
cinder/volume/drivers/hitachi/hbsd_common.py
View File

@ -547,7 +547,7 @@ class HBSDCommon():
"""Create a host group or an iSCSI target on the specified port."""
raise NotImplementedError()
def set_target_mode(self, port, gid):
def set_target_mode(self, port, gid, connector):
"""Configure the target to meet the environment."""
raise NotImplementedError()
@ -568,7 +568,7 @@ class HBSDCommon():
'%(target)s' %
{'port': port, 'gid': gid, 'target': target_name})
try:
self.set_target_mode(port, gid)
self.set_target_mode(port, gid, connector)
self.set_hba_ids(port, gid, hba_ids)
except Exception:
with excutils.save_and_reraise_exception():

5
cinder/volume/drivers/hitachi/hbsd_rest_fc.py
View File

@ -144,8 +144,11 @@ class HBSDRESTFC(rest.HBSDREST):
gid=gid)
self.raise_error(msg)
def set_target_mode(self, port, gid):
def set_target_mode(self, port, gid, connector):
"""Configure the host group to meet the environment."""
if connector.get('os_type', None) == 'aix':
body = {'hostMode': 'AIX'}
else:
body = {'hostMode': 'LINUX/IRIX'}
if self.conf.hitachi_rest_disable_io_wait:
body['hostModeOptions'] = [_FC_HMO_DISABLE_IO]

8
cinder/volume/drivers/hitachi/hbsd_rest_iscsi.py
View File

@ -116,9 +116,13 @@ class HBSDRESTISCSI(rest.HBSDREST):
"""Connect the specified HBA with the specified port."""
self.client.add_hba_iscsi(port, gid, hba_ids)
def set_target_mode(self, port, gid):
def set_target_mode(self, port, gid, connector):
"""Configure the iSCSI target to meet the environment."""
body = {'hostMode': 'LINUX/IRIX',
if connector.get('os_type', None) == 'aix':
host_mode = 'AIX'
else:
host_mode = 'LINUX/IRIX'
body = {'hostMode': host_mode,
'hostModeOptions': [_ISCSI_HMO_REPORT_FULL_PORTAL]}
if self.conf.hitachi_rest_disable_io_wait:
body['hostModeOptions'].append(_ISCSI_HMO_DISABLE_IO)

7
releasenotes/notes/hitachi-vsp-aix-os-type-23bf7cc3b98dff3a.yaml Normal file
View File

@ -0,0 +1,7 @@
---
features:
- |
Hitachi driver: Support AIX as host OS type.
When running ``cinder attachment-create`` command with the option
``--ostype aix``, ``AIX`` is set as host OS type.