diff --git a/nova/rpc.py b/nova/rpc.py index b0d915adc4a8..dacb6ccb9288 100644 --- a/nova/rpc.py +++ b/nova/rpc.py @@ -30,6 +30,7 @@ import functools from oslo_log import log as logging import oslo_messaging as messaging +from oslo_messaging.rpc import dispatcher from oslo_serialization import jsonutils from oslo_service import periodic_task from oslo_utils import importutils @@ -205,12 +206,13 @@ def get_server(target, endpoints, serializer=None): serializer = ProfilerRequestContextSerializer(serializer) else: serializer = RequestContextSerializer(serializer) - + access_policy = dispatcher.DefaultRPCAccessPolicy return messaging.get_rpc_server(TRANSPORT, target, endpoints, executor='eventlet', - serializer=serializer) + serializer=serializer, + access_policy=access_policy) def get_notifier(service, host=None, publisher_id=None): diff --git a/nova/tests/unit/test_rpc.py b/nova/tests/unit/test_rpc.py index 3f50efec2118..a265d45cbd1a 100644 --- a/nova/tests/unit/test_rpc.py +++ b/nova/tests/unit/test_rpc.py @@ -17,6 +17,7 @@ import datetime import fixtures import mock import oslo_messaging as messaging +from oslo_messaging.rpc import dispatcher from oslo_serialization import jsonutils from oslo_utils import fixture as utils_fixture import testtools @@ -214,8 +215,10 @@ class TestRPC(testtools.TestCase): server = rpc.get_server(tgt, ends, serializer='foo') mock_ser.assert_called_once_with('foo') + access_policy = dispatcher.DefaultRPCAccessPolicy 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) @mock.patch.object(rpc, 'profiler', mock.Mock()) @@ -250,8 +253,10 @@ class TestRPC(testtools.TestCase): server = rpc.get_server(tgt, ends, serializer='foo') mock_ser.assert_called_once_with('foo') + access_policy = dispatcher.DefaultRPCAccessPolicy 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) def test_get_notifier(self):