openstack/cinder
Code Issues Proposed changes

VNX Driver: delete_hba() instead of remove_hba()

Browse Source 
The storops drivers doesn't have a remove_hba() function,
it's called delete_hba(). The confusion comes from the fact
that storops uses -removeHBA argument when calling
naviseccli.

Change-Id: I3f72481442436ddf78c10ab53c161663b05a330a
Closes-bug: #1813525
(cherry picked from commit 6145f8583a)
(cherry picked from commit acca9dbc7c)
This commit is contained in:
David Vallee Delisle
2019-02-10 09:59:15 -05:00
parent 5f713514d7
commit 5efe103c06
3 changed files with 7 additions and 4 deletions
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

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

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

@@ -994,9 +994,9 @@ class TestCommonAdapter(test.TestCase):
host = common.Host('fake_host', ['fake_initiator1', 'fake_initiator2']) host = common.Host('fake_host', ['fake_initiator1', 'fake_initiator2'])
sg = mocked_res['sg'] sg = mocked_res['sg']
common_adapter.terminate_connection_cleanup(host, 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') 'fake_initiator1')
common_adapter.client.vnx.remove_hba.assert_any_call( common_adapter.client.vnx.delete_hba.assert_any_call(
'fake_initiator2') 'fake_initiator2')
@res_mock.patch_common_adapter @res_mock.patch_common_adapter

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

@@ -535,7 +535,10 @@ class Client(object):
if not isinstance(initiators, list): if not isinstance(initiators, list):
initiators = [initiators] initiators = [initiators]
for initiator_uid in 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): 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 lun_ids_in_cg = (set([l.lun_id for l in cg.lun_list]) if cg.lun_list