openstack
/
cinder
Code Issues Proposed changes

Merge "INFINIDAT: delete host objects when detaching the last LUN"

This commit is contained in:
Jenkins 2017-05-19 21:57:44 +00:00 committed by Gerrit Code Review
parent 5a8ce404f0 9a557918b6
commit 34d8283798
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cinder/tests/unit/volume/drivers/test_infinidat.py
View File

@ -148,6 +148,14 @@ class InfiniboxDriverTestCase(test.TestCase):
def test_terminate_connection(self):
self.driver.terminate_connection(test_volume, test_connector)
def test_terminate_connection_delete_host(self):
self._mock_host.get_luns.return_value = [object()]
self.driver.terminate_connection(test_volume, test_connector)
self.assertEqual(0, self._mock_host.safe_delete.call_count)
self._mock_host.get_luns.return_value = []
self.driver.terminate_connection(test_volume, test_connector)
self.assertEqual(1, self._mock_host.safe_delete.call_count)
def test_terminate_connection_volume_doesnt_exist(self):
self._system.volumes.safe_get.return_value = None
self.assertRaises(exception.InvalidVolume,

1
cinder/volume/drivers/infinidat.py
View File

@ -213,6 +213,7 @@ class InfiniboxVolumeDriver(san.SanDriver):
# check if the host now doesn't have mappings, to delete host_entry
# if needed
if len(host.get_luns()) == 0:
host.safe_delete()
# Create initiator-target mapping.
target_wwpns = list(self._get_online_fc_ports())
target_wwpns, init_target_map = self._build_initiator_target_map(