openstack
/
cinder
Code Issues Proposed changes

Merge "Remove unused parameter in PureFCDriver _connect"

This commit is contained in:
Jenkins 2015-07-13 15:52:03 +00:00 committed by Gerrit Code Review
parent 238df8b82e b375ba5351
commit 409bc28183
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cinder/tests/unit/test_pure.py
View File

@ -1314,7 +1314,7 @@ class PureFCDriverTestCase(PureDriverTestCase):
# Branch where host already exists
mock_host.return_value = PURE_HOST
self.array.connect_host.return_value = {"vol": vol_name, "lun": 1}
real_result = self.driver._connect(VOLUME, FC_CONNECTOR, None)
real_result = self.driver._connect(VOLUME, FC_CONNECTOR)
self.assertEqual(result, real_result)
mock_host.assert_called_with(self.driver, FC_CONNECTOR)
self.assertFalse(mock_generate.called)
@ -1324,7 +1324,7 @@ class PureFCDriverTestCase(PureDriverTestCase):
# Branch where new host is created
mock_host.return_value = None
mock_generate.return_value = PURE_HOST_NAME
real_result = self.driver._connect(VOLUME, FC_CONNECTOR, None)
real_result = self.driver._connect(VOLUME, FC_CONNECTOR)
mock_host.assert_called_with(self.driver, FC_CONNECTOR)
mock_generate.assert_called_with(HOSTNAME)
self.array.create_host.assert_called_with(PURE_HOST_NAME,
@ -1336,7 +1336,7 @@ class PureFCDriverTestCase(PureDriverTestCase):
self.assert_error_propagates(
[mock_host, mock_generate, self.array.connect_host,
self.array.create_host],
self.driver._connect, VOLUME, FC_CONNECTOR, None)
self.driver._connect, VOLUME, FC_CONNECTOR)
@mock.patch(FC_DRIVER_OBJ + "._get_host", autospec=True)
def test_connect_already_connected(self, mock_host):
@ -1349,7 +1349,7 @@ class PureFCDriverTestCase(PureDriverTestCase):
code=400,
text="Connection already exists"
)
actual = self.driver._connect(VOLUME, FC_CONNECTOR, None)
actual = self.driver._connect(VOLUME, FC_CONNECTOR)
self.assertEqual(expected, actual)
self.assertTrue(self.array.connect_host.called)
self.assertTrue(self.array.list_volume_private_connections)
@ -1364,7 +1364,7 @@ class PureFCDriverTestCase(PureDriverTestCase):
text="Connection already exists"
)
self.assertRaises(exception.PureDriverException, self.driver._connect,
VOLUME, FC_CONNECTOR, None)
VOLUME, FC_CONNECTOR)
self.assertTrue(self.array.connect_host.called)
self.assertTrue(self.array.list_volume_private_connections)
@ -1379,6 +1379,6 @@ class PureFCDriverTestCase(PureDriverTestCase):
text="Connection already exists"
)
self.assertRaises(self.purestorage_module.PureHTTPError,
self.driver._connect, VOLUME, FC_CONNECTOR, None)
self.driver._connect, VOLUME, FC_CONNECTOR)
self.assertTrue(self.array.connect_host.called)
self.assertTrue(self.array.list_volume_private_connections)

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

@ -793,7 +793,7 @@ class PureFCDriver(PureBaseVolumeDriver, driver.FibreChannelDriver):
def initialize_connection(self, volume, connector, initiator_data=None):
"""Allow connection to connector and return connection info."""
connection = self._connect(volume, connector, initiator_data)
connection = self._connect(volume, connector)
target_wwns = self._get_array_wwns()
init_targ_map = self._build_initiator_target_map(target_wwns,
connector)
@ -811,7 +811,7 @@ class PureFCDriver(PureBaseVolumeDriver, driver.FibreChannelDriver):
return properties
@utils.synchronized('PureFCDriver._connect', external=True)
def _connect(self, volume, connector, initiator_data):
def _connect(self, volume, connector):
"""Connect the host and volume; return dict describing connection."""
wwns = connector["wwpns"]