Merge "Remove usage of parameter enforce_type"

This commit is contained in:
Jenkins 2017-07-06 07:10:17 +00:00 committed by Gerrit Code Review
commit 21916e7095
3 changed files with 4 additions and 4 deletions

View File

@ -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")]

View File

@ -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",

View File

@ -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),