openstack/cinder
Code Issues Proposed changes

Merge "Storwize: fix an incorrect temporary parameter name"

Browse Source
This commit is contained in:
Zuul 2018-01-22 22:09:45 +00:00 committed by Gerrit Code Review
commit b72e28276c
2 changed files with 16 additions and 2 deletions
cinder
tests/unit/volume/drivers/ibm
test_storwize_svc.py
volume/drivers/ibm/storwize_svc
storwize_svc_common.py

14
cinder/tests/unit/volume/drivers/ibm/test_storwize_svc.py

@ -3153,6 +3153,20 @@ class StorwizeSVCISCSIDriverTestCase(test.TestCase):
self.iscsi_driver.initialize_connection(volume_iSCSI, connector)
self.iscsi_driver.terminate_connection(volume_iSCSI, connector)
def test_storwize_get_host_from_connector_with_both_fc_iscsi_host(self):
volume_iSCSI = self._create_volume()
extra_spec = {'capabilities:storage_protocol': '<in> iSCSI'}
vol_type_iSCSI = volume_types.create(self.ctxt, 'iSCSI', extra_spec)
volume_iSCSI['volume_type_id'] = vol_type_iSCSI['id']
connector = {'host': 'storwize-svc-host',
'initiator': 'iqn.1993-08.org.debian:01:eac5ccc1aaa'}
if self.USESIM:
self.sim._cmd_mkhost(name='storwize-svc-host-99999999',
hbawwpn='123')
self.iscsi_driver.initialize_connection(volume_iSCSI, connector)
self.iscsi_driver.terminate_connection(volume_iSCSI, connector)
def test_storwize_iscsi_connection_snapshot(self):
# create a iSCSI volume
volume_iSCSI = self._create_volume()

4
cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py

@ -1077,8 +1077,8 @@ class StorwizeHelpers(object):
pass
if iscsi:
if 'initiator' in connector:
for iscsi in resp.select('iscsi_name'):
if iscsi == connector['initiator']:
for iscsi_name in resp.select('iscsi_name'):
if iscsi_name == connector['initiator']:
host_name = name
found = True
break