openstack/cinder
Code Issues Proposed changes

Merge "Dell SC: ISCSI initialize_connection fixes"

Browse Source
This commit is contained in:
Jenkins 2016-09-19 17:00:12 +00:00 committed by Gerrit Code Review
commit 205a850276
2 changed files with 82 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
cinder/tests/unit/volume/drivers/dell/test_dellscapi.py
View File

@ -3543,8 +3543,7 @@ class DellSCSanAPITestCase(test.TestCase):
'_find_active_controller', '_find_active_controller',
return_value='64702.64702') return_value='64702.64702')
@mock.patch.object(dell_storagecenter_api.StorageCenterApi, @mock.patch.object(dell_storagecenter_api.StorageCenterApi,
'_find_controller_port', '_find_controller_port')
return_value=ISCSI_CTRLR_PORT)
@mock.patch.object(dell_storagecenter_api.StorageCenterApi, @mock.patch.object(dell_storagecenter_api.StorageCenterApi,
'_find_domains', '_find_domains',
return_value=ISCSI_FLT_DOMAINS_MULTI_PORTALS) return_value=ISCSI_FLT_DOMAINS_MULTI_PORTALS)
@ -3564,6 +3563,59 @@ class DellSCSanAPITestCase(test.TestCase):
mock_open_connection, mock_open_connection,
mock_init): mock_init):
# Test case where there are multiple portals # Test case where there are multiple portals
mock_find_ctrl_port.side_effect = [
{'iscsiName': 'iqn.2002-03.com.compellent:5000d31000fcbe43'},
{'iscsiName': 'iqn.2002-03.com.compellent:5000d31000fcbe44'}]
res = self.scapi.find_iscsi_properties(self.VOLUME)
self.assertTrue(mock_find_mappings.called)
self.assertTrue(mock_find_domains.called)
self.assertTrue(mock_find_ctrl_port.called)
self.assertTrue(mock_find_active_controller.called)
self.assertTrue(mock_is_virtualport_mode.called)
expected = {'target_discovered': False,
'target_iqn':
u'iqn.2002-03.com.compellent:5000d31000fcbe44',
'target_iqns':
[u'iqn.2002-03.com.compellent:5000d31000fcbe44',
u'iqn.2002-03.com.compellent:5000d31000fcbe43',
u'iqn.2002-03.com.compellent:5000d31000fcbe43',
u'iqn.2002-03.com.compellent:5000d31000fcbe44'],
'target_lun': 1,
'target_luns': [1, 1, 1, 1],
'target_portal': u'192.168.0.25:3260',
'target_portals': [u'192.168.0.25:3260',
u'192.168.0.21:3260',
u'192.168.0.25:3260',
u'192.168.0.21:3260']}
self.assertEqual(expected, res, 'Wrong Target Info')
@mock.patch.object(dell_storagecenter_api.StorageCenterApi,
'_find_active_controller',
return_value='64702.64702')
@mock.patch.object(dell_storagecenter_api.StorageCenterApi,
'_find_controller_port')
@mock.patch.object(dell_storagecenter_api.StorageCenterApi,
'_find_domains',
return_value=ISCSI_FLT_DOMAINS_MULTI_PORTALS)
@mock.patch.object(dell_storagecenter_api.StorageCenterApi,
'_find_mappings',
return_value=MAPPINGS_MULTI_PORTAL)
@mock.patch.object(dell_storagecenter_api.StorageCenterApi,
'_is_virtualport_mode',
return_value=True)
def test_find_iscsi_properties_multi_portals_duplicates(
self,
mock_is_virtualport_mode,
mock_find_mappings,
mock_find_domains,
mock_find_ctrl_port,
mock_find_active_controller,
mock_close_connection,
mock_open_connection,
mock_init):
# Test case where there are multiple portals and
mock_find_ctrl_port.return_value = {
'iscsiName': 'iqn.2002-03.com.compellent:5000d31000fcbe43'}
res = self.scapi.find_iscsi_properties(self.VOLUME) res = self.scapi.find_iscsi_properties(self.VOLUME)
self.assertTrue(mock_find_mappings.called) self.assertTrue(mock_find_mappings.called)
self.assertTrue(mock_find_domains.called) self.assertTrue(mock_find_domains.called)
@ -3575,16 +3627,12 @@ class DellSCSanAPITestCase(test.TestCase):
u'iqn.2002-03.com.compellent:5000d31000fcbe43', u'iqn.2002-03.com.compellent:5000d31000fcbe43',
'target_iqns': 'target_iqns':
[u'iqn.2002-03.com.compellent:5000d31000fcbe43', [u'iqn.2002-03.com.compellent:5000d31000fcbe43',
u'iqn.2002-03.com.compellent:5000d31000fcbe43',
u'iqn.2002-03.com.compellent:5000d31000fcbe43',
u'iqn.2002-03.com.compellent:5000d31000fcbe43'], u'iqn.2002-03.com.compellent:5000d31000fcbe43'],
'target_lun': 1, 'target_lun': 1,
'target_luns': [1, 1, 1, 1], 'target_luns': [1, 1],
'target_portal': u'192.168.0.25:3260', 'target_portal': u'192.168.0.25:3260',
'target_portals': [u'192.168.0.21:3260', 'target_portals': [u'192.168.0.25:3260',
u'192.168.0.25:3260', u'192.168.0.21:3260']}
u'192.168.0.21:3260',
u'192.168.0.25:3260']}
self.assertEqual(expected, res, 'Wrong Target Info') self.assertEqual(expected, res, 'Wrong Target Info')
@mock.patch.object(dell_storagecenter_api.StorageCenterApi, @mock.patch.object(dell_storagecenter_api.StorageCenterApi,
@ -3709,8 +3757,7 @@ class DellSCSanAPITestCase(test.TestCase):
'_find_active_controller', '_find_active_controller',
return_value='64702.64702') return_value='64702.64702')
@mock.patch.object(dell_storagecenter_api.StorageCenterApi, @mock.patch.object(dell_storagecenter_api.StorageCenterApi,
'_find_controller_port', '_find_controller_port')
return_value=ISCSI_CTRLR_PORT)
@mock.patch.object(dell_storagecenter_api.StorageCenterApi, @mock.patch.object(dell_storagecenter_api.StorageCenterApi,
'_find_mappings', '_find_mappings',
return_value=MAPPINGS_MULTI_PORTAL) return_value=MAPPINGS_MULTI_PORTAL)
@ -3730,6 +3777,9 @@ class DellSCSanAPITestCase(test.TestCase):
mock_close_connection, mock_close_connection,
mock_open_connection, mock_open_connection,
mock_init): mock_init):
mock_find_ctrl_port.side_effect = [
{'iscsiName': 'iqn.2002-03.com.compellent:5000d31000fcbe43'},
{'iscsiName': 'iqn.2002-03.com.compellent:5000d31000fcbe44'}]
# Test case where there are multiple portals # Test case where there are multiple portals
res = self.scapi.find_iscsi_properties(self.VOLUME) res = self.scapi.find_iscsi_properties(self.VOLUME)
self.assertTrue(mock_find_mappings.called) self.assertTrue(mock_find_mappings.called)
@ -3737,13 +3787,13 @@ class DellSCSanAPITestCase(test.TestCase):
self.assertTrue(mock_find_active_controller.called) self.assertTrue(mock_find_active_controller.called)
self.assertTrue(mock_is_virtualport_mode.called) self.assertTrue(mock_is_virtualport_mode.called)
self.assertTrue(mock_find_controller_port_iscsi_config.called) self.assertTrue(mock_find_controller_port_iscsi_config.called)
# Since we're feeding the same info back multiple times the information # We're feeding the same info back multiple times the information
# will be duped. # will be scrubbed to a single item.
expected = {'target_discovered': False, expected = {'target_discovered': False,
'target_iqn': 'target_iqn':
u'iqn.2002-03.com.compellent:5000d31000fcbe43', u'iqn.2002-03.com.compellent:5000d31000fcbe44',
'target_iqns': 'target_iqns':
[u'iqn.2002-03.com.compellent:5000d31000fcbe43', [u'iqn.2002-03.com.compellent:5000d31000fcbe44',
u'iqn.2002-03.com.compellent:5000d31000fcbe43'], u'iqn.2002-03.com.compellent:5000d31000fcbe43'],
'target_lun': 1, 'target_lun': 1,
'target_luns': [1, 1], 'target_luns': [1, 1],

22
cinder/volume/drivers/dell/dell_storagecenter_api.py
View File

@ -1686,7 +1686,15 @@ class StorageCenterApi(object):
:return: Nothing :return: Nothing
""" """
if self.excluded_domain_ips.count(address) == 0: if self.excluded_domain_ips.count(address) == 0:
portals.append(address + ':' + six.text_type(port)) # Make sure this isn't a duplicate.
newportal = address + ':' + six.text_type(port)
for idx, portal in enumerate(portals):
if portal == newportal and iqns[idx] == iqn:
LOG.debug('Skipping duplicate portal %(ptrl)s and'
'iqn %(iqn)s.', {'ptrl': portal, 'iqn': iqn})
return
# It isn't in the list so process it.
portals.append(newportal)
iqns.append(iqn) iqns.append(iqn)
luns.append(lun) luns.append(lun)
@ -1778,13 +1786,17 @@ class StorageCenterApi(object):
'Volume is not yet active on any controller.') 'Volume is not yet active on any controller.')
pdata['active'] = 0 pdata['active'] = 0
# Make sure we have a good item at the top of the list.
iqns.insert(0, iqns.pop(pdata['active']))
portals.insert(0, portals.pop(pdata['active']))
luns.insert(0, luns.pop(pdata['active']))
data = {'target_discovered': False, data = {'target_discovered': False,
'target_iqn': iqns[pdata['active']], 'target_iqn': iqns[0],
'target_iqns': iqns, 'target_iqns': iqns,
'target_portal': portals[pdata['active']], 'target_portal': portals[0],
'target_portals': portals, 'target_portals': portals,
'target_lun': luns[pdata['active']], 'target_lun': luns[0],
'target_luns': luns, 'target_luns': luns
} }
LOG.debug('find_iscsi_properties: %s', data) LOG.debug('find_iscsi_properties: %s', data)
return data return data