Remove usage of parameter enforce_type

Oslo.config deprecated parameter enforce_type and change
its default value to True. 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: Ia183126e62db884540144825b4137157024f7542
Closes-Bug: #1694616
This commit is contained in:
Feng Shengqin 2017-06-01 09:58:58 +08:00
parent 3eeadf178e
commit f2f31c81d3
24 changed files with 62 additions and 75 deletions

View File

@ -151,8 +151,7 @@ class JSONRequestDeserializerTest(base.SenlinTestCase):
self.assertEqual(expected, actual)
def test_from_json_exceeds_max_json_mb(self):
cfg.CONF.set_override('max_json_body_size', 10, group='senlin_api',
enforce_type=True)
cfg.CONF.set_override('max_json_body_size', 10, group='senlin_api')
body = jsonutils.dumps(['a'] * cfg.CONF.senlin_api.max_json_body_size)
self.assertGreater(len(body), cfg.CONF.senlin_api.max_json_body_size)
obj = serializers.JSONRequestDeserializer()

View File

@ -87,7 +87,7 @@ class RequestContextMiddlewareTest(base.SenlinTestCase):
self.fixture.conf(args=['--config-dir', policy_path])
policy_opts.set_defaults(cfg.CONF)
cfg.CONF.set_override('policy_file', 'check_admin.json',
group='oslo_policy', enforce_type=True)
group='oslo_policy')
def test_context_middleware(self):
avr = vr.APIVersionRequest('1.0')

View File

@ -90,7 +90,7 @@ class FaultMiddlewareTest(base.SenlinTestCase):
def test_exception_with_non_ascii_chars(self):
# We set debug to true to test the code path for serializing traces too
cfg.CONF.set_override('debug', True, enforce_type=True)
cfg.CONF.set_override('debug', True)
msg = u'Error with non-ascii chars \x80'
class TestException(senlin_exc.SenlinException):
@ -110,7 +110,7 @@ class FaultMiddlewareTest(base.SenlinTestCase):
self.assertEqual('Internal Server Error', msg['title'])
def test_remote_exception(self):
cfg.CONF.set_override('debug', True, enforce_type=True)
cfg.CONF.set_override('debug', True)
error = senlin_exc.ResourceNotFound(type='cluster', id='a')
exc_info = (type(error), error, None)
serialized = rpc_common.serialize_remote_exception(exc_info)
@ -223,7 +223,7 @@ class FaultMiddlewareTest(base.SenlinTestCase):
self.assertEqual(expected, msg)
def test_should_not_ignore_parent_classes_even_for_remote_ones(self):
cfg.CONF.set_override('debug', True, enforce_type=True)
cfg.CONF.set_override('debug', True)
error = ClusterNotFoundChild(type='cluster', id='a')
exc_info = (type(error), error, None)

View File

@ -113,14 +113,13 @@ class TestWebhookMiddleware(base.SenlinTestCase):
@mock.patch.object(context, 'RequestContext')
@mock.patch.object(rpc, 'EngineClient')
def test_process_request(self, mock_client, mock_ctx, mock_parse):
cfg.CONF.set_override('auth_url', 'AUTH_URL', group='authentication',
enforce_type=True)
cfg.CONF.set_override('auth_url', 'AUTH_URL', group='authentication')
cfg.CONF.set_override('service_username', 'USERNAME',
group='authentication', enforce_type=True)
group='authentication')
cfg.CONF.set_override('service_user_domain', 'DOMAIN',
group='authentication', enforce_type=True)
group='authentication')
cfg.CONF.set_override('service_password', 'PASSWORD',
group='authentication', enforce_type=True)
group='authentication')
req = mock.Mock()
req.method = 'POST'

View File

@ -102,7 +102,7 @@ class SortParamTest(base.SenlinTestCase):
class ServiceAliveTest(base.SenlinTestCase):
def test_alive(self):
cfg.CONF.set_override('periodic_interval', 100, enforce_type=True)
cfg.CONF.set_override('periodic_interval', 100)
service = mock.Mock(updated_at=timeutils.utcnow())
res = utils.is_service_dead(service)
@ -110,7 +110,7 @@ class ServiceAliveTest(base.SenlinTestCase):
self.assertFalse(res)
def test_dead(self):
cfg.CONF.set_override('periodic_interval', 0, enforce_type=True)
cfg.CONF.set_override('periodic_interval', 0)
service = mock.Mock(updated_at=timeutils.utcnow())
res = utils.is_service_dead(service)

View File

@ -26,8 +26,7 @@ class TestSenlinDriver(base.SenlinTestCase):
plugin1.orchestration = 'Orchestration1'
env = environment.global_env()
env.register_driver('openstack_test', plugin1)
cfg.CONF.set_override('cloud_backend', 'openstack_test',
enforce_type=True)
cfg.CONF.set_override('cloud_backend', 'openstack_test')
sd = driver_base.SenlinDriver()

View File

@ -99,7 +99,7 @@ class TestHeatV1(base.SenlinTestCase):
stk, 'STATUS', [], 100, 200)
def test_wait_for_stack_default_timeout(self):
cfg.CONF.set_override('default_action_timeout', 361, enforce_type=True)
cfg.CONF.set_override('default_action_timeout', 361)
self.hc.wait_for_stack('FAKE_ID', 'STATUS', None, 100, None)
self.orch.find_stack.assert_called_once_with('FAKE_ID', False)
@ -126,7 +126,7 @@ class TestHeatV1(base.SenlinTestCase):
self.orch.find_stack.assert_called_once_with('stack_id', True)
def test_wait_for_server_delete_with_timeout(self):
cfg.CONF.set_override('default_action_timeout', 360, enforce_type=True)
cfg.CONF.set_override('default_action_timeout', 360)
fake_stack = mock.Mock(id='stack_id')
self.orch.find_stack.return_value = fake_stack

View File

@ -137,18 +137,17 @@ class TestKeystoneV3(base.SenlinTestCase):
self.assertEqual('abc', user_id)
def test_get_service_credentials(self, mock_create):
cfg.CONF.set_override('auth_url', 'FAKE_URL', group='authentication',
enforce_type=True)
cfg.CONF.set_override('auth_url', 'FAKE_URL', group='authentication')
cfg.CONF.set_override('service_username', 'FAKE_USERNAME',
group='authentication', enforce_type=True)
group='authentication')
cfg.CONF.set_override('service_password', 'FAKE_PASSWORD',
group='authentication', enforce_type=True)
group='authentication')
cfg.CONF.set_override('service_project_name', 'FAKE_PROJECT',
group='authentication', enforce_type=True)
group='authentication')
cfg.CONF.set_override('service_user_domain', 'FAKE_DOMAIN_1',
group='authentication', enforce_type=True)
group='authentication')
cfg.CONF.set_override('service_project_domain', 'FAKE_DOMAIN_2',
group='authentication', enforce_type=True)
group='authentication')
expected = {
'auth_url': 'FAKE_URL',
'username': 'FAKE_USERNAME',
@ -190,8 +189,7 @@ class TestKeystoneV3(base.SenlinTestCase):
self.assertEqual([], res)
def test_get_senlin_endpoint(self, mock_create):
cfg.CONF.set_override('default_region_name', 'RegionN',
enforce_type=True)
cfg.CONF.set_override('default_region_name', 'RegionN')
self.conn.session.get_endpoint.return_value = 'http://web.com:1234/v1'
mock_create.return_value = self.conn
kc = kv3.KeystoneClient({'k': 'v'})

View File

@ -355,7 +355,7 @@ class TestNovaV2(base.SenlinTestCase):
self.compute.wait_for_delete.assert_called_once_with('FOO', wait=120)
def test_wait_for_server_delete_with_default_timeout(self):
cfg.CONF.set_override('default_action_timeout', 360, enforce_type=True)
cfg.CONF.set_override('default_action_timeout', 360)
self.compute.find_server.return_value = 'FOO'
d = nova_v2.NovaClient(self.conn_params)

View File

@ -88,8 +88,8 @@ class TestMessage(base.SenlinTestCase):
sd.message.assert_called_once_with(params)
def test__generate_subscriber_url_host_provided(self):
cfg.CONF.set_override('host', 'web.com', 'receiver', enforce_type=True)
cfg.CONF.set_override('port', '1234', 'receiver', enforce_type=True)
cfg.CONF.set_override('host', 'web.com', 'receiver')
cfg.CONF.set_override('port', '1234', 'receiver')
message = mmod.Message('message', None, None, id=UUID)
res = message._generate_subscriber_url()
@ -161,8 +161,7 @@ class TestMessage(base.SenlinTestCase):
@mock.patch.object(mmod.Message, 'zaqar')
def test__create_queue(self, mock_zaqar):
cfg.CONF.set_override('max_message_size', 8192, 'receiver',
enforce_type=True)
cfg.CONF.set_override('max_message_size', 8192, 'receiver')
mock_zc = mock.Mock()
mock_zaqar.return_value = mock_zc
message = mmod.Message('message', None, None, id=UUID)
@ -180,8 +179,7 @@ class TestMessage(base.SenlinTestCase):
@mock.patch.object(mmod.Message, 'zaqar')
def test__create_queue_fail(self, mock_zaqar):
cfg.CONF.set_override('max_message_size', 8192, 'receiver',
enforce_type=True)
cfg.CONF.set_override('max_message_size', 8192, 'receiver')
mock_zc = mock.Mock()
mock_zaqar.return_value = mock_zc
message = mmod.Message('message', None, None, id=UUID)

View File

@ -291,8 +291,7 @@ class TestReceiver(base.SenlinTestCase):
@mock.patch.object(driver_base, "SenlinDriver")
def test__get_base_url_succeeded(self, mock_senlin_driver,
mock_get_service_creds):
cfg.CONF.set_override('default_region_name', 'RegionOne',
enforce_type=True)
cfg.CONF.set_override('default_region_name', 'RegionOne')
fake_driver = mock.Mock()
fake_kc = mock.Mock()
fake_cred = mock.Mock()
@ -315,8 +314,7 @@ class TestReceiver(base.SenlinTestCase):
@mock.patch.object(driver_base, "SenlinDriver")
def test__get_base_url_failed_get_endpoint_exception(
self, mock_senlin_driver, mock_get_service_creds):
cfg.CONF.set_override('default_region_name', 'RegionOne',
enforce_type=True)
cfg.CONF.set_override('default_region_name', 'RegionOne')
fake_driver = mock.Mock()
fake_kc = mock.Mock()
fake_cred = mock.Mock()

View File

@ -30,9 +30,8 @@ class TestWebhook(base.SenlinTestCase):
self.context = utils.dummy_context()
def test_initialize_channel_host_provided(self):
cfg.CONF.set_override('host', 'web.com', 'receiver',
enforce_type=True)
cfg.CONF.set_override('port', '1234', 'receiver', enforce_type=True)
cfg.CONF.set_override('host', 'web.com', 'receiver')
cfg.CONF.set_override('port', '1234', 'receiver')
webhook = wmod.Webhook('webhook', CLUSTER_ID, 'FAKE_ACTION',
id=UUID1)
channel = webhook.initialize_channel(self.context)
@ -76,8 +75,8 @@ class TestWebhook(base.SenlinTestCase):
self.assertEqual(expected, webhook.channel)
def test_initialize_channel_with_params(self):
cfg.CONF.set_override('host', 'web.com', 'receiver', enforce_type=True)
cfg.CONF.set_override('port', '1234', 'receiver', enforce_type=True)
cfg.CONF.set_override('host', 'web.com', 'receiver')
cfg.CONF.set_override('port', '1234', 'receiver')
webhook = wmod.Webhook(
'webhook', CLUSTER_ID, 'FAKE_ACTION',
id=UUID1, params={'KEY': 884, 'FOO': 'BAR'})

View File

@ -47,8 +47,7 @@ class ClusterTest(base.SenlinTestCase):
@mock.patch.object(co.Cluster, 'count_all')
def test_check_cluster_quota(self, mock_count):
mock_count.return_value = 10
cfg.CONF.set_override('max_clusters_per_project', 11,
enforce_type=True)
cfg.CONF.set_override('max_clusters_per_project', 11)
res = self.eng.check_cluster_quota(self.ctx)
@ -58,8 +57,7 @@ class ClusterTest(base.SenlinTestCase):
@mock.patch.object(co.Cluster, 'count_all')
def test_check_cluster_quota_failed(self, mock_count):
mock_count.return_value = 11
cfg.CONF.set_override('max_clusters_per_project', 11,
enforce_type=True)
cfg.CONF.set_override('max_clusters_per_project', 11)
ex = self.assertRaises(exc.Forbidden,
self.eng.check_cluster_quota, self.ctx)
@ -220,7 +218,7 @@ class ClusterTest(base.SenlinTestCase):
@mock.patch.object(service.EngineService, 'check_cluster_quota')
@mock.patch.object(co.Cluster, 'get_by_name')
def test_cluster_create_duplicate_name(self, mock_get, mock_quota):
cfg.CONF.set_override('name_unique', True, enforce_type=True)
cfg.CONF.set_override('name_unique', True)
mock_quota.return_value = None
mock_get.return_value = mock.Mock()
req = {'profile_id': 'PROFILE', 'name': 'CLUSTER'}

View File

@ -298,7 +298,7 @@ class NodeTest(base.SenlinTestCase):
@mock.patch.object(no.Node, 'get_by_name')
def test_node_create_name_conflict(self, mock_get):
cfg.CONF.set_override('name_unique', True, enforce_type=True)
cfg.CONF.set_override('name_unique', True)
mock_get.return_value = mock.Mock()
req = orno.NodeCreateRequestBody(name='NODE1',
profile_id='PROFILE_NAME')
@ -887,7 +887,7 @@ class NodeTest(base.SenlinTestCase):
@mock.patch.object(no.Node, 'get_by_name')
def test_node_adopt_name_not_unique(self, mock_get):
cfg.CONF.set_override('name_unique', True, enforce_type=True)
cfg.CONF.set_override('name_unique', True)
req = orno.NodeAdoptRequest(
name='FAKE_NAME', preview=False,
identity='FAKE_ID', type='FAKE_TYPE')

View File

@ -102,7 +102,7 @@ class PolicyTest(base.SenlinTestCase):
@mock.patch.object(po.Policy, 'get_by_name')
def test_policy_create_name_conflict(self, mock_get):
cfg.CONF.set_override('name_unique', True, enforce_type=True)
cfg.CONF.set_override('name_unique', True)
mock_get.return_value = mock.Mock()
spec = {

View File

@ -108,7 +108,7 @@ class ProfileTest(base.SenlinTestCase):
@mock.patch.object(po.Profile, 'get_by_name')
def test_profile_create_name_conflict(self, mock_get):
cfg.CONF.set_override('name_unique', True, enforce_type=True)
cfg.CONF.set_override('name_unique', True)
mock_get.return_value = mock.Mock()
spec = {

View File

@ -134,7 +134,7 @@ class ReceiverTest(base.SenlinTestCase):
@mock.patch.object(ro.Receiver, 'get_by_name')
def test_receiver_create_name_duplicated(self, mock_get):
cfg.CONF.set_override('name_unique', True, enforce_type=True)
cfg.CONF.set_override('name_unique', True)
# Return an existing instance
mock_get.return_value = mock.Mock()
req = orro.ReceiverCreateRequestBody(

View File

@ -107,7 +107,7 @@ class TestDispatcher(base.SenlinTestCase):
@mock.patch.object(context, 'get_current')
@mock.patch.object(messaging, 'get_rpc_client')
def test_notify_broadcast(self, mock_rpc, mock_get_current):
cfg.CONF.set_override('host', 'HOSTNAME', enforce_type=True)
cfg.CONF.set_override('host', 'HOSTNAME')
fake_ctx = mock.Mock()
mock_get_current.return_value = fake_ctx
mock_rpc.return_value = mock.Mock()
@ -124,7 +124,7 @@ class TestDispatcher(base.SenlinTestCase):
@mock.patch.object(context, 'get_current')
@mock.patch.object(messaging, 'get_rpc_client')
def test_notify_single_server(self, mock_rpc, mock_get_current):
cfg.CONF.set_override('host', 'HOSTNAME', enforce_type=True)
cfg.CONF.set_override('host', 'HOSTNAME')
fake_ctx = mock.Mock()
mock_get_current.return_value = fake_ctx
mock_rpc.return_value = mock.Mock()
@ -141,7 +141,7 @@ class TestDispatcher(base.SenlinTestCase):
@mock.patch.object(messaging, 'get_rpc_client')
def test_notify_timeout(self, mock_rpc):
cfg.CONF.set_override('host', 'HOSTNAME', enforce_type=True)
cfg.CONF.set_override('host', 'HOSTNAME')
mock_rpc.return_value = mock.Mock()
mock_client = mock_rpc.return_value
mock_context = mock_client.prepare.return_value

View File

@ -77,7 +77,7 @@ class TestEvent(testtools.TestCase):
res)
def test__dump(self):
cfg.CONF.set_override('debug', True, enforce_type=True)
cfg.CONF.set_override('debug', True)
saved_dispathers = event.dispatchers
event.dispatchers = mock.Mock()
action = mock.Mock(cause=consts.CAUSE_RPC)
@ -90,7 +90,7 @@ class TestEvent(testtools.TestCase):
event.dispatchers = saved_dispathers
def test__dump_without_timestamp(self):
cfg.CONF.set_override('debug', True, enforce_type=True)
cfg.CONF.set_override('debug', True)
saved_dispathers = event.dispatchers
event.dispatchers = mock.Mock()
action = mock.Mock(cause=consts.CAUSE_RPC)
@ -104,9 +104,8 @@ class TestEvent(testtools.TestCase):
event.dispatchers = saved_dispathers
def test__dump_guarded(self):
cfg.CONF.set_override('debug', False, enforce_type=True)
cfg.CONF.set_override('priority', 'warning', group='dispatchers',
enforce_type=True)
cfg.CONF.set_override('debug', False)
cfg.CONF.set_override('priority', 'warning', group='dispatchers')
saved_dispathers = event.dispatchers
event.dispatchers = mock.Mock()
action = mock.Mock(cause=consts.CAUSE_RPC)
@ -119,7 +118,7 @@ class TestEvent(testtools.TestCase):
def test__dump_exclude_derived_actions_positive(self):
cfg.CONF.set_override('exclude_derived_actions', True,
group='dispatchers', enforce_type=True)
group='dispatchers')
saved_dispathers = event.dispatchers
event.dispatchers = mock.Mock()
action = mock.Mock(cause=consts.CAUSE_DERIVED)
@ -132,7 +131,7 @@ class TestEvent(testtools.TestCase):
def test__dump_exclude_derived_actions_negative(self):
cfg.CONF.set_override('exclude_derived_actions', False,
group='dispatchers', enforce_type=True)
group='dispatchers')
saved_dispathers = event.dispatchers
event.dispatchers = mock.Mock()
action = mock.Mock(cause=consts.CAUSE_DERIVED)
@ -146,7 +145,7 @@ class TestEvent(testtools.TestCase):
event.dispatchers = saved_dispathers
def test__dump_with_exception(self):
cfg.CONF.set_override('debug', True, enforce_type=True)
cfg.CONF.set_override('debug', True)
saved_dispathers = event.dispatchers
event.dispatchers = mock.Mock()
event.dispatchers.map_method.side_effect = Exception('fab')

View File

@ -414,7 +414,7 @@ class TestListenerProc(base.SenlinTestCase):
mock_target, mock_novaendpoint,
mock_heatendpoint):
cfg.CONF.set_override('nova_control_exchange', 'FAKE_EXCHANGE',
group='health_manager', enforce_type=True)
group='health_manager')
x_listener = mock.Mock()
mock_listener.return_value = x_listener
@ -639,7 +639,7 @@ class TestHealthManager(base.SenlinTestCase):
@mock.patch.object(obj_cluster.Cluster, 'get')
def test__add_listener_nova(self, mock_cluster, mock_profile):
cfg.CONF.set_override('nova_control_exchange', 'FAKE_NOVA_EXCHANGE',
group='health_manager', enforce_type=True)
group='health_manager')
x_listener = mock.Mock()
mock_add_thread = self.patchobject(self.hm.TG, 'add_thread',
return_value=x_listener)
@ -664,7 +664,7 @@ class TestHealthManager(base.SenlinTestCase):
@mock.patch.object(obj_cluster.Cluster, 'get')
def test__add_listener_heat(self, mock_cluster, mock_profile):
cfg.CONF.set_override('heat_control_exchange', 'FAKE_HEAT_EXCHANGE',
group='health_manager', enforce_type=True)
group='health_manager')
x_listener = mock.Mock()
mock_add_thread = self.patchobject(self.hm.TG, 'add_thread',
return_value=x_listener)

View File

@ -150,8 +150,8 @@ class SchedulerTest(base.SenlinTestCase):
mock_action3, None]
mock_group = mock.Mock()
self.mock_tg.return_value = mock_group
cfg.CONF.set_override('max_actions_per_batch', 1, enforce_type=True)
cfg.CONF.set_override('batch_interval', 3, enforce_type=True)
cfg.CONF.set_override('max_actions_per_batch', 1)
cfg.CONF.set_override('batch_interval', 3)
tgm = scheduler.ThreadGroupManager()
tgm.start_action('4567')

View File

@ -428,21 +428,21 @@ class TestCapacity(TestField):
self.assertEqual('100', self.field.stringify('100'))
def test_init(self):
CONF.set_override('max_nodes_per_cluster', 300, enforce_type=True)
CONF.set_override('max_nodes_per_cluster', 300)
sot = senlin_fields.Capacity()
self.assertEqual(0, sot.minimum)
self.assertEqual(300, sot.maximum)
def test_init_with_values(self):
CONF.set_override('max_nodes_per_cluster', 300, enforce_type=True)
CONF.set_override('max_nodes_per_cluster', 300)
sot = senlin_fields.Capacity(2, 200)
self.assertEqual(2, sot.minimum)
self.assertEqual(200, sot.maximum)
def test_init_invalid(self):
CONF.set_override('max_nodes_per_cluster', 100, enforce_type=True)
CONF.set_override('max_nodes_per_cluster', 100)
ex = self.assertRaises(ValueError,
senlin_fields.Capacity,
@ -517,7 +517,7 @@ class TestCapacity(TestField):
)
def test_get_schema_default(self):
cfg.CONF.set_override('max_nodes_per_cluster', 100, enforce_type=True)
cfg.CONF.set_override('max_nodes_per_cluster', 100)
sot = senlin_fields.Capacity()
self.assertEqual(
{

View File

@ -397,7 +397,7 @@ class CheckSizeParamsTest(base.SenlinTestCase):
def setUp(self):
super(CheckSizeParamsTest, self).setUp()
cfg.CONF.set_override('max_nodes_per_cluster', 100, enforce_type=True)
cfg.CONF.set_override('max_nodes_per_cluster', 100)
def test_check_size_params(self):
cluster = mock.Mock()

View File

@ -109,14 +109,14 @@ class UrlFetchTest(base.SenlinTestCase):
def test_max_fetch_size_okay(self):
url = 'http://example.com/somedata'
data = '{ "foo": "bar" }'
cfg.CONF.set_override('max_response_size', 500, enforce_type=True)
cfg.CONF.set_override('max_response_size', 500)
self.patchobject(requests, 'get', return_value=Response(data))
utils.url_fetch(url)
def test_max_fetch_size_error(self):
url = 'http://example.com/somedata'
data = '{ "foo": "bar" }'
cfg.CONF.set_override('max_response_size', 5, enforce_type=True)
cfg.CONF.set_override('max_response_size', 5)
self.patchobject(requests, 'get', return_value=Response(data))
exception = self.assertRaises(utils.URLFetchError,
utils.url_fetch, url)