openstack/masakari
Code Issues Proposed changes

Set access_policy for messaging's dispatcher

Browse Source 
oslo.messaging allow dispatcher to restrict endpoint methods since
5.11.0 in d3a8f280ebd6fd12865fd20c4d772774e39aefa2, set with
DefaultRPCAccessPolicy to fix FutureWarning like:

FutureWarning: The access_policy argument is changing its default
value to <class 'oslo_messaging.rpc.dispatcher.DefaultRPCAccessPolicy'>
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.

Closes-Bug: 1662540
Change-Id: I36fdf6f568dc2a10891c9d89f8488038af6c2d00
This commit is contained in:
Dinesh Bhor
2017-02-04 17:08:45 +05:30
parent 6db17bc33a
commit 12ed4c37bd
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
masakari/rpc.py
View File

@@ -25,6 +25,7 @@ __all__ = [
] ]
import oslo_messaging as messaging import oslo_messaging as messaging
from oslo_messaging.rpc import dispatcher
import masakari.context import masakari.context
import masakari.exception import masakari.exception
@@ -104,12 +105,14 @@ def get_client(target, version_cap=None, serializer=None):
def get_server(target, endpoints, serializer=None): def get_server(target, endpoints, serializer=None):
assert TRANSPORT is not None assert TRANSPORT is not None
access_policy = dispatcher.DefaultRPCAccessPolicy
serializer = RequestContextSerializer(serializer) serializer = RequestContextSerializer(serializer)
return messaging.get_rpc_server(TRANSPORT, return messaging.get_rpc_server(TRANSPORT,
target, target,
endpoints, endpoints,
executor='eventlet', executor='eventlet',
serializer=serializer) serializer=serializer,
access_policy=access_policy)
class RPCAPI(object): class RPCAPI(object):

5
masakari/tests/unit/test_rpc.py
View File

@@ -14,6 +14,7 @@
import mock import mock
import oslo_messaging as messaging import oslo_messaging as messaging
from oslo_messaging.rpc import dispatcher
from masakari import context from masakari import context
from masakari import rpc from masakari import rpc
@@ -106,12 +107,14 @@ class RPCAPITestCase(test.TestCase):
ends = mock.Mock() ends = mock.Mock()
mock_ser.return_value = ser mock_ser.return_value = ser
mock_get.return_value = 'server' mock_get.return_value = 'server'
access_policy = dispatcher.DefaultRPCAccessPolicy
server = rpc.get_server(tgt, ends, serializer='foo') server = rpc.get_server(tgt, ends, serializer='foo')
mock_ser.assert_called_once_with('foo') mock_ser.assert_called_once_with('foo')
mock_get.assert_called_once_with(rpc.TRANSPORT, tgt, ends, mock_get.assert_called_once_with(rpc.TRANSPORT, tgt, ends,
executor='eventlet', serializer=ser) executor='eventlet', serializer=ser,
access_policy=access_policy)
self.assertEqual('server', server) self.assertEqual('server', server)

2
requirements.txt
View File

@@ -10,7 +10,7 @@ keystonemiddleware!=4.5.0,>=4.2.0 # Apache-2.0
microversion-parse>=0.1.2 # Apache-2.0 microversion-parse>=0.1.2 # Apache-2.0
oslo.config>=3.10.0 # Apache-2.0 oslo.config>=3.10.0 # Apache-2.0
oslo.db>=4.1.0 # Apache-2.0 oslo.db>=4.1.0 # Apache-2.0
oslo.messaging>=5.2.0 # Apache-2.0 oslo.messaging>=5.11.0 # Apache-2.0
oslo.i18n>=2.1.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0
oslo.log>=1.14.0 # Apache-2.0 oslo.log>=1.14.0 # Apache-2.0
oslo.middleware>=3.0.0 # Apache-2.0 oslo.middleware>=3.0.0 # Apache-2.0