openstack/os-ken
Code Issues Proposed changes

ofproto: remove unused definitions

Browse Source 
g/c unused OF1.2/1.3 OFP_PACKET_IN_DATA_OFFSET definitions.
they seem to be copy-and-paste leftover from OF1.0.

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-09-26 13:08:08 +09:00 committed by FUJITA Tomonori
parent a53bc8052d
commit b76000ec6b
3 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ryu/ofproto/ofproto_v1_2.py
View File

@ -545,7 +545,6 @@ OFPCR_ROLE_SLAVE = 3 # Read-only access.
# struct ofp_packet_in # struct ofp_packet_in
OFP_PACKET_IN_PACK_STR = '!IHBB' # the last 2x is for ofp_packet_in::data OFP_PACKET_IN_PACK_STR = '!IHBB' # the last 2x is for ofp_packet_in::data
OFP_PACKET_IN_SIZE = 24 OFP_PACKET_IN_SIZE = 24
OFP_PACKET_IN_DATA_OFFSET = 18
assert (calcsize(OFP_PACKET_IN_PACK_STR) + OFP_MATCH_SIZE + OFP_HEADER_SIZE == assert (calcsize(OFP_PACKET_IN_PACK_STR) + OFP_MATCH_SIZE + OFP_HEADER_SIZE ==
OFP_PACKET_IN_SIZE) OFP_PACKET_IN_SIZE)

1
ryu/ofproto/ofproto_v1_3.py
View File

@ -733,7 +733,6 @@ assert (calcsize(OFP_ASYNC_CONFIG_PACK_STR) + OFP_HEADER_SIZE ==
# struct ofp_packet_in # struct ofp_packet_in
OFP_PACKET_IN_PACK_STR = '!IHBBQ' OFP_PACKET_IN_PACK_STR = '!IHBBQ'
OFP_PACKET_IN_SIZE = 32 OFP_PACKET_IN_SIZE = 32
OFP_PACKET_IN_DATA_OFFSET = 18
assert (calcsize(OFP_PACKET_IN_PACK_STR) + OFP_MATCH_SIZE + OFP_HEADER_SIZE == assert (calcsize(OFP_PACKET_IN_PACK_STR) + OFP_MATCH_SIZE + OFP_HEADER_SIZE ==
OFP_PACKET_IN_SIZE) OFP_PACKET_IN_SIZE)

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

@ -475,7 +475,6 @@ class TestOfprot12(unittest.TestCase):
def test_struct_ofp_packet_in(self): def test_struct_ofp_packet_in(self):
eq_(OFP_PACKET_IN_PACK_STR, '!IHBB') eq_(OFP_PACKET_IN_PACK_STR, '!IHBB')
eq_(OFP_PACKET_IN_SIZE, 24) eq_(OFP_PACKET_IN_SIZE, 24)
eq_(OFP_PACKET_IN_DATA_OFFSET, 18)
def test_enum_ofp_packet_in_reason(self): def test_enum_ofp_packet_in_reason(self):
eq_(OFPR_NO_MATCH, 0) eq_(OFPR_NO_MATCH, 0)