openstack/cinder
Code Issues Proposed changes

Merge "Ignore case when comparing wwns in Pure FC driver"

Browse Source
This commit is contained in:
Jenkins 2016-08-14 22:00:12 +00:00 committed by Gerrit Code Review
commit 15d2229d72
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cinder/tests/unit/volume/drivers/test_pure.py
View File

@ -122,7 +122,7 @@ SNAPSHOT_WITH_CGROUP = SNAPSHOT.copy()
SNAPSHOT_WITH_CGROUP['cgsnapshot_id'] = \ SNAPSHOT_WITH_CGROUP['cgsnapshot_id'] = \
"4a2f7e3a-312a-40c5-96a8-536b8a0fe075" "4a2f7e3a-312a-40c5-96a8-536b8a0fe075"
INITIATOR_IQN = "iqn.1993-08.org.debian:01:222" INITIATOR_IQN = "iqn.1993-08.org.debian:01:222"
INITIATOR_WWN = "5001500150015081" INITIATOR_WWN = "5001500150015081abc"
ISCSI_CONNECTOR = {"initiator": INITIATOR_IQN, "host": HOSTNAME} ISCSI_CONNECTOR = {"initiator": INITIATOR_IQN, "host": HOSTNAME}
FC_CONNECTOR = {"wwpns": {INITIATOR_WWN}, "host": HOSTNAME} FC_CONNECTOR = {"wwpns": {INITIATOR_WWN}, "host": HOSTNAME}
TARGET_IQN = "iqn.2010-06.com.purestorage:flasharray.12345abc" TARGET_IQN = "iqn.2010-06.com.purestorage:flasharray.12345abc"
@ -132,7 +132,7 @@ INITIATOR_TARGET_MAP =\
{ {
# _build_initiator_target_map() calls list(set()) on the list, # _build_initiator_target_map() calls list(set()) on the list,
# we must also call list(set()) to get the exact same order # we must also call list(set()) to get the exact same order
'5001500150015081': list(set(FC_WWNS)), '5001500150015081abc': list(set(FC_WWNS)),
} }
DEVICE_MAPPING =\ DEVICE_MAPPING =\
{ {
@ -2280,6 +2280,16 @@ class PureFCDriverTestCase(PureDriverTestCase):
self.array, self.array,
FC_CONNECTOR) FC_CONNECTOR)
def test_get_host_uppercase_wwpn(self):
expected_host = PURE_HOST.copy()
expected_host['wwn'] = [INITIATOR_WWN]
self.array.list_hosts.return_value = [expected_host]
connector = FC_CONNECTOR.copy()
connector['wwpns'] = [wwpn.upper() for wwpn in FC_CONNECTOR['wwpns']]
actual_result = self.driver._get_host(self.array, connector)
self.assertEqual(expected_host, actual_result)
@mock.patch(FC_DRIVER_OBJ + "._connect") @mock.patch(FC_DRIVER_OBJ + "._connect")
def test_initialize_connection(self, mock_connection): def test_initialize_connection(self, mock_connection):
lookup_service = self.driver._lookup_service lookup_service = self.driver._lookup_service

2
cinder/volume/drivers/pure.py
View File

@ -1700,7 +1700,7 @@ class PureFCDriver(PureBaseVolumeDriver, driver.FibreChannelDriver):
hosts = array.list_hosts() hosts = array.list_hosts()
for host in hosts: for host in hosts:
for wwn in connector["wwpns"]: for wwn in connector["wwpns"]:
if wwn in str(host["wwn"]).lower(): if wwn.lower() in str(host["wwn"]).lower():
return host return host
@staticmethod @staticmethod

5
releasenotes/notes/pure-fc-wwpn-case-c1d97f3fa7663acf.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- Fix issue with PureFCDriver where partially case sensitive comparison of
connector wwpn could cause initialize_connection to fail when attempting
to create duplicate Purity host.