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
This commit is contained in:
parent
5c5b2e0af6
commit
e74ca0b7e9
|
@ -67,7 +67,7 @@ class TestStorageAdapterMappingOpt(TestCase):
|
||||||
mapping = ["aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:0"]
|
mapping = ["aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:0"]
|
||||||
opt = MultiStorageAdapterMappingOpt("mapping")
|
opt = MultiStorageAdapterMappingOpt("mapping")
|
||||||
cfg.CONF.register_opt(opt)
|
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")],
|
self.assertEqual([("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", "0")],
|
||||||
cfg.CONF.mapping)
|
cfg.CONF.mapping)
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@ class TestStorageAdapterMappingOpt(TestCase):
|
||||||
"bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1"]
|
"bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1"]
|
||||||
opt = MultiStorageAdapterMappingOpt("mapping")
|
opt = MultiStorageAdapterMappingOpt("mapping")
|
||||||
cfg.CONF.register_opt(opt)
|
cfg.CONF.register_opt(opt)
|
||||||
cfg.CONF.set_override("mapping", mapping, enforce_type=True)
|
cfg.CONF.set_override("mapping", mapping)
|
||||||
expected_mapping = [
|
expected_mapping = [
|
||||||
("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", "0"),
|
("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", "0"),
|
||||||
("bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb", "1")]
|
("bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb", "1")]
|
||||||
|
|
|
@ -113,7 +113,7 @@ class DPMdriverInitHostTestCase(TestCase):
|
||||||
|
|
||||||
storage = self.adapter_object_id + ":" + self.port_element_id
|
storage = self.adapter_object_id + ":" + self.port_element_id
|
||||||
cfg.CONF.set_override("physical_storage_adapter_mappings", [storage],
|
cfg.CONF.set_override("physical_storage_adapter_mappings", [storage],
|
||||||
group="dpm", enforce_type=True)
|
group="dpm")
|
||||||
|
|
||||||
self.flags(
|
self.flags(
|
||||||
group="dpm",
|
group="dpm",
|
||||||
|
|
|
@ -122,7 +122,7 @@ class VmPartitionInstanceTestCase(TestCase):
|
||||||
'element-id')
|
'element-id')
|
||||||
storage = self.adapter_object_id + ":" + self.port_element_id
|
storage = self.adapter_object_id + ":" + self.port_element_id
|
||||||
cfg.CONF.set_override("physical_storage_adapter_mappings", [storage],
|
cfg.CONF.set_override("physical_storage_adapter_mappings", [storage],
|
||||||
group="dpm", enforce_type=True)
|
group="dpm")
|
||||||
dpm_hba_dict = {
|
dpm_hba_dict = {
|
||||||
"name": "OpenStack_Port_" + self.adapter_object_id +
|
"name": "OpenStack_Port_" + self.adapter_object_id +
|
||||||
"_" + str(self.port_element_id),
|
"_" + str(self.port_element_id),
|
||||||
|
|
Loading…
Reference in New Issue