Use new get_rpc_client API from oslo.messaging
Use the new API that is consistent with the existing API instead of instantiating the client class directly. This was introduced in release 14.1.0 here [1] and added into oslo.messaging here [2] [1] https://review.opendev.org/c/openstack/requirements/+/869340 [2] https://review.opendev.org/c/openstack/oslo.messaging/+/862419 Change-Id: I4db6bbbbdc2f311f4c159b2d4f9992cfdbdafac4
This commit is contained in:
parent
a8a6a37c52
commit
c28760c8ac
|
@ -146,11 +146,9 @@ def get_client(target, version_cap=None, serializer=None, timeout=None):
|
||||||
serializer = ProfilerRequestContextSerializer(serializer)
|
serializer = ProfilerRequestContextSerializer(serializer)
|
||||||
else:
|
else:
|
||||||
serializer = RequestContextSerializer(serializer)
|
serializer = RequestContextSerializer(serializer)
|
||||||
return messaging.RPCClient(TRANSPORT,
|
return messaging.get_rpc_client(
|
||||||
target,
|
TRANSPORT, target, version_cap=version_cap,
|
||||||
version_cap=version_cap,
|
serializer=serializer, timeout=timeout)
|
||||||
serializer=serializer,
|
|
||||||
timeout=timeout)
|
|
||||||
|
|
||||||
|
|
||||||
def get_server(target, endpoints, serializer=None):
|
def get_server(target, endpoints, serializer=None):
|
||||||
|
|
|
@ -27,38 +27,38 @@ from magnum.tests import base
|
||||||
class TestRpc(base.TestCase):
|
class TestRpc(base.TestCase):
|
||||||
@mock.patch.object(rpc, 'profiler', None)
|
@mock.patch.object(rpc, 'profiler', None)
|
||||||
@mock.patch.object(rpc, 'RequestContextSerializer')
|
@mock.patch.object(rpc, 'RequestContextSerializer')
|
||||||
@mock.patch.object(messaging, 'RPCClient')
|
@mock.patch.object(messaging, 'get_rpc_client')
|
||||||
def test_get_client(self, mock_client, mock_ser):
|
def test_get_client(self, mock_get, mock_ser):
|
||||||
rpc.TRANSPORT = mock.Mock()
|
rpc.TRANSPORT = mock.Mock()
|
||||||
tgt = mock.Mock()
|
tgt = mock.Mock()
|
||||||
ser = mock.Mock()
|
ser = mock.Mock()
|
||||||
mock_client.return_value = 'client'
|
mock_get.return_value = 'client'
|
||||||
mock_ser.return_value = ser
|
mock_ser.return_value = ser
|
||||||
|
|
||||||
client = rpc.get_client(tgt, version_cap='1.0', serializer=ser,
|
client = rpc.get_client(tgt, version_cap='1.0', serializer=ser,
|
||||||
timeout=6969)
|
timeout=6969)
|
||||||
|
|
||||||
mock_client.assert_called_once_with(rpc.TRANSPORT,
|
mock_get.assert_called_once_with(rpc.TRANSPORT,
|
||||||
tgt, version_cap='1.0',
|
tgt, version_cap='1.0',
|
||||||
serializer=ser, timeout=6969)
|
serializer=ser, timeout=6969)
|
||||||
self.assertEqual('client', client)
|
self.assertEqual('client', client)
|
||||||
|
|
||||||
@mock.patch.object(rpc, 'profiler', mock.Mock())
|
@mock.patch.object(rpc, 'profiler', mock.Mock())
|
||||||
@mock.patch.object(rpc, 'ProfilerRequestContextSerializer')
|
@mock.patch.object(rpc, 'ProfilerRequestContextSerializer')
|
||||||
@mock.patch.object(messaging, 'RPCClient')
|
@mock.patch.object(messaging, 'get_rpc_client')
|
||||||
def test_get_client_profiler_enabled(self, mock_client, mock_ser):
|
def test_get_client_profiler_enabled(self, mock_get, mock_ser):
|
||||||
rpc.TRANSPORT = mock.Mock()
|
rpc.TRANSPORT = mock.Mock()
|
||||||
tgt = mock.Mock()
|
tgt = mock.Mock()
|
||||||
ser = mock.Mock()
|
ser = mock.Mock()
|
||||||
mock_client.return_value = 'client'
|
mock_get.return_value = 'client'
|
||||||
mock_ser.return_value = ser
|
mock_ser.return_value = ser
|
||||||
|
|
||||||
client = rpc.get_client(tgt, version_cap='1.0', serializer=ser,
|
client = rpc.get_client(tgt, version_cap='1.0', serializer=ser,
|
||||||
timeout=6969)
|
timeout=6969)
|
||||||
|
|
||||||
mock_client.assert_called_once_with(rpc.TRANSPORT,
|
mock_get.assert_called_once_with(rpc.TRANSPORT,
|
||||||
tgt, version_cap='1.0',
|
tgt, version_cap='1.0',
|
||||||
serializer=ser, timeout=6969)
|
serializer=ser, timeout=6969)
|
||||||
self.assertEqual('client', client)
|
self.assertEqual('client', client)
|
||||||
|
|
||||||
@mock.patch.object(rpc, 'profiler', None)
|
@mock.patch.object(rpc, 'profiler', None)
|
||||||
|
|
|
@ -29,7 +29,7 @@ oslo.context>=3.1.0 # Apache-2.0
|
||||||
oslo.db>=8.2.0 # Apache-2.0
|
oslo.db>=8.2.0 # Apache-2.0
|
||||||
oslo.i18n>=5.0.0 # Apache-2.0
|
oslo.i18n>=5.0.0 # Apache-2.0
|
||||||
oslo.log>=4.2.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.middleware>=4.1.0 # Apache-2.0
|
||||||
oslo.policy>=3.6.0 # Apache-2.0
|
oslo.policy>=3.6.0 # Apache-2.0
|
||||||
oslo.reports>=2.1.0 # Apache-2.0
|
oslo.reports>=2.1.0 # Apache-2.0
|
||||||
|
|
Loading…
Reference in New Issue