diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-09-26 14:19:54 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-09-26 14:19:54 +0000 |
commit | a9d10d33cd51387df78a551a4c85fd24a0539e28 (patch) | |
tree | 8b59704dbf5506bedaf3118204fbd0742afc82dc | |
parent | 6efa86a8d55262349a797f1573fc364c439b7ffa (diff) | |
parent | 3a9c01ffe9fa0095c594ed219471e9f78fa25d59 (diff) | |
download | oslo-messaging-5.33.0.tar.gz |
Merge "Fix default value of RPC dispatcher access_policy"5.33.0
-rw-r--r-- | oslo_messaging/rpc/dispatcher.py | 4 | ||||
-rw-r--r-- | oslo_messaging/rpc/server.py | 13 | ||||
-rw-r--r-- | oslo_messaging/tests/rpc/test_server.py | 1 | ||||
-rw-r--r-- | releasenotes/notes/fix-access_policy-deafult-a6954a147cb002b0.yaml | 5 |
4 files changed, 7 insertions, 16 deletions
diff --git a/oslo_messaging/rpc/dispatcher.py b/oslo_messaging/rpc/dispatcher.py index fe82f27..fda20fe 100644 --- a/oslo_messaging/rpc/dispatcher.py +++ b/oslo_messaging/rpc/dispatcher.py @@ -170,9 +170,7 @@ class RPCDispatcher(dispatcher.DispatcherBase): raise TypeError('access_policy must be a subclass of ' 'RPCAccessPolicyBase') else: - # TODO(pvinci): Change to DefaultRPCAccessPolicy when setting to - # DefaultRCPAccessPolicy no longer breaks in tempest tests. - self.access_policy = LegacyRPCAccessPolicy() + self.access_policy = DefaultRPCAccessPolicy() @staticmethod def _is_namespace(target, namespace): diff --git a/oslo_messaging/rpc/server.py b/oslo_messaging/rpc/server.py index b91fffe..18d5869 100644 --- a/oslo_messaging/rpc/server.py +++ b/oslo_messaging/rpc/server.py @@ -130,8 +130,6 @@ __all__ = [ import logging import sys -from debtcollector.updating import updated_kwarg_default_value - from oslo_messaging._i18n import _LE from oslo_messaging.rpc import dispatcher as rpc_dispatcher from oslo_messaging import server as msg_server @@ -187,15 +185,6 @@ class RPCServer(msg_server.MessageHandlingServer): del failure -@updated_kwarg_default_value('access_policy', None, - rpc_dispatcher.DefaultRPCAccessPolicy, - message='access_policy defaults to ' - 'LegacyRPCAccessPolicy which ' - 'exposes private methods. Explicitly ' - 'set access_policy to ' - 'DefaultRPCAccessPolicy or ' - 'ExplicitRPCAccessPolicy.', - version='?') def get_rpc_server(transport, target, endpoints, executor='blocking', serializer=None, access_policy=None): """Construct an RPC server. @@ -212,7 +201,7 @@ def get_rpc_server(transport, target, endpoints, :param serializer: an optional entity serializer :type serializer: Serializer :param access_policy: an optional access policy. - Defaults to LegacyRPCAccessPolicy + Defaults to DefaultRPCAccessPolicy :type access_policy: RPCAccessPolicyBase """ dispatcher = rpc_dispatcher.RPCDispatcher(endpoints, serializer, diff --git a/oslo_messaging/tests/rpc/test_server.py b/oslo_messaging/tests/rpc/test_server.py index e720e6b..693e88a 100644 --- a/oslo_messaging/tests/rpc/test_server.py +++ b/oslo_messaging/tests/rpc/test_server.py @@ -158,7 +158,6 @@ class TestRPCServer(test_utils.BaseTestCase, ServerSetupMixin): oslo_messaging.get_rpc_server(transport, target, endpoints, serializer=serializer) self.assertEqual([ - mock.call(mock.ANY, category=FutureWarning, stacklevel=3), mock.call("blocking executor is deprecated. Executor default will " "be removed. Use explicitly threading or eventlet " "instead in version 'pike' and will be removed in " diff --git a/releasenotes/notes/fix-access_policy-deafult-a6954a147cb002b0.yaml b/releasenotes/notes/fix-access_policy-deafult-a6954a147cb002b0.yaml new file mode 100644 index 0000000..7e7c8d1 --- /dev/null +++ b/releasenotes/notes/fix-access_policy-deafult-a6954a147cb002b0.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Change the default value of RPC dispatcher access_policy + to DefaultRPCAccessPolicy. |