Signed-off-by: Simon Horman <[email protected]>
---
v2
* Rebase
- Rename files: 5-69-* -> 5-68-*
- Use bytes instead of an array of words for data fields
* Update JSON using normalize_json.py
---
.../of14/5-69-ofp_bundle_ctrl_msg.packet | Bin 0 -> 72 bytes
ryu/tests/packet_data_generator/src/x5.erl | 19 ++++++++++-
.../json/of14/5-69-ofp_bundle_ctrl_msg.packet.json | 36 +++++++++++++++++++++
ryu/tests/unit/ofproto/test_parser.py | 1 +
4 files changed, 55 insertions(+), 1 deletion(-)
create mode 100644 ryu/tests/packet_data/of14/5-69-ofp_bundle_ctrl_msg.packet
create mode 100644
ryu/tests/unit/ofproto/json/of14/5-69-ofp_bundle_ctrl_msg.packet.json
diff --git a/ryu/tests/packet_data/of14/5-69-ofp_bundle_ctrl_msg.packet
b/ryu/tests/packet_data/of14/5-69-ofp_bundle_ctrl_msg.packet
new file mode 100644
index
0000000000000000000000000000000000000000..8df1e6f845ba08275884aef081b6ce153e68aee4
GIT binary patch
literal 72
ucmZQoWbj}B1C~obit+z{1|A@t3K3&q0P+Q(d`76e2$atR;sY^=W&i+deh8)j
literal 0
HcmV?d00001
diff --git a/ryu/tests/packet_data_generator/src/x5.erl
b/ryu/tests/packet_data_generator/src/x5.erl
index 74debf1..67807f6 100644
--- a/ryu/tests/packet_data_generator/src/x5.erl
+++ b/ryu/tests/packet_data_generator/src/x5.erl
@@ -2866,6 +2866,23 @@ x() ->
#ofp_table_mod_prop_experimenter{
experimenter = 101,
exp_type = 2,
- data = <<1:32,2:32>>}]}}
+ data = <<1:32,2:32>>}]}},
+ #ofp_bundle_ctrl_msg{
+ bundle_id = 1234,
+ type = open_request,
+ flags = [atomic],
+ properties =
+ [#ofp_bundle_prop_experimenter{
+ experimenter = 101,
+ exp_type = 0,
+ data = <<>>},
+ #ofp_bundle_prop_experimenter{
+ experimenter = 101,
+ exp_type = 1,
+ data = <<1:32>>},
+ #ofp_bundle_prop_experimenter{
+ experimenter = 101,
+ exp_type = 2,
+ data = <<1:32,2:32>>}]}
],
lists:foldl(fun x:do/2, {5, 0}, List).
diff --git
a/ryu/tests/unit/ofproto/json/of14/5-69-ofp_bundle_ctrl_msg.packet.json
b/ryu/tests/unit/ofproto/json/of14/5-69-ofp_bundle_ctrl_msg.packet.json
new file mode 100644
index 0000000..370036f
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of14/5-69-ofp_bundle_ctrl_msg.packet.json
@@ -0,0 +1,36 @@
+{
+ "OFPBundleCtrlMsg": {
+ "bundle_id": 1234,
+ "flags": 1,
+ "properties": [
+ {
+ "OFPBundlePropExperimenter": {
+ "data": "",
+ "exp_type": 0,
+ "experimenter": 101,
+ "length": 12,
+ "type": 65535
+ }
+ },
+ {
+ "OFPBundlePropExperimenter": {
+ "data": "AAAAAQ==",
+ "exp_type": 1,
+ "experimenter": 101,
+ "length": 16,
+ "type": 65535
+ }
+ },
+ {
+ "OFPBundlePropExperimenter": {
+ "data": "AAAAAQAAAAI=",
+ "exp_type": 2,
+ "experimenter": 101,
+ "length": 20,
+ "type": 65535
+ }
+ }
+ ],
+ "type": 0
+ }
+}
diff --git a/ryu/tests/unit/ofproto/test_parser.py
b/ryu/tests/unit/ofproto/test_parser.py
index cac78b4..d07bf9d 100644
--- a/ryu/tests/unit/ofproto/test_parser.py
+++ b/ryu/tests/unit/ofproto/test_parser.py
@@ -113,6 +113,7 @@ implemented = {
ofproto_v1_4.OFPT_SET_ASYNC: (False, True),
ofproto_v1_4.OFPT_ROLE_STATUS: (True, False),
ofproto_v1_4.OFPT_TABLE_STATUS: (True, False),
+ ofproto_v1_4.OFPT_BUNDLE_CONTROL: (False, True),
},
}
--
1.8.5.2
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
