From 2ecfd6144ba79334740407241c8fa5d7ad928840 Mon Sep 17 00:00:00 2001 From: Yong Huang Date: Thu, 7 Jun 2018 14:39:13 +0800 Subject: [PATCH] Empty option value maybe cause Unity driver failed to initialize If the value of list type option is empty, Unity driver may failed to initialize. Example: unity_io_ports= unity_storage_pool_names= Change-Id: Ib5850d984bfd3651d308f448993251e9ec5a9460 Closes-bug: #1775518 --- .../drivers/dell_emc/unity/test_driver.py | 3 ++- .../drivers/dell_emc/unity/test_utils.py | 21 +++++++++++++++++++ .../volume/drivers/dell_emc/unity/driver.py | 4 ++-- cinder/volume/drivers/dell_emc/unity/utils.py | 5 +++-- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/cinder/tests/unit/volume/drivers/dell_emc/unity/test_driver.py b/cinder/tests/unit/volume/drivers/dell_emc/unity/test_driver.py index 20e81b40969..737ea7aa2b0 100644 --- a/cinder/tests/unit/volume/drivers/dell_emc/unity/test_driver.py +++ b/cinder/tests/unit/volume/drivers/dell_emc/unity/test_driver.py @@ -133,7 +133,8 @@ class UnityDriverTest(unittest.TestCase): def test_default_initialize(self): config = conf.Configuration(None) iscsi_driver = driver.UnityDriver(configuration=config) - self.assertIsNone(config.unity_storage_pool_names) + self.assertListEqual([], config.unity_storage_pool_names) + self.assertListEqual([], config.unity_io_ports) self.assertTrue(config.san_thin_provision) self.assertEqual('', config.san_ip) self.assertEqual('admin', config.san_login) diff --git a/cinder/tests/unit/volume/drivers/dell_emc/unity/test_utils.py b/cinder/tests/unit/volume/drivers/dell_emc/unity/test_utils.py index abddab5a0a4..752cc63a1fc 100644 --- a/cinder/tests/unit/volume/drivers/dell_emc/unity/test_utils.py +++ b/cinder/tests/unit/volume/drivers/dell_emc/unity/test_utils.py @@ -258,3 +258,24 @@ class UnityUtilsTest(unittest.TestCase): ret = utils.get_backend_qos_specs(volume) expected = {'maxBWS': 2, 'id': 'max_2_mbps', 'maxIOPS': None} self.assertEqual(expected, ret) + + def test_remove_empty(self): + option = mock.Mock() + value_list = [' pool1', 'pool2 ', ' pool3 '] + ret = utils.remove_empty(option, value_list) + expected = ['pool1', 'pool2', 'pool3'] + self.assertListEqual(expected, ret) + + def test_remove_empty_none(self): + option = mock.Mock() + value_list = None + ret = utils.remove_empty(option, value_list) + expected = None + self.assertEqual(expected, ret) + + def test_remove_empty_empty_list(self): + option = mock.Mock() + value_list = [] + ret = utils.remove_empty(option, value_list) + expected = None + self.assertEqual(expected, ret) diff --git a/cinder/volume/drivers/dell_emc/unity/driver.py b/cinder/volume/drivers/dell_emc/unity/driver.py index a663784b809..8be43634493 100644 --- a/cinder/volume/drivers/dell_emc/unity/driver.py +++ b/cinder/volume/drivers/dell_emc/unity/driver.py @@ -31,11 +31,11 @@ CONF = cfg.CONF UNITY_OPTS = [ cfg.ListOpt('unity_storage_pool_names', - default=None, + default=[], help='A comma-separated list of storage pool names to be ' 'used.'), cfg.ListOpt('unity_io_ports', - default=None, + default=[], help='A comma-separated list of iSCSI or FC ports to be used. ' 'Each port can be Unix-style glob expressions.'), cfg.BoolOpt('remove_empty_host', diff --git a/cinder/volume/drivers/dell_emc/unity/utils.py b/cinder/volume/drivers/dell_emc/unity/utils.py index ca164bf4aa6..6d3c60fc950 100644 --- a/cinder/volume/drivers/dell_emc/unity/utils.py +++ b/cinder/volume/drivers/dell_emc/unity/utils.py @@ -273,12 +273,13 @@ def get_backend_qos_specs(volume): def remove_empty(option, value_list): - if value_list is not None: + if value_list: value_list = list(filter(None, map(str.strip, value_list))) if not value_list: raise exception.InvalidConfigurationValue(option=option, value=value_list) - return value_list + return value_list + return None def match_any(full, patterns):