Skip to content

Commit

Permalink
Fixes 3PAR drivers terminate_connection issue.
Browse files Browse the repository at this point in the history
3PAR drivers now default the third parameter when terminate_connection
is called after copying a volume to image.
Fixes: bug #1190056

Change-Id: Icadacc9e083c6e97a919857d735ec16068d0f0c6
  • Loading branch information
viraj-hp committed Jun 12, 2013
1 parent eb8d60d commit 9dc141a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion cinder/tests/test_hp3par.py
Expand Up @@ -412,7 +412,8 @@ def test_terminate_connection(self):
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,
Expand Down
2 changes: 1 addition & 1 deletion cinder/volume/drivers/san/hp/hp_3par_fc.py
Expand Up @@ -185,7 +185,7 @@ def initialize_connection(self, volume, connector):
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,
Expand Down
2 changes: 1 addition & 1 deletion cinder/volume/drivers/san/hp/hp_3par_iscsi.py
Expand Up @@ -191,7 +191,7 @@ def initialize_connection(self, volume, connector):
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,
Expand Down

0 comments on commit 9dc141a

Please sign in to comment.