mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-05-08 13:56:09 +02:00
Code Issues Projects Releases Wiki Activity

ofproto_v1_3_parser: put some assertions

Browse Source 
Put some assertions to catch usage mistakes earlier.

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
YAMAMOTO Takashi 2014-01-28 11:31:10 +09:00 committed by FUJITA Tomonori
parent 053c9851b6
commit e08ac471d4
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ryu/ofproto/ofproto_v1_3_parser.py
View File

@ -2379,7 +2379,10 @@ class OFPFlowMod(MsgBase):
self.flags = flags
if match is None:
match = OFPMatch()
assert isinstance(match, OFPMatch)
self.match = match
for i in instructions:
assert isinstance(i, OFPInstruction)
self.instructions = instructions
def _serialize_body(self):
@ -2401,7 +2404,7 @@ class OFPFlowMod(MsgBase):
offset += inst.len
class OFPInstruction(object):
class OFPInstruction(StringifyMixin):
_INSTRUCTION_TYPES = {}
@staticmethod
@ -2420,7 +2423,7 @@ class OFPInstruction(object):
@OFPInstruction.register_instruction_type([ofproto_v1_3.OFPIT_GOTO_TABLE])
class OFPInstructionGotoTable(StringifyMixin):
class OFPInstructionGotoTable(OFPInstruction):
"""
Goto table instruction
@ -2451,7 +2454,7 @@ class OFPInstructionGotoTable(StringifyMixin):
@OFPInstruction.register_instruction_type([ofproto_v1_3.OFPIT_WRITE_METADATA])
class OFPInstructionWriteMetadata(StringifyMixin):
class OFPInstructionWriteMetadata(OFPInstruction):
"""
Write metadata instruction
@ -2487,7 +2490,7 @@ class OFPInstructionWriteMetadata(StringifyMixin):
@OFPInstruction.register_instruction_type([ofproto_v1_3.OFPIT_WRITE_ACTIONS,
ofproto_v1_3.OFPIT_APPLY_ACTIONS,
ofproto_v1_3.OFPIT_CLEAR_ACTIONS])
class OFPInstructionActions(StringifyMixin):
class OFPInstructionActions(OFPInstruction):
"""
Actions instruction
@ -2508,6 +2511,8 @@ class OFPInstructionActions(StringifyMixin):
def __init__(self, type_, actions=None, len_=None):
super(OFPInstructionActions, self).__init__()
self.type = type_
for a in actions:
assert isinstance(a, OFPAction)
self.actions = actions
@classmethod
@ -2546,7 +2551,7 @@ class OFPInstructionActions(StringifyMixin):
@OFPInstruction.register_instruction_type([ofproto_v1_3.OFPIT_METER])
class OFPInstructionMeter(StringifyMixin):
class OFPInstructionMeter(OFPInstruction):
"""
Meter instruction