Signed-off-by: IWASE Yusuke <iwase.yusu...@gmail.com>
---
.../json/of12/3-41-ofp_error_msg_experimenter.packet.json | 9 +++++----
.../json/of13/4-41-ofp_error_msg_experimenter.packet.json | 9 +++++----
.../json/of14/5-39-ofp_error_msg_experimenter.packet.json | 9 +++++----
.../of15/libofproto-OFP15-error_msg_experimenter.packet.json | 9 +++++----
ryu/tests/unit/ofproto/test_parser_v12.py | 4 ++--
5 files changed, 22 insertions(+), 18 deletions(-)
diff --git
a/ryu/tests/unit/ofproto/json/of12/3-41-ofp_error_msg_experimenter.packet.json
b/ryu/tests/unit/ofproto/json/of12/3-41-ofp_error_msg_experimenter.packet.json
index 37bfb6a..bb81f2e 100644
---
a/ryu/tests/unit/ofproto/json/of12/3-41-ofp_error_msg_experimenter.packet.json
+++
b/ryu/tests/unit/ofproto/json/of12/3-41-ofp_error_msg_experimenter.packet.json
@@ -1,8 +1,9 @@
{
- "OFPErrorExperimenterMsg": {
- "data": "amlra2VuIGRhdGE=",
- "exp_type": 60000,
- "experimenter": 999999,
+ "OFPErrorMsg": {
+ "code": null,
+ "data": "amlra2VuIGRhdGE=",
+ "exp_type": 60000,
+ "experimenter": 999999,
"type": 65535
}
}
diff --git
a/ryu/tests/unit/ofproto/json/of13/4-41-ofp_error_msg_experimenter.packet.json
b/ryu/tests/unit/ofproto/json/of13/4-41-ofp_error_msg_experimenter.packet.json
index 37bfb6a..bb81f2e 100644
---
a/ryu/tests/unit/ofproto/json/of13/4-41-ofp_error_msg_experimenter.packet.json
+++
b/ryu/tests/unit/ofproto/json/of13/4-41-ofp_error_msg_experimenter.packet.json
@@ -1,8 +1,9 @@
{
- "OFPErrorExperimenterMsg": {
- "data": "amlra2VuIGRhdGE=",
- "exp_type": 60000,
- "experimenter": 999999,
+ "OFPErrorMsg": {
+ "code": null,
+ "data": "amlra2VuIGRhdGE=",
+ "exp_type": 60000,
+ "experimenter": 999999,
"type": 65535
}
}
diff --git
a/ryu/tests/unit/ofproto/json/of14/5-39-ofp_error_msg_experimenter.packet.json
b/ryu/tests/unit/ofproto/json/of14/5-39-ofp_error_msg_experimenter.packet.json
index 37bfb6a..bb81f2e 100644
---
a/ryu/tests/unit/ofproto/json/of14/5-39-ofp_error_msg_experimenter.packet.json
+++
b/ryu/tests/unit/ofproto/json/of14/5-39-ofp_error_msg_experimenter.packet.json
@@ -1,8 +1,9 @@
{
- "OFPErrorExperimenterMsg": {
- "data": "amlra2VuIGRhdGE=",
- "exp_type": 60000,
- "experimenter": 999999,
+ "OFPErrorMsg": {
+ "code": null,
+ "data": "amlra2VuIGRhdGE=",
+ "exp_type": 60000,
+ "experimenter": 999999,
"type": 65535
}
}
diff --git
a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg_experimenter.packet.json
b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg_experimenter.packet.json
index 37bfb6a..bb81f2e 100644
---
a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg_experimenter.packet.json
+++
b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg_experimenter.packet.json
@@ -1,8 +1,9 @@
{
- "OFPErrorExperimenterMsg": {
- "data": "amlra2VuIGRhdGE=",
- "exp_type": 60000,
- "experimenter": 999999,
+ "OFPErrorMsg": {
+ "code": null,
+ "data": "amlra2VuIGRhdGE=",
+ "exp_type": 60000,
+ "experimenter": 999999,
"type": 65535
}
}
diff --git a/ryu/tests/unit/ofproto/test_parser_v12.py
b/ryu/tests/unit/ofproto/test_parser_v12.py
index cf04803..d0abdbc 100644
--- a/ryu/tests/unit/ofproto/test_parser_v12.py
+++ b/ryu/tests/unit/ofproto/test_parser_v12.py
@@ -828,7 +828,7 @@ class TestOFPErrorMsg(unittest.TestCase):
self._test_serialize(type_, code, data)
def test_serialize_max(self):
- type_ = 65535
+ type_ = 65534 # 65535 collides OFPET_EXPERIMENTER
code = 65535
data = b'Error Message.'.ljust(65523)
self._test_serialize(type_, code, data)
@@ -1242,7 +1242,7 @@ class TestOFPErrorExperimenterMsg(unittest.TestCase):
if data is not None:
buf += data
- res = OFPErrorExperimenterMsg.parser(
+ res = OFPErrorMsg.parser(
object, version, msg_type, msg_len, xid, buf)
eq_(res.version, version)
--
2.7.4
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Ryu-devel mailing list
Ryu-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ryu-devel
