diff options
| author | IWASE Yusuke <iwase.yusuke0@gmail.com> | 2017-07-20 14:10:51 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2017-07-21 21:38:42 +0900 |
| commit | 214cd8c305872697398edd41bc3469e36a3e3477 (patch) | |
| tree | 4f7fc8ce95a77a71177b9f527130bf8f4a3e881d | |
| parent | 5099034d0c5f7aa1d4b10d52d46a6279489dc129 (diff) | |
unit/ofproto: Adopt to rename of OFPErrorExperimenterMsg
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
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 37bfb6a9..bb81f2ea 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 37bfb6a9..bb81f2ea 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 37bfb6a9..bb81f2ea 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 37bfb6a9..bb81f2ea 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 cf04803d..d0abdbcd 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) |