From 81f2d6c3ff95a2ee657edb515a21c24c0db42652 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 22 Feb 2017 13:29:24 +0000 Subject: [PATCH] Switched rpc access policy to DefaultRPCAccessPolicy This should get rid of the following deprecation message: FutureWarning: The access_policy argument is changing its default value to in version '?', please update the code to explicitly set None as the value: access_policy defaults to LegacyRPCAccessPolicy which exposes private methods. Explicitly set access_policy to DefaultRPCAccessPolicy or ExplicitRPCAccessPolicy. BTW the previous attempt [1] to get rid of the message was ineffective. That's because the library does not distinguish between access_policy explicitly picked by method consumer, and access_policy using the default keyword value. NeuttronLibImpact this change will break plugins that may expose RPC endpoints that are prefixed with an underscore. [1] Ia8922baf422ee84e55f05534678b2f0377843688 Change-Id: Ia2498eb5079050bfb4741c8b6c259bf1c116b8d6 --- neutron/common/rpc.py | 2 +- neutron/tests/unit/common/test_rpc.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neutron/common/rpc.py b/neutron/common/rpc.py index 5d801448d3d..57e271d79d3 100644 --- a/neutron/common/rpc.py +++ b/neutron/common/rpc.py @@ -172,7 +172,7 @@ def get_client(target, version_cap=None, serializer=None): def get_server(target, endpoints, serializer=None): assert TRANSPORT is not None serializer = RequestContextSerializer(serializer) - access_policy = dispatcher.LegacyRPCAccessPolicy + access_policy = dispatcher.DefaultRPCAccessPolicy return oslo_messaging.get_rpc_server(TRANSPORT, target, endpoints, 'eventlet', serializer, access_policy=access_policy) diff --git a/neutron/tests/unit/common/test_rpc.py b/neutron/tests/unit/common/test_rpc.py index 2a011e17f11..494f80ebc68 100644 --- a/neutron/tests/unit/common/test_rpc.py +++ b/neutron/tests/unit/common/test_rpc.py @@ -168,7 +168,7 @@ class TestRPC(base.DietTestCase): server = rpc.get_server(tgt, ends, serializer='foo') mock_ser.assert_called_once_with('foo') - access_policy = dispatcher.LegacyRPCAccessPolicy + access_policy = dispatcher.DefaultRPCAccessPolicy mock_get.assert_called_once_with(rpc.TRANSPORT, tgt, ends, 'eventlet', ser, access_policy=access_policy)