openstack
/
cinder
Code Issues Proposed changes

Merge "Fix handling multiple WWPNs on preferred FC node"

This commit is contained in:
Jenkins 2014-04-24 18:35:54 +00:00 committed by Gerrit Code Review
parent 55871c60d1 9bfc5b0bf5
commit ee434fbad2
2 changed files with 124 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
cinder/tests/test_storwize_svc.py
View File

@ -2397,6 +2397,116 @@ class StorwizeSVCDriverTestCase(test.TestCase):
self.driver.delete_volume(volume)
self.assertNotIn(volume['id'], self.driver._vdiskcopyops)
def test_storwize_initiator_multiple_preferred_nodes_matching(self):
# Set the context.
ctxt = context.get_admin_context()
# Generate us a test volume
volume = self._generate_vol_info(None, None)
self.driver.create_volume(volume)
# Fibre Channel volume type
vol_type = volume_types.create(ctxt, 'FC', {'protocol': 'FC'})
volume['volume_type_id'] = vol_type['id']
# Make sure that the volumes have been created
self._assert_vol_exists(volume['name'], True)
#Set up one WWPN that won't match and one that will.
self.driver._state['storage_nodes']['1']['WWPN'] = ['123456789ABCDEF0',
'AABBCCDDEEFF0010']
wwpns = ['ff00000000000000', 'ff00000000000001']
connector = {'host': 'storwize-svc-test', 'wwpns': wwpns}
with mock.patch.object(helpers.StorwizeHelpers,
'get_conn_fc_wwpns') as get_mappings:
get_mappings.return_value = ['AABBCCDDEEFF0001',
'AABBCCDDEEFF0002',
'AABBCCDDEEFF0010',
'AABBCCDDEEFF0012']
# Initialize the connection
init_ret = self.driver.initialize_connection(volume, connector)
# Make sure we use the preferred WWPN.
self.assertEqual(init_ret['data']['target_wwn'],
'AABBCCDDEEFF0010')
def test_storwize_initiator_multiple_preferred_nodes_no_matching(self):
# Set the context.
ctxt = context.get_admin_context()
# Generate us a test volume
volume = self._generate_vol_info(None, None)
self.driver.create_volume(volume)
# Fibre Channel volume type
vol_type = volume_types.create(ctxt, 'FC', {'protocol': 'FC'})
volume['volume_type_id'] = vol_type['id']
# Make sure that the volumes have been created
self._assert_vol_exists(volume['name'], True)
#Set up WWPNs that will not match what is available.
self.driver._state['storage_nodes']['1']['WWPN'] = ['123456789ABCDEF0',
'123456789ABCDEF1']
wwpns = ['ff00000000000000', 'ff00000000000001']
connector = {'host': 'storwize-svc-test', 'wwpns': wwpns}
with mock.patch.object(helpers.StorwizeHelpers,
'get_conn_fc_wwpns') as get_mappings:
get_mappings.return_value = ['AABBCCDDEEFF0001',
'AABBCCDDEEFF0002',
'AABBCCDDEEFF0010',
'AABBCCDDEEFF0012']
# Initialize the connection
init_ret = self.driver.initialize_connection(volume, connector)
# Make sure we use the first available WWPN.
self.assertEqual(init_ret['data']['target_wwn'],
'AABBCCDDEEFF0001')
def test_storwize_initiator_single_preferred_node_matching(self):
# Set the context
ctxt = context.get_admin_context()
# Generate us a test volume
volume = self._generate_vol_info(None, None)
self.driver.create_volume(volume)
# Fibre Channel volume type
vol_type = volume_types.create(ctxt, 'FC', {'protocol': 'FC'})
volume['volume_type_id'] = vol_type['id']
# Make sure that the volumes have been created
self._assert_vol_exists(volume['name'], True)
#Set up one WWPN.
self.driver._state['storage_nodes']['1']['WWPN'] = ['AABBCCDDEEFF0012']
wwpns = ['ff00000000000000', 'ff00000000000001']
connector = {'host': 'storwize-svc-test', 'wwpns': wwpns}
with mock.patch.object(helpers.StorwizeHelpers,
'get_conn_fc_wwpns') as get_mappings:
get_mappings.return_value = ['AABBCCDDEEFF0001',
'AABBCCDDEEFF0002',
'AABBCCDDEEFF0010',
'AABBCCDDEEFF0012']
# Initialize the connection
init_ret = self.driver.initialize_connection(volume, connector)
# Make sure we use the preferred WWPN.
self.assertEqual(init_ret['data']['target_wwn'],
'AABBCCDDEEFF0012')
def test_storwize_initiator_target_map(self):
# Create two volumes to be used in mappings
ctxt = context.get_admin_context()

16
cinder/volume/drivers/ibm/storwize_svc/__init__.py
View File

@ -409,9 +409,21 @@ class StorwizeSVCDriver(san.SanDriver):
LOG.error(msg)
raise exception.VolumeBackendAPIException(data=msg)
if not vol_opts['multipath']:
if preferred_node_entry['WWPN'] in conn_wwpns:
properties['target_wwn'] = preferred_node_entry['WWPN']
# preferred_node_entry can have a list of WWPNs while only
# one WWPN may be available on the storage host. Here we
# walk through the nodes until we find one that works,
# default to the first WWPN otherwise.
for WWPN in preferred_node_entry['WWPN']:
if WWPN in conn_wwpns:
properties['target_wwn'] = WWPN
break
else:
LOG.warning(_('Unable to find a preferred node match '
'for node %(node)s in the list of '
'available WWPNs on %(host)s. '
'Using first available.') %
{'node': preferred_node,
'host': host_name})
properties['target_wwn'] = conn_wwpns[0]
else:
properties['target_wwn'] = conn_wwpns