openstack
/
cinder
Code Issues Proposed changes

Remove usage of parameter enforce_type 

Oslo.config deprecated parameter enforce_type and change its
default value to True in Ifa552de0a994e40388cbc9f7dbaa55700ca276b0.
Remove the usage of it to avoid DeprecationWarning: "Using the
'enforce_type' argument is deprecated in version '4.0' and will be
removed in version '5.0': The argument enforce_type has changed its
default value to True and then will be removed completely."

Related--Bug: #1517839

Change-Id: I92f76fa44f71497c10d320a2823dc5ba623309f6
This commit is contained in:
ChangBo Guo(gcb) 2017-05-04 12:56:29 +08:00
parent 3c30a23b3a
commit ae0df83d94
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cinder/tests/unit/volume/drivers/netapp/dataontap/utils/test_data_motion.py
View File

@ -74,14 +74,14 @@ class NetAppCDOTDataMotionMixinTestCase(test.TestCase):
config.netapp_snapmirror_quiesce_timeout = 10
CONF.set_override('netapp_vserver', self.src_vserver,
group=self.src_backend, enforce_type=True)
group=self.src_backend)
CONF.set_override('netapp_vserver', self.dest_vserver,
group=self.dest_backend, enforce_type=True)
group=self.dest_backend)
@ddt.data(None, [], [{'some_key': 'some_value'}])
def test_get_replication_backend_names_none(self, replication_device):
CONF.set_override('replication_device', replication_device,
group=self.src_backend, enforce_type=True)
group=self.src_backend)
devices = self.dm_mixin.get_replication_backend_names(self.config)
@ -91,7 +91,7 @@ class NetAppCDOTDataMotionMixinTestCase(test.TestCase):
[{'backend_id': 'foobar'}])
def test_get_replication_backend_names_valid(self, replication_device):
CONF.set_override('replication_device', replication_device,
group=self.src_backend, enforce_type=True)
group=self.src_backend)
devices = self.dm_mixin.get_replication_backend_names(self.config)
@ -145,7 +145,7 @@ class NetAppCDOTDataMotionMixinTestCase(test.TestCase):
return_value=self.config)
CONF.set_override('netapp_replication_aggregate_map',
replication_aggr_map,
group=self.src_backend, enforce_type=True)
group=self.src_backend)
aggr_map = self.dm_mixin._get_replication_aggregate_map(
self.src_backend, 'replication_backend_1')
@ -159,8 +159,7 @@ class NetAppCDOTDataMotionMixinTestCase(test.TestCase):
self.mock_object(utils, 'get_backend_configuration',
return_value=self.config)
CONF.set_override('netapp_replication_aggregate_map',
replication_aggr_map, group=self.src_backend,
enforce_type=True)
replication_aggr_map, group=self.src_backend)
aggr_map = self.dm_mixin._get_replication_aggregate_map(
self.src_backend, 'replication_backend_1')

20
cinder/tests/unit/volume/drivers/netapp/dataontap/utils/test_utils.py
View File

@ -35,22 +35,22 @@ class NetAppCDOTDataMotionTestCase(test.TestCase):
self.mock_cmode_client = self.mock_object(client_cmode, 'Client')
self.config = fakes.get_fake_cmode_config(self.backend)
CONF.set_override('volume_backend_name', self.backend,
group=self.backend, enforce_type=True)
group=self.backend)
CONF.set_override('netapp_transport_type', 'https',
group=self.backend, enforce_type=True)
group=self.backend)
CONF.set_override('netapp_login', 'fake_user',
group=self.backend, enforce_type=True)
group=self.backend)
CONF.set_override('netapp_password', 'fake_password',
group=self.backend, enforce_type=True)
group=self.backend)
CONF.set_override('netapp_server_hostname', 'fake_hostname',
group=self.backend, enforce_type=True)
group=self.backend)
CONF.set_override('netapp_server_port', 8866,
group=self.backend, enforce_type=True)
group=self.backend)
def test_get_backend_configuration(self):
self.mock_object(utils, 'CONF')
CONF.set_override('netapp_vserver', 'fake_vserver',
group=self.backend, enforce_type=True)
group=self.backend)
utils.CONF.list_all_sections.return_value = [self.backend]
config = utils.get_backend_configuration(self.backend)
@ -60,9 +60,9 @@ class NetAppCDOTDataMotionTestCase(test.TestCase):
def test_get_backend_configuration_different_backend_name(self):
self.mock_object(utils, 'CONF')
CONF.set_override('netapp_vserver', 'fake_vserver',
group=self.backend, enforce_type=True)
group=self.backend)
CONF.set_override('volume_backend_name', 'fake_backend_name',
group=self.backend, enforce_type=True)
group=self.backend)
utils.CONF.list_all_sections.return_value = [self.backend]
config = utils.get_backend_configuration(self.backend)
@ -95,7 +95,7 @@ class NetAppCDOTDataMotionTestCase(test.TestCase):
return_value=self.config)
CONF.set_override('netapp_vserver', 'fake_vserver',
group=self.backend, enforce_type=True)
group=self.backend)
utils.get_client_for_backend(self.backend)