From fea1f610aa3c1c09cd976c1442f6b8e32e96b2b5 Mon Sep 17 00:00:00 2001 From: Yuichi Ito Date: Wed, 21 May 2014 17:20:13 +0900 Subject: [PATCH] sw test tool: Remove an unnecessary wrapper method Signed-off-by: Yuichi Ito Signed-off-by: FUJITA Tomonori --- ryu/tests/switch/tester.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ryu/tests/switch/tester.py b/ryu/tests/switch/tester.py index c3830fc1..7468c74c 100644 --- a/ryu/tests/switch/tester.py +++ b/ryu/tests/switch/tester.py @@ -492,7 +492,7 @@ class OfTester(app_manager.RyuApp): def _test(self, state, *args): test = {STATE_INIT_FLOW: self._test_initialize_flow, STATE_INIT_THROUGHPUT_FLOW: self._test_initialize_flow_tester, - STATE_INIT_METER: self._test_initialize_meter, + STATE_INIT_METER: self.target_sw.del_test_meter, STATE_FLOW_INSTALL: self._test_msg_install, STATE_THROUGHPUT_FLOW_INSTALL: self._test_msg_install, STATE_METER_INSTALL: self._test_msg_install, @@ -539,9 +539,6 @@ class OfTester(app_manager.RyuApp): msg = self.rcv_msgs[0] assert isinstance(msg, ofproto_v1_3_parser.OFPBarrierReply) - def _test_initialize_meter(self): - self.target_sw.del_test_meter() - def _test_msg_install(self, datapath, message): xid = datapath.send_msg(message) self.send_msg_xids.append(xid)