openstack
/
karbor
Code Issues Proposed changes

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
This commit is contained in:
chenying 2017-04-17 23:05:42 +08:00
parent 42b8bd319c
commit 93a3fd3af9
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
karbor/service.py
View File

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

2
karbor/tests/base.py
View File

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

9
karbor/tests/unit/clients/test_swift_client.py
View File

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