diff options
| -rw-r--r-- | ryu/tests/integrated/test_request_reply_v12.py | 28 | ||||
| -rw-r--r-- | ryu/tests/integrated/tester.py | 16 |
2 files changed, 14 insertions, 30 deletions
diff --git a/ryu/tests/integrated/test_request_reply_v12.py b/ryu/tests/integrated/test_request_reply_v12.py index e907c361..14aada4a 100644 --- a/ryu/tests/integrated/test_request_reply_v12.py +++ b/ryu/tests/integrated/test_request_reply_v12.py @@ -42,21 +42,13 @@ class RunTest(tester.TestFlowBase): super(RunTest, self).__init__(*args, **kwargs) self._verify = None - self.ready = 0 - self.capabilities = None self.n_tables = ofproto_v1_2.OFPTT_MAX - self.table_stats = None def start_next_test(self, dp): self._verify = None self.delete_all_flows(dp) dp.send_barrier() if len(self.pending): - if not self.ready: - # Get supported capabilities. - self.get_supported(dp) - return - t = self.pending.pop() if self.is_supported(t): LOG.info(tester.LOG_TEST_START, t) @@ -1017,12 +1009,7 @@ class RunTest(tester.TestFlowBase): @set_ev_cls(ofp_event.EventOFPSwitchFeatures, MAIN_DISPATCHER) def features_replay_handler(self, ev): if self.current is None: - msg = ev.msg - dp = msg.datapath - self.capabilities = ev.msg.capabilities - if self.n_tables > msg.n_tables: - self.n_tables = msg.n_tables - self.start_next_test(ev.msg.datapath) + pass else: self.run_verify(ev) @@ -1054,19 +1041,6 @@ class RunTest(tester.TestFlowBase): if self.current.find('error') > 0: self.run_verify(ev) - def get_supported(self, dp): - if self.capabilities is None: - m = dp.ofproto_parser.OFPFeaturesRequest(dp) - dp.send_msg(m) - elif (self.capabilities & dp.ofproto.OFPC_TABLE_STATS > 0 and - self.table_stats is None): - self._verify = dp.ofproto.OFPST_TABLE - m = dp.ofproto_parser.OFPTableStatsRequest(dp) - dp.send_msg(m) - else: - self.ready = 1 - self.start_next_test(dp) - def is_supported(self, t): unsupported = [ ] diff --git a/ryu/tests/integrated/tester.py b/ryu/tests/integrated/tester.py index 11cf49ad..9538e1d1 100644 --- a/ryu/tests/integrated/tester.py +++ b/ryu/tests/integrated/tester.py @@ -37,7 +37,8 @@ LOG = logging.getLogger(__name__) LOG_TEST_START = 'TEST_START: %s' LOG_TEST_RESULTS = 'TEST_RESULTS:' -LOG_TEST_FINISH = 'TEST_FINISHED: Completed=[%s]' +LOG_TEST_FINISH = 'TEST_FINISHED: Completed=[%s] (OK=%s NG=%s SKIP=%s)' +LOG_TEST_UNSUPPORTED = 'SKIP (unsupported)' class TestFlowBase(app_manager.RyuApp): @@ -116,7 +117,7 @@ class TestFlowBase(app_manager.RyuApp): dp.send_barrier() self.send_flow_stats(dp) else: - self.results[t] = 'SKIP (unsupported)' + self.results[t] = LOG_TEST_UNSUPPORTED self.unclear -= 1 self.start_next_test(dp) else: @@ -124,9 +125,18 @@ class TestFlowBase(app_manager.RyuApp): def print_results(self): LOG.info("TEST_RESULTS:") + ok = 0 + ng = 0 + skip = 0 for t in sorted(self.results.keys()): + if self.results[t] is True: + ok += 1 + elif self.results[t] == LOG_TEST_UNSUPPORTED: + skip += 1 + else: + ng += 1 LOG.info(" %s: %s", t, self.results[t]) - LOG.info(LOG_TEST_FINISH, self.unclear == 0) + LOG.info(LOG_TEST_FINISH, self.unclear == 0, ok, ng, skip) @handler.set_ev_cls(ofp_event.EventOFPFlowStatsReply, handler.MAIN_DISPATCHER) |