From e74ca0b7e9639a2c6bb69f725e871924921fbb0c Mon Sep 17 00:00:00 2001 From: Vu Cong Tuan Date: Fri, 2 Jun 2017 16:43:51 +0700 Subject: [PATCH] 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." Change-Id: I807ee7b4cc622d8833802c7812f4ee03fc2d40a7 Closes-Bug: #1694616 --- nova_dpm/tests/unit/conf/test_cfg.py | 4 ++-- nova_dpm/tests/unit/virt/dpm/test_driver.py | 2 +- nova_dpm/tests/unit/virt/dpm/test_vm.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nova_dpm/tests/unit/conf/test_cfg.py b/nova_dpm/tests/unit/conf/test_cfg.py index 2391184..edb364d 100644 --- a/nova_dpm/tests/unit/conf/test_cfg.py +++ b/nova_dpm/tests/unit/conf/test_cfg.py @@ -67,7 +67,7 @@ class TestStorageAdapterMappingOpt(TestCase): mapping = ["aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:0"] opt = MultiStorageAdapterMappingOpt("mapping") cfg.CONF.register_opt(opt) - cfg.CONF.set_override("mapping", mapping, enforce_type=True) + cfg.CONF.set_override("mapping", mapping) self.assertEqual([("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", "0")], cfg.CONF.mapping) @@ -76,7 +76,7 @@ class TestStorageAdapterMappingOpt(TestCase): "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1"] opt = MultiStorageAdapterMappingOpt("mapping") cfg.CONF.register_opt(opt) - cfg.CONF.set_override("mapping", mapping, enforce_type=True) + cfg.CONF.set_override("mapping", mapping) expected_mapping = [ ("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", "0"), ("bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb", "1")] diff --git a/nova_dpm/tests/unit/virt/dpm/test_driver.py b/nova_dpm/tests/unit/virt/dpm/test_driver.py index f579d16..f18fc01 100644 --- a/nova_dpm/tests/unit/virt/dpm/test_driver.py +++ b/nova_dpm/tests/unit/virt/dpm/test_driver.py @@ -113,7 +113,7 @@ class DPMdriverInitHostTestCase(TestCase): storage = self.adapter_object_id + ":" + self.port_element_id cfg.CONF.set_override("physical_storage_adapter_mappings", [storage], - group="dpm", enforce_type=True) + group="dpm") self.flags( group="dpm", diff --git a/nova_dpm/tests/unit/virt/dpm/test_vm.py b/nova_dpm/tests/unit/virt/dpm/test_vm.py index a3cd892..9ff8775 100755 --- a/nova_dpm/tests/unit/virt/dpm/test_vm.py +++ b/nova_dpm/tests/unit/virt/dpm/test_vm.py @@ -122,7 +122,7 @@ class VmPartitionInstanceTestCase(TestCase): 'element-id') storage = self.adapter_object_id + ":" + self.port_element_id cfg.CONF.set_override("physical_storage_adapter_mappings", [storage], - group="dpm", enforce_type=True) + group="dpm") dpm_hba_dict = { "name": "OpenStack_Port_" + self.adapter_object_id + "_" + str(self.port_element_id),