From b211ff4e06286601ffc6ae38df17ed847dda90e8 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 27 May 2025 14:24:16 +0900 Subject: [PATCH] Drop explicit executor argument The argument was deprecated in oslo.messaging 16.0.0, as part of huge deprecation of eventlet support. If the argument is not set, the appropriate executor is selected according to whether eventlet monkey patching is done or not. Change-Id: Ib53d53d9ce74453f568bda785b08df656b8ab109 --- designate/rpc.py | 2 -- designate/tests/unit/test_rpc.py | 12 ++++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/designate/rpc.py b/designate/rpc.py index 5d9ccb5f1..5976062a9 100644 --- a/designate/rpc.py +++ b/designate/rpc.py @@ -199,7 +199,6 @@ def get_server(target, endpoints, serializer=None): TRANSPORT, target, endpoints, - executor='eventlet', serializer=serializer, access_policy=access_policy ) @@ -214,7 +213,6 @@ def get_notification_listener(targets, endpoints, serializer=None, pool=None): NOTIFICATION_TRANSPORT, targets, endpoints, - executor='eventlet', pool=pool, serializer=serializer ) diff --git a/designate/tests/unit/test_rpc.py b/designate/tests/unit/test_rpc.py index 438fd9a46..4120de621 100644 --- a/designate/tests/unit/test_rpc.py +++ b/designate/tests/unit/test_rpc.py @@ -177,7 +177,7 @@ class RPCTest(oslotest.base.BaseTestCase): mock_get_rpc_server.assert_called_with( True, None, None, - executor='eventlet', serializer=mock.ANY, + serializer=mock.ANY, access_policy=mock.ANY, ) @@ -213,19 +213,19 @@ class RPCTest(oslotest.base.BaseTestCase): rpc.get_notification_listener('target', 'endpoint', serializer=None) mock_get_notification_listener.assert_called_with( - True, 'target', 'endpoint', executor='eventlet', pool=None, - serializer=mock.ANY + True, 'target', 'endpoint', pool=None, serializer=mock.ANY ) @mock.patch.object(designate.rpc, 'NOTIFICATION_TRANSPORT', True) @mock.patch.object(messaging, 'get_notification_listener') def test_get_notification_listener_serializer_set(self, mock_get_notification_listener): - rpc.get_notification_listener('target', 'endpoint', serializer=True) + serializer = mock.Mock() + rpc.get_notification_listener('target', 'endpoint', + serializer=serializer) mock_get_notification_listener.assert_called_with( - True, 'target', 'endpoint', executor='eventlet', pool=None, - serializer=True + True, 'target', 'endpoint', pool=None, serializer=serializer ) @mock.patch.object(designate.rpc, 'NOTIFICATION_TRANSPORT', None)