diff options
| author | Yuichi Ito <ito.yuichi0@gmail.com> | 2014-03-28 13:19:24 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2014-03-30 10:43:06 +0900 |
| commit | 9ef560ec47baa1135061f02512c19f1a0ee90c61 (patch) | |
| tree | b2bc67df011ee22db885e0e7083cef319a83cf24 | |
| parent | 867062f586090e2749471f9add6830c698fc7944 (diff) | |
sw test tool: Refactor packet sending processes
Methods of STATE_FLOW_MATCH_CHK and STATE_UNMATCH_PACKET_SEND have similar processes that send a packet.
This patch refactors this redundancy.
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 | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/ryu/tests/switch/tester.py b/ryu/tests/switch/tester.py index 29c83750..a285f841 100644 --- a/ryu/tests/switch/tester.py +++ b/ryu/tests/switch/tester.py @@ -536,16 +536,11 @@ class OfTester(app_manager.RyuApp): return result def _test_flow_matching_check(self, pkt): - self.logger.debug("send_packet:[%s]", packet.Packet(pkt[KEY_INGRESS])) self.logger.debug("egress:[%s]", packet.Packet(pkt.get(KEY_EGRESS))) self.logger.debug("packet_in:[%s]", packet.Packet(pkt.get(KEY_PKT_IN))) - # 1. send a packet from the OpenFlow Switch. - xid = self.tester_sw.send_packet_out(pkt[KEY_INGRESS]) - self.send_msg_xids.append(xid) - - # 2. receive a PacketIn message. + # receive a PacketIn message. try: self._wait() except TestTimeout: @@ -558,7 +553,7 @@ class OfTester(app_manager.RyuApp): dpid_lib.dpid_to_str(msg.datapath.id), packet.Packet(msg.data)) - # 3. check the SW which sended PacketIn and output packet. + # check the SW which sended PacketIn and output packet. pkt_in_src_model = (self.tester_sw if KEY_EGRESS in pkt else self.target_sw) model_pkt = (pkt[KEY_EGRESS] if KEY_EGRESS in pkt @@ -620,11 +615,6 @@ class OfTester(app_manager.RyuApp): return result def _test_unmatch_packet_send(self, pkt): - # Send a packet from the OpenFlow Switch. - self.logger.debug("send_packet:[%s]", packet.Packet(pkt[KEY_INGRESS])) - xid = self.tester_sw.send_packet_out(pkt[KEY_INGRESS]) - self.send_msg_xids.append(xid) - # Wait OFPBarrierReply. xid = self.tester_sw.send_barrier_request() self.send_msg_xids.append(xid) @@ -648,6 +638,11 @@ class OfTester(app_manager.RyuApp): if not lookup: raise TestError(self.state) + def _one_time_packet_send(self, pkt): + self.logger.debug("send_packet:[%s]", packet.Packet(pkt[KEY_INGRESS])) + xid = self.tester_sw.send_packet_out(pkt[KEY_INGRESS]) + self.send_msg_xids.append(xid) + def _continuous_packet_send(self, pkt): assert self.ingress_event is None |