diff options
| author | Yuichi Ito <ito.yuichi0@gmail.com> | 2014-03-28 13:12:29 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2014-03-30 10:42:46 +0900 |
| commit | ee78b872672f810bd896a2ada5664ba3b9d3b562 (patch) | |
| tree | 5e067637fa14ea4224549ffa7fcc16c95a1e204a | |
| parent | 35d5104a3d4f6d488d2af9536d75a623b161eb05 (diff) | |
sw test tool: Rename STATE_INIT to STATE_INIT_FLOW
And rename _test_initialize() to _test_initialize_flow().
Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka1@gmail.com>
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.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ryu/tests/switch/tester.py b/ryu/tests/switch/tester.py index 3dc58f6a..1a119e0e 100644 --- a/ryu/tests/switch/tester.py +++ b/ryu/tests/switch/tester.py @@ -93,7 +93,7 @@ KEY_PKT_IN = 'PACKET_IN' KEY_TBL_MISS = 'table-miss' # Test state. -STATE_INIT = 0 +STATE_INIT_FLOW = 0 STATE_FLOW_INSTALL = 1 STATE_FLOW_EXIST_CHK = 2 STATE_TARGET_PKT_COUNT = 3 @@ -120,7 +120,7 @@ ERROR = 1 TIMEOUT = 2 RCV_ERR = 3 -MSG = {STATE_INIT: +MSG = {STATE_INIT_FLOW: {TIMEOUT: 'Failed to initialize flow tables: barrier request timeout.', RCV_ERR: 'Failed to initialize flow tables: %(err_msg)s'}, STATE_FLOW_INSTALL: @@ -206,7 +206,7 @@ class OfTester(app_manager.RyuApp): self.target_sw = TargetSw(DummyDatapath(), self.logger) self.tester_sw = TesterSw(DummyDatapath(), self.logger) - self.state = STATE_INIT + self.state = STATE_INIT_FLOW self.sw_waiter = None self.waiter = None self.send_msg_xids = [] @@ -321,7 +321,7 @@ class OfTester(app_manager.RyuApp): # Test execute. try: # 0. Initialize. - self._test(STATE_INIT) + self._test(STATE_INIT_FLOW) # 1. Install flows. for flow in test.prerequisite: self._test(STATE_FLOW_INSTALL, flow) @@ -394,7 +394,7 @@ class OfTester(app_manager.RyuApp): TEST_OK, ok_count, TEST_ERROR, error_count) def _test(self, state, *args): - test = {STATE_INIT: self._test_initialize, + test = {STATE_INIT_FLOW: self._test_initialize_flow, STATE_FLOW_INSTALL: self._test_flow_install, STATE_FLOW_EXIST_CHK: self._test_flow_exist_check, STATE_TARGET_PKT_COUNT: self._test_get_packet_count, @@ -411,7 +411,7 @@ class OfTester(app_manager.RyuApp): self.state = state return test[state](*args) - def _test_initialize(self): + def _test_initialize_flow(self): xid = self.target_sw.del_test_flow() self.send_msg_xids.append(xid) @@ -694,7 +694,7 @@ class OfTester(app_manager.RyuApp): @set_ev_cls(ofp_event.EventOFPBarrierReply, handler.MAIN_DISPATCHER) def barrier_reply_handler(self, ev): - state_list = [STATE_INIT, + state_list = [STATE_INIT_FLOW, STATE_FLOW_INSTALL, STATE_UNMATCH_PKT_SEND] if self.state in state_list: |