From 0f087cefebfa570f9b3ef2e709107ab528143a09 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Wed, 12 Feb 2014 10:34:33 +0900 Subject: [PATCH] apgw: fix log for bogus RPC write to the proper logger. Signed-off-by: FUJITA Tomonori --- ryu/controller/api.py | 2 +- ryu/tests/unit/app/test_apgw_rpc.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ryu/controller/api.py b/ryu/controller/api.py index 30398f45..373b7259 100644 --- a/ryu/controller/api.py +++ b/ryu/controller/api.py @@ -107,7 +107,7 @@ class RpcOFPManager(app_manager.RyuApp): d[e.xid] = e.msgid continue except: - logger.info(_({'bogus RPC': data})) + self.logger.info(_({'bogus RPC': data})) peer._endpoint.send_response(msgid, error=error, result=result) diff --git a/ryu/tests/unit/app/test_apgw_rpc.py b/ryu/tests/unit/app/test_apgw_rpc.py index e1042804..a11a3281 100644 --- a/ryu/tests/unit/app/test_apgw_rpc.py +++ b/ryu/tests/unit/app/test_apgw_rpc.py @@ -569,6 +569,12 @@ class TestRpcOFPManager(unittest.TestCase): m._handler_datapath(ev) eq_(len(peer.wait_for_ofp_resepnse), 0) + # bogus RPC + with hub.Timeout(2): + m._rpc_events.put((peer, rpc.MessageType.REQUEST, + (msgid, 'you'))) + hub.sleep(0.5) + def test_rpc_message_thread_12(self): self._test_rpc_message_thread(ofproto_v1_2, ofproto_v1_2_parser)