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

of12: reduce unnecessary diffs from of13

Browse Source 
no functional changes

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 2013-11-11 16:47:03 +09:00 committed by FUJITA Tomonori
parent 396ef8d684
commit 0efe1a8455
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ryu/ofproto/ofproto_v1_2.py
View File

@ -742,9 +742,9 @@ OFPRRFC_BAD_ROLE = 2 # Invalid role.
# struct ofp_error_experimenter_msg
OFP_ERROR_EXPERIMENTER_MSG_PACK_STR = '!HHI'
OFP_ERROR_EXPERIMENTER_SIZE = 16
OFP_ERROR_EXPERIMENTER_MSG_SIZE = 16
assert (calcsize(OFP_ERROR_EXPERIMENTER_MSG_PACK_STR) + OFP_HEADER_SIZE ==
OFP_ERROR_EXPERIMENTER_SIZE)
OFP_ERROR_EXPERIMENTER_MSG_SIZE)
# struct ofp_experimenter_header
OFP_EXPERIMENTER_HEADER_PACK_STR = '!II'

2
ryu/ofproto/ofproto_v1_2_parser.py
View File

@ -162,7 +162,7 @@ class OFPErrorExperimenterMsg(MsgBase):
msg.type, msg.exp_type, msg.experimenter = struct.unpack_from(
ofproto_v1_2.OFP_ERROR_EXPERIMENTER_MSG_PACK_STR, msg.buf,
ofproto_v1_2.OFP_HEADER_SIZE)
msg.data = msg.buf[ofproto_v1_2.OFP_ERROR_EXPERIMENTER_SIZE:]
msg.data = msg.buf[ofproto_v1_2.OFP_ERROR_EXPERIMENTER_MSG_SIZE:]
return msg

2
ryu/tests/unit/ofproto/test_ofproto_v12.py
View File

@ -639,7 +639,7 @@ class TestOfprot12(unittest.TestCase):
def test_struct_ofp_error_experimenter_msg(self):
eq_(OFP_ERROR_EXPERIMENTER_MSG_PACK_STR, '!HHI')
eq_(OFP_ERROR_EXPERIMENTER_SIZE, 16)
eq_(OFP_ERROR_EXPERIMENTER_MSG_SIZE, 16)
def test_struct_ofp_experimenter_header(self):
eq_(OFP_EXPERIMENTER_HEADER_PACK_STR, '!II')