diff --git a/magnum/common/rpc.py b/magnum/common/rpc.py index 4bfe830372..80ce262fab 100644 --- a/magnum/common/rpc.py +++ b/magnum/common/rpc.py @@ -146,11 +146,9 @@ def get_client(target, version_cap=None, serializer=None, timeout=None): serializer = ProfilerRequestContextSerializer(serializer) else: serializer = RequestContextSerializer(serializer) - return messaging.RPCClient(TRANSPORT, - target, - version_cap=version_cap, - serializer=serializer, - timeout=timeout) + return messaging.get_rpc_client( + TRANSPORT, target, version_cap=version_cap, + serializer=serializer, timeout=timeout) def get_server(target, endpoints, serializer=None): diff --git a/magnum/tests/unit/common/test_rpc.py b/magnum/tests/unit/common/test_rpc.py index 71a981103b..f311079fb5 100644 --- a/magnum/tests/unit/common/test_rpc.py +++ b/magnum/tests/unit/common/test_rpc.py @@ -27,38 +27,38 @@ from magnum.tests import base class TestRpc(base.TestCase): @mock.patch.object(rpc, 'profiler', None) @mock.patch.object(rpc, 'RequestContextSerializer') - @mock.patch.object(messaging, 'RPCClient') - def test_get_client(self, mock_client, mock_ser): + @mock.patch.object(messaging, 'get_rpc_client') + def test_get_client(self, mock_get, mock_ser): rpc.TRANSPORT = mock.Mock() tgt = mock.Mock() ser = mock.Mock() - mock_client.return_value = 'client' + mock_get.return_value = 'client' mock_ser.return_value = ser client = rpc.get_client(tgt, version_cap='1.0', serializer=ser, timeout=6969) - mock_client.assert_called_once_with(rpc.TRANSPORT, - tgt, version_cap='1.0', - serializer=ser, timeout=6969) + mock_get.assert_called_once_with(rpc.TRANSPORT, + tgt, version_cap='1.0', + serializer=ser, timeout=6969) self.assertEqual('client', client) @mock.patch.object(rpc, 'profiler', mock.Mock()) @mock.patch.object(rpc, 'ProfilerRequestContextSerializer') - @mock.patch.object(messaging, 'RPCClient') - def test_get_client_profiler_enabled(self, mock_client, mock_ser): + @mock.patch.object(messaging, 'get_rpc_client') + def test_get_client_profiler_enabled(self, mock_get, mock_ser): rpc.TRANSPORT = mock.Mock() tgt = mock.Mock() ser = mock.Mock() - mock_client.return_value = 'client' + mock_get.return_value = 'client' mock_ser.return_value = ser client = rpc.get_client(tgt, version_cap='1.0', serializer=ser, timeout=6969) - mock_client.assert_called_once_with(rpc.TRANSPORT, - tgt, version_cap='1.0', - serializer=ser, timeout=6969) + mock_get.assert_called_once_with(rpc.TRANSPORT, + tgt, version_cap='1.0', + serializer=ser, timeout=6969) self.assertEqual('client', client) @mock.patch.object(rpc, 'profiler', None) diff --git a/requirements.txt b/requirements.txt index d1d027e0f6..ce2fc712d0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -29,7 +29,7 @@ oslo.context>=3.1.0 # Apache-2.0 oslo.db>=8.2.0 # Apache-2.0 oslo.i18n>=5.0.0 # Apache-2.0 oslo.log>=4.2.0 # Apache-2.0 -oslo.messaging>=12.2.0 # Apache-2.0 +oslo.messaging>=14.1.0 # Apache-2.0 oslo.middleware>=4.1.0 # Apache-2.0 oslo.policy>=3.6.0 # Apache-2.0 oslo.reports>=2.1.0 # Apache-2.0