openstack
/
cinder
Code Issues Proposed changes

Merge "DS8K: correct the return value for initialize_connection method"

This commit is contained in:
Zuul 2018-06-18 21:56:16 +00:00 committed by Gerrit Code Review
parent 5f5032418c edbc2956a5
commit ee7186845d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cinder/tests/unit/volume/drivers/ibm/test_ds8k_proxy.py
View File

@ -60,7 +60,7 @@ TEST_SOURCE_DS8K_IP = '1.1.1.1'
TEST_TARGET_DS8K_IP = '2.2.2.2'
TEST_SOURCE_WWNN = '5000000000FFC111'
TEST_TARGET_WWNN = '5000000000FFD222'
TEST_SOURCE_WWPN_1 = '10000090FA3418BC'
TEST_SOURCE_WWPN_1 = '10000090fa3418bc'
TEST_SOURCE_WWPN_2 = '10000090FA3418BD'
TEST_SOURCE_IOPORT = 'I0001'
TEST_TARGET_IOPORT = 'I0002'
@ -2707,6 +2707,12 @@ class DS8KProxyTest(test.TestCase):
map_data = self.driver.initialize_connection(volume, TEST_CONNECTOR)
self.assertEqual(int(TEST_LUN_ID), map_data['data']['target_lun'])
self.assertTrue(
list(map_data['data']['initiator_target_map'].keys())[0] in
[TEST_SOURCE_WWPN_1, TEST_SOURCE_WWPN_2])
self.assertTrue(
list(map_data['data']['initiator_target_map'].keys())[1] in
[TEST_SOURCE_WWPN_1, TEST_SOURCE_WWPN_2])
def test_initialize_connection_of_eckd_volume(self):
"""attach a ECKD volume to host."""

2
cinder/volume/drivers/ibm/ibm_storage/ds8k_helper.py
View File

@ -662,7 +662,7 @@ class DS8KCommonHelper(object):
'target_lun': int(lun_id, 16),
'target_wwn': target_ports,
'initiator_target_map': {initiator: target_ports for
initiator in host_wwpn_set}
initiator in connector['wwpns']}
}
}