From 93a3fd3af9d4cac8ef69f5d3af8b6fbcede4e38c Mon Sep 17 00:00:00 2001 From: chenying Date: Mon, 17 Apr 2017 23:05:42 +0800 Subject: [PATCH] Remove usage of parameter enforce_type Oslo.config deprecate and change parameter enforce_type's default value to True[1], so we don't need usage enforce_type. This patch will clean up usage of enforce_type. [1] https://review.openstack.org/328692 Change-Id: I0b558f0e1b2467a88dfe3c6c83fee9096c9dedc6 Closes-Bug: #1683382 --- karbor/service.py | 3 +-- karbor/tests/base.py | 2 +- karbor/tests/unit/clients/test_swift_client.py | 9 +++------ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/karbor/service.py b/karbor/service.py index d891c687..22719b9f 100644 --- a/karbor/service.py +++ b/karbor/service.py @@ -159,8 +159,7 @@ class Service(service.Service): {'service_down_time': CONF.service_down_time, 'report_interval': self.report_interval, 'new_down_time': new_down_time}) - CONF.set_override('service_down_time', new_down_time, - enforce_type=True) + CONF.set_override('service_down_time', new_down_time) def _create_service_ref(self, context): service_ref = db.service_create(context, diff --git a/karbor/tests/base.py b/karbor/tests/base.py index 1d81140d..c6b4d823 100644 --- a/karbor/tests/base.py +++ b/karbor/tests/base.py @@ -107,7 +107,7 @@ class TestCase(base.BaseTestCase): def override_config(self, name, override, group=None): """Cleanly override CONF variables.""" - CONF.set_override(name, override, group, enforce_type=True) + CONF.set_override(name, override, group) self.addCleanup(CONF.clear_override, name, group) def flags(self, **kw): diff --git a/karbor/tests/unit/clients/test_swift_client.py b/karbor/tests/unit/clients/test_swift_client.py index 417bea83..9689fb98 100644 --- a/karbor/tests/unit/clients/test_swift_client.py +++ b/karbor/tests/unit/clients/test_swift_client.py @@ -43,12 +43,9 @@ class SwiftClientTest(base.TestCase): self.conf.set_default('swift_auth_url', auth_url, 'swift_client') - self.conf.set_override('swift_user', 'demo', 'swift_client', - enforce_type=True) - self.conf.set_override('swift_key', 'secrete', 'swift_client', - enforce_type=True) - self.conf.set_override('swift_tenant_name', 'abcd', 'swift_client', - enforce_type=True) + self.conf.set_override('swift_user', 'demo', 'swift_client') + self.conf.set_override('swift_key', 'secrete', 'swift_client') + self.conf.set_override('swift_tenant_name', 'abcd', 'swift_client') sc = swift.create(self._context, self.conf) self.assertEqual(sc.authurl, auth_url) self.assertEqual(sc.user, 'demo')