openstack
/
cinder
Code Issues Proposed changes

Merge "VNX Driver: delete_hba() instead of remove_hba()"

This commit is contained in:
Zuul 2019-02-15 21:06:07 +00:00 committed by Gerrit Code Review
parent dcfab3107a 6145f8583a
commit 275551a1fa
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/tests/unit/volume/drivers/dell_emc/vnx/mocked_vnx.yaml
View File

@ -2082,7 +2082,7 @@ test_terminate_connection_cleanup_deregister:
get_alu_hlu_map: {}
vnx:
_methods:
remove_hba:
delete_hba:
test_terminate_connection_cleanup_sg_is_not_empty:
sg:

4
cinder/tests/unit/volume/drivers/dell_emc/vnx/test_adapter.py
View File

@ -994,9 +994,9 @@ class TestCommonAdapter(test_base.TestCase):
host = common.Host('fake_host', ['fake_initiator1', 'fake_initiator2'])
sg = mocked_res['sg']
common_adapter.terminate_connection_cleanup(host, sg)
common_adapter.client.vnx.remove_hba.assert_any_call(
common_adapter.client.vnx.delete_hba.assert_any_call(
'fake_initiator1')
common_adapter.client.vnx.remove_hba.assert_any_call(
common_adapter.client.vnx.delete_hba.assert_any_call(
'fake_initiator2')
@res_mock.patch_common_adapter

5
cinder/volume/drivers/dell_emc/vnx/client.py
View File

@ -539,7 +539,10 @@ class Client(object):
if not isinstance(initiators, list):
initiators = [initiators]
for initiator_uid in initiators:
self.vnx.remove_hba(initiator_uid)
try:
self.vnx.delete_hba(initiator_uid)
except AttributeError:
self.vnx.remove_hba(initiator_uid)
def update_consistencygroup(self, cg, lun_ids_to_add, lun_ids_to_remove):
lun_ids_in_cg = (set([l.lun_id for l in cg.lun_list]) if cg.lun_list