Merge "PowerMax Driver - Port load balancing fix"

This commit is contained in:
Zuul 2021-09-17 21:51:07 +00:00 committed by Gerrit Code Review
commit 4c2f2b460b
5 changed files with 9 additions and 8 deletions

View File

@ -114,9 +114,9 @@ class PowerMaxData(object):
'host': 'HostX'}
fabric_name_prefix = 'fakeFabric'
end_point_map = {connector['wwpns'][0]: [wwnn1],
connector['wwpns'][1]: [wwnn1]}
target_wwns = [wwnn1]
end_point_map = {connector['wwpns'][0]: [wwpn1],
connector['wwpns'][1]: [wwpn1]}
target_wwns = [wwpn1]
target_wwns_multi = [wwnn1, wwnn2]
zoning_mappings = {
'array': u'000197800123',
@ -674,7 +674,7 @@ class PowerMaxData(object):
port_list = [
{'symmetrixPort': {'num_of_masking_views': 1,
'maskingview': [masking_view_name_f],
'identifier': wwnn1,
'identifier': wwpn1,
'symmetrixPortKey': {
'directorId': 'FA-1D',
'portId': '4'},

View File

@ -1708,7 +1708,7 @@ class PowerMaxCommonTest(test.TestCase):
@mock.patch.object(common.PowerMaxCommon, '_get_replication_extra_specs',
return_value=tpd.PowerMaxData.rep_extra_specs)
def test_get_target_wwns_from_masking_view(self, mock_rep_specs, mock_fo):
ref_wwns = [self.data.wwnn1]
ref_wwns = [self.data.wwpn1]
for x in range(0, 2):
target_wwns = self.common._get_target_wwns_from_masking_view(
self.data.device_id, self.data.connector['host'],

View File

@ -212,13 +212,14 @@ class PowerMaxFCTest(test.TestCase):
return_value=(self.data.target_wwns_multi, [])):
targets, target_map = self.driver._build_initiator_target_map(
self.data.test_volume, self.data.connector,
device_info=self.data.iscsi_device_info)
device_info=self.data.fc_device_info)
self.assertEqual(1, len(target_map.get(init_a)))
self.assertEqual(1, len(target_map.get(init_b)))
self.assertTrue(
len(target_map.get(init_a)) < len(self.data.target_wwns_multi))
self.assertTrue(
len(target_map.get(init_b)) < len(self.data.target_wwns_multi))
self.assertEqual(self.data.wwpn1, targets[0])
def test_build_initiator_target_map_load_balanced_exception(self):
ref_target_map = {'123456789012345': self.data.target_wwns_multi,

View File

@ -997,7 +997,7 @@ class PowerMaxRestTest(test.TestCase):
def test_get_target_wwns(self):
array = self.data.array
pg_name = self.data.port_group_name_f
ref_wwns = [self.data.wwnn1]
ref_wwns = [self.data.wwpn1]
target_wwns = self.rest.get_target_wwns(array, pg_name)
self.assertEqual(ref_wwns, target_wwns)

View File

@ -496,7 +496,7 @@ class PowerMaxFCDriver(san.SanDriver, driver.FibreChannelDriver):
# Get target WWN
port_details = self.rest.get_port(array_id, port)
port_info = port_details.get('symmetrixPort')
port_wwn = port_info.get('wwn_node')
port_wwn = port_info.get('identifier')
LOG.info("Port %(p)s WWN: %(wwn)s",
{'p': port, 'wwn': port_wwn})
# Set lowest load port WWN as FC target for connection