From c6c68ba00bfb0d8c1640ff8ac00b1fc2818d4524 Mon Sep 17 00:00:00 2001 From: Chris Friesen Date: Fri, 17 Mar 2017 10:30:24 -0600 Subject: [PATCH] remove unused parameter in rpc call The oslo.messaging rpc client call() method does not actually make any use of a "timeout" parameter, so drop it from the call. (It's actually set up in the preceeding prepare() call.) Change-Id: I662948cbb0c1fb89d8cb1e1ffad1909dc5b1dc68 --- nova/cells/rpcapi.py | 3 +-- nova/tests/unit/cells/test_cells_rpcapi.py | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/nova/cells/rpcapi.py b/nova/cells/rpcapi.py index 6eead9ce6b27..b9071c7ad5eb 100644 --- a/nova/cells/rpcapi.py +++ b/nova/cells/rpcapi.py @@ -328,8 +328,7 @@ class CellsAPI(object): return cctxt.call(ctxt, 'proxy_rpc_to_manager', topic=topic, rpc_message=rpc_message, - call=call, - timeout=timeout) + call=call) def task_log_get_all(self, ctxt, task_name, period_beginning, period_ending, host=None, state=None): diff --git a/nova/tests/unit/cells/test_cells_rpcapi.py b/nova/tests/unit/cells/test_cells_rpcapi.py index dafe6bfce999..6b372e4a847e 100644 --- a/nova/tests/unit/cells/test_cells_rpcapi.py +++ b/nova/tests/unit/cells/test_cells_rpcapi.py @@ -317,11 +317,10 @@ class CellsAPITestCase(test.NoDBTestCase): call_info = self._stub_rpc_method('call', 'fake_response') result = self.cells_rpcapi.proxy_rpc_to_manager( self.fake_context, rpc_message='fake-msg', - topic='fake-topic', call=True, timeout=-1) + topic='fake-topic', call=True) expected_args = {'rpc_message': 'fake-msg', 'topic': 'fake-topic', - 'call': True, - 'timeout': -1} + 'call': True} self._check_result(call_info, 'proxy_rpc_to_manager', expected_args, version='1.2')