diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2012-06-22 21:46:34 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2012-06-23 12:21:18 +0900 |
| commit | e9b1c978967b0cebf582a2df1fe3136b9ed68728 (patch) | |
| tree | 26d018a9e659fabcc9a030a952aa44d73f5af6cb | |
| parent | 40e378ae11531b240277760a91797152c1a78ec8 (diff) | |
Remove duplicated OFPMatch definition
Also fix some pep8 warnings.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/ofproto/ofproto_v1_2_parser.py | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/ryu/ofproto/ofproto_v1_2_parser.py b/ryu/ofproto/ofproto_v1_2_parser.py index 254d3205..956d73a2 100644 --- a/ryu/ofproto/ofproto_v1_2_parser.py +++ b/ryu/ofproto/ofproto_v1_2_parser.py @@ -218,15 +218,6 @@ class OFPSetConfig(MsgBase): self.flags, self.miss_send_len) -class OFPMatch(object): - def __init__(self): - super(OFPMatch, self).__init__() - - @classmethod - def parser(cls, buf, offset): - pass - - @_register_parser @_set_msg_type(ofproto_v1_2.OFPT_PACKET_IN) class OFPPacketIn(MsgBase): @@ -263,7 +254,8 @@ class OFPFlowRemoved(MsgBase): msg.idle_timeout, msg.hard_timeout, msg.packet_count, msg.byte_count) = struct.unpack_from( ofproto_v1_2.OFP_FLOW_REMOVED_PACK_STR0, - msg.buf, ofproto_v1_2.OFP_HEADER_SIZE + ofproto_v1_2.OFP_MATCH_SIZE) + msg.buf, + ofproto_v1_2.OFP_HEADER_SIZE + ofproto_v1_2.OFP_MATCH_SIZE) offset = (ofproto_v1_2.OFP_HEADER_SIZE + ofproto_v1_2.OFP_FLOW_REMOVED_SIZE) @@ -616,8 +608,9 @@ class OFPActionSetField(OFPAction): # TODO: serialize OXM -@OFPAction.register_action_type(ofproto_v1_2.OFPAT_EXPERIMENTER, - ofproto_v1_2.OFP_ACTION_EXPERIMENTER_HEADER_SIZE) +@OFPAction.register_action_type( + ofproto_v1_2.OFPAT_EXPERIMENTER, + ofproto_v1_2.OFP_ACTION_EXPERIMENTER_HEADER_SIZE) class OFPActionExperimenter(OFPAction): def __init__(self, experimenter): super(OFPActionExperimenter, self).__init__() |