summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYuichi Ito <ito.yuichi0@gmail.com>2014-05-21 17:20:13 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2014-05-21 17:50:51 +0900
commitfea1f610aa3c1c09cd976c1442f6b8e32e96b2b5 (patch)
tree262f49b45e47f2b976061a6f411faf6c018d05c0
parentf27768650ee4e3f3bd7d932ab0179833e67c3194 (diff)
sw test tool: Remove an unnecessary wrapper method
Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/tests/switch/tester.py5
1 files changed, 1 insertions, 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)