Signed-off-by: Simon Horman <[email protected]>

---
v2
* Update JSON using normalize_json.py
---
 .../of14/5-69-ofp_bundle_add_msg.packet            | Bin 0 -> 80 bytes
 ryu/tests/packet_data_generator/src/x5.erl         |  22 ++++++++++
 .../json/of14/5-69-ofp_bundle_add_msg.packet.json  |  45 +++++++++++++++++++++
 ryu/tests/unit/ofproto/test_parser.py              |   1 +
 4 files changed, 68 insertions(+)
 create mode 100644 ryu/tests/packet_data/of14/5-69-ofp_bundle_add_msg.packet
 create mode 100644 
ryu/tests/unit/ofproto/json/of14/5-69-ofp_bundle_add_msg.packet.json

diff --git a/ryu/tests/packet_data/of14/5-69-ofp_bundle_add_msg.packet 
b/ryu/tests/packet_data/of14/5-69-ofp_bundle_add_msg.packet
new file mode 100644
index 
0000000000000000000000000000000000000000..5565f8d3caffa447f76dccc72f0b3a6be31b218d
GIT binary patch
literal 80
zcmZQoVhCUW1C~obijkFxfdj<-|DS;eNTq_<AOPeG04Wfk5rlz!5h$MtDh8q%0DKDw
Az5oCK

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 67807f6..15ada31 100644
--- a/ryu/tests/packet_data_generator/src/x5.erl
+++ b/ryu/tests/packet_data_generator/src/x5.erl
@@ -2883,6 +2883,28 @@ x() ->
                  #ofp_bundle_prop_experimenter{
                      experimenter = 101,
                      exp_type = 2,
+                     data = <<1:32,2:32>>}]},
+        #ofp_bundle_add_msg{
+            bundle_id = 1234,
+            flags = [atomic],
+            message =
+                #ofp_message{
+                    version = 5,
+                    type = echo_request,
+                    xid = 0,
+                    body = #ofp_echo_request{}},
+            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_add_msg.packet.json 
b/ryu/tests/unit/ofproto/json/of14/5-69-ofp_bundle_add_msg.packet.json
new file mode 100644
index 0000000..53e9f7e
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of14/5-69-ofp_bundle_add_msg.packet.json
@@ -0,0 +1,45 @@
+{
+   "OFPBundleAddMsg": {
+      "bundle_id": 1234, 
+      "flags": 1, 
+      "message": {
+         "OFPEchoRequest": {
+            "data": null
+         }
+      }, 
+      "properties": [
+         {
+            "OFPBundlePropExperimenter": {
+               "data": [], 
+               "exp_type": 0, 
+               "experimenter": 101, 
+               "length": 12, 
+               "type": 65535
+            }
+         }, 
+         {
+            "OFPBundlePropExperimenter": {
+               "data": [
+                  1
+               ], 
+               "exp_type": 1, 
+               "experimenter": 101, 
+               "length": 16, 
+               "type": 65535
+            }
+         }, 
+         {
+            "OFPBundlePropExperimenter": {
+               "data": [
+                  1, 
+                  2
+               ], 
+               "exp_type": 2, 
+               "experimenter": 101, 
+               "length": 20, 
+               "type": 65535
+            }
+         }
+      ]
+   }
+}
diff --git a/ryu/tests/unit/ofproto/test_parser.py 
b/ryu/tests/unit/ofproto/test_parser.py
index d07bf9d..fdcb328 100644
--- a/ryu/tests/unit/ofproto/test_parser.py
+++ b/ryu/tests/unit/ofproto/test_parser.py
@@ -114,6 +114,7 @@ implemented = {
         ofproto_v1_4.OFPT_ROLE_STATUS: (True, False),
         ofproto_v1_4.OFPT_TABLE_STATUS: (True, False),
         ofproto_v1_4.OFPT_BUNDLE_CONTROL: (False, True),
+        ofproto_v1_4.OFPT_BUNDLE_ADD_MESSAGE: (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

Reply via email to