diff --git a/cinder/tests/unit/volume/drivers/dell_emc/vmax/test_vmax.py b/cinder/tests/unit/volume/drivers/dell_emc/vmax/test_vmax.py index abed0b350e9..e7e361a1820 100644 --- a/cinder/tests/unit/volume/drivers/dell_emc/vmax/test_vmax.py +++ b/cinder/tests/unit/volume/drivers/dell_emc/vmax/test_vmax.py @@ -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 diff --git a/cinder/volume/drivers/dell_emc/vmax/rest.py b/cinder/volume/drivers/dell_emc/vmax/rest.py index 4c576681a02..2ff5eb0be9e 100644 --- a/cinder/volume/drivers/dell_emc/vmax/rest.py +++ b/cinder/volume/drivers/dell_emc/vmax/rest.py @@ -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