Signed-off-by: Simon Horman <[email protected]>
---
v2
* Updated JSON using normalize_json.py
---
.../of14/5-67-ofp_flow_monitor_reply.packet | Bin 0 -> 96 bytes
ryu/tests/packet_data_generator/src/x5.erl | 30 +++++++++-
.../of14/5-67-ofp_flow_monitor_reply.packet.json | 66 +++++++++++++++++++++
3 files changed, 95 insertions(+), 1 deletion(-)
create mode 100644
ryu/tests/packet_data/of14/5-67-ofp_flow_monitor_reply.packet
create mode 100644
ryu/tests/unit/ofproto/json/of14/5-67-ofp_flow_monitor_reply.packet.json
diff --git a/ryu/tests/packet_data/of14/5-67-ofp_flow_monitor_reply.packet
b/ryu/tests/packet_data/of14/5-67-ofp_flow_monitor_reply.packet
new file mode 100644
index
0000000000000000000000000000000000000000..b50fe8f53b8707e9aa1949a7744751b9fd81171b
GIT binary patch
literal 96
zcmZP-W=LQF0Rb?{z~BI)nIf3>Ffc<!AQU45R|5kV69*eql!ZY8$`bhh|Nk$zS`G#l
O1_qW(3>*xsATa<fSO=Q`
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 53e85ab..1611ab9 100644
--- a/ryu/tests/packet_data_generator/src/x5.erl
+++ b/ryu/tests/packet_data_generator/src/x5.erl
@@ -2814,6 +2814,34 @@ x() ->
class = openflow_basic,name = eth_dst,
has_mask = false,
value = <<"\362\v\244}\370\352">>,
- mask = undefined}]}}
+ mask = undefined}]}},
+ #ofp_flow_monitor_reply{
+ flags = [],
+ updates =
+ [#ofp_flow_update_full{
+ event = initial,
+ table_id = 0,
+ reason = idle_timeout,
+ idle_timeout = 600,
+ hard_timeout = 700,
+ priority = 3,
+ cookie = <<0,0,0,0,0,0,0,0>>,
+ match =
+ #ofp_match{
+ fields =
+ [#ofp_field{
+ class = openflow_basic,
+ name = eth_type,
+ has_mask = false,
+ value = <<8,6>>,
+ mask = undefined}]},
+ instructions =
+ [#ofp_instruction_apply_actions{
+ actions =
+ [#ofp_action_output{
+ port = normal,
+ max_len = 0}]}]},
+ #ofp_flow_update_abbrev{event = abbrev,xid=1234},
+ #ofp_flow_update_paused{event = paused}]}
],
lists:foldl(fun x:do/2, {5, 0}, List).
diff --git
a/ryu/tests/unit/ofproto/json/of14/5-67-ofp_flow_monitor_reply.packet.json
b/ryu/tests/unit/ofproto/json/of14/5-67-ofp_flow_monitor_reply.packet.json
new file mode 100644
index 0000000..8c02887
--- /dev/null
+++ b/ryu/tests/unit/ofproto/json/of14/5-67-ofp_flow_monitor_reply.packet.json
@@ -0,0 +1,66 @@
+{
+ "OFPFlowMonitorReply": {
+ "body": [
+ {
+ "OFPFlowUpdateFull": {
+ "cookie": 0,
+ "event": 0,
+ "hard_timeout": 700,
+ "idle_timeout": 600,
+ "instructions": [
+ {
+ "OFPInstructionActions": {
+ "actions": [
+ {
+ "OFPActionOutput": {
+ "len": 16,
+ "max_len": 0,
+ "port": 4294967290,
+ "type": 0
+ }
+ }
+ ],
+ "len": 24,
+ "type": 4
+ }
+ }
+ ],
+ "length": 64,
+ "match": {
+ "OFPMatch": {
+ "length": 10,
+ "oxm_fields": [
+ {
+ "OXMTlv": {
+ "field": "eth_type",
+ "mask": null,
+ "value": 2054
+ }
+ }
+ ],
+ "type": 1
+ }
+ },
+ "priority": 3,
+ "reason": 0,
+ "table_id": 0
+ }
+ },
+ {
+ "OFPFlowUpdateAbbrev": {
+ "event": 4,
+ "length": 8,
+ "xid": 1234
+ }
+ },
+ {
+ "OFPFlowUpdatePaused": {
+ "event": 5,
+ "length": 8
+ }
+ }
+ ],
+ "flags": 0,
+ "type": 16
+ }
+}
--
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
