Remove unused parameter in PureFCDriver _connect

The ‘initiator_data’ parameter is unused and can safely be removed.

Change-Id: I6b9c8b7b87a75fc15400d141c8b16c5f9a364953
Closes-Bug: #1473822

diff --git a/cinder/tests/unit/test_pure.py b/cinder/tests/unit/test_pure.py
index 98594eecc2d2dd0010fb573f5fa939473acde607..26783fa7eb4a69ab07217763319b30d3b5697ee2 100644 (file)
--- a/cinder/tests/unit/test_pure.py
+++ b/cinder/tests/unit/test_pure.py
@@ -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)

diff --git a/cinder/volume/drivers/pure.py b/cinder/volume/drivers/pure.py
index 913407191a0e808c3d6c1cbd9242f5c3b16abb08..a3319a23ea60208953a5c0fd965f546ada55f63c 100644 (file)
--- a/cinder/volume/drivers/pure.py
+++ b/cinder/volume/drivers/pure.py
@@ -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"]