openstack
/
cinder
Code Issues Proposed changes

Merge "VMAX driver - allow for a clean system with no initiator groups"

This commit is contained in:
Zuul 2018-12-08 16:26:13 +00:00 committed by Gerrit Code Review
parent cdfa06c9ec c3149ebc40
commit 72e0615907
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cinder/tests/unit/volume/drivers/dell_emc/vmax/test_vmax.py
View File

@ -2418,12 +2418,18 @@ class VMAXRestTest(test.TestCase):
init_list = self.rest.get_initiator_list(array)
self.assertIsNotNone(init_list)
def test_get_initiator_list_none(self):
def test_get_initiator_list_empty(self):
array = self.data.array
with mock.patch.object(self.rest, 'get_resource', return_value={}):
init_list = self.rest.get_initiator_list(array)
self.assertEqual([], init_list)
def test_get_initiator_list_none(self):
array = self.data.array
with mock.patch.object(self.rest, 'get_resource', return_value=None):
init_list = self.rest.get_initiator_list(array)
self.assertIsNotNone(init_list)
def test_get_initiator_group_from_initiator(self):
initiator = self.data.wwpn1
ref_group = self.data.initiatorgroup_name_f

2
cinder/volume/drivers/dell_emc/vmax/rest.py
View File

@ -1335,7 +1335,7 @@ class VMAXRest(object):
params=params, version=version)
try:
init_list = init_dict['initiatorId']
except KeyError:
except (KeyError, TypeError):
init_list = []
return init_list