Fixes 3PAR drivers terminate_connection issue.

3PAR drivers now default the third parameter when terminate_connection
is called after copying a volume to image.
Fixes: bug #1190056
Change-Id: Icadacc9e083c6e97a919857d735ec16068d0f0c6

diff --git a/cinder/tests/test_hp3par.py b/cinder/tests/test_hp3par.py
index f9939d13b1694f17cb989cd53717c5daae64e597..1f4dedee7f32339a4b51a4ed0b01e3ef80d528b8 100644 (file)
--- a/cinder/tests/test_hp3par.py
+++ b/cinder/tests/test_hp3par.py
@@ -412,7 +412,8 @@ class HP3PARBaseDriver():
         self.driver.initialize_connection(self.volume, self.connector)
         vlun = self.driver.common.client.getVLUN(self.VOLUME_3PAR_NAME)
         self.assertEqual(vlun['volumeName'], self.VOLUME_3PAR_NAME)
-        self.driver.terminate_connection(self.volume, self.connector, True)
+        self.driver.terminate_connection(self.volume, self.connector,
+                                         force=True)
         # vlun should be gone.
         self.assertRaises(hpexceptions.HTTPNotFound,
                           self.driver.common.client.getVLUN,

diff --git a/cinder/volume/drivers/san/hp/hp_3par_fc.py b/cinder/volume/drivers/san/hp/hp_3par_fc.py
index cc55b0a3eec9a2ea6e1c492cc1121c83241c8540..1abd291825d51d46b4bbb3d294d679434e31ff57 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_3par_fc.py
+++ b/cinder/volume/drivers/san/hp/hp_3par_fc.py
@@ -185,7 +185,7 @@ class HP3PARFCDriver(cinder.volume.driver.FibreChannelDriver):
         return info
 
     @utils.synchronized('3par', external=True)
-    def terminate_connection(self, volume, connector, force):
+    def terminate_connection(self, volume, connector, **kwargs):
         """Driver entry point to unattach a volume from an instance."""
         self.common.client_login()
         self.common.terminate_connection(volume,

diff --git a/cinder/volume/drivers/san/hp/hp_3par_iscsi.py b/cinder/volume/drivers/san/hp/hp_3par_iscsi.py
index 4fddb810364c22316f5297098074dba953d8220e..eed9da5ecea85c171373210e82806393693efc08 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_3par_iscsi.py
+++ b/cinder/volume/drivers/san/hp/hp_3par_iscsi.py
@@ -191,7 +191,7 @@ class HP3PARISCSIDriver(cinder.volume.driver.ISCSIDriver):
         return info
 
     @utils.synchronized('3par', external=True)
-    def terminate_connection(self, volume, connector, force):
+    def terminate_connection(self, volume, connector, **kwargs):
         """Driver entry point to unattach a volume from an instance."""
         self.common.client_login()
         self.common.terminate_connection(volume,