no functional changes
Signed-off-by: YAMAMOTO Takashi <[email protected]>
---
ryu/ofproto/ofproto_v1_2.py | 4 ++--
ryu/ofproto/ofproto_v1_2_parser.py | 2 +-
ryu/tests/unit/ofproto/test_ofproto_v12.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ryu/ofproto/ofproto_v1_2.py b/ryu/ofproto/ofproto_v1_2.py
index 652bb10..e2db2a4 100644
--- a/ryu/ofproto/ofproto_v1_2.py
+++ b/ryu/ofproto/ofproto_v1_2.py
@@ -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'
diff --git a/ryu/ofproto/ofproto_v1_2_parser.py
b/ryu/ofproto/ofproto_v1_2_parser.py
index 97ab485..002be89 100644
--- a/ryu/ofproto/ofproto_v1_2_parser.py
+++ b/ryu/ofproto/ofproto_v1_2_parser.py
@@ -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
diff --git a/ryu/tests/unit/ofproto/test_ofproto_v12.py
b/ryu/tests/unit/ofproto/test_ofproto_v12.py
index 1d7551f..556961b 100644
--- a/ryu/tests/unit/ofproto/test_ofproto_v12.py
+++ b/ryu/tests/unit/ofproto/test_ofproto_v12.py
@@ -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')
--
1.8.3.1
------------------------------------------------------------------------------
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
