Signed-off-by: Minoru TAKAHASHI <[email protected]>
---
.../of13/4-12-ofp_flow_stats_reply.packet | Bin 520 -> 552 bytes
ryu/tests/packet_data/of13/4-2-ofp_flow_mod.packet | Bin 264 -> 280 bytes
ryu/tests/packet_data_generator/src/x4.erl | 10 +++++++++-
.../of13/4-12-ofp_flow_stats_reply.packet.json | 21 +++++++++++++++++++--
.../ofproto/json/of13/4-2-ofp_flow_mod.packet.json | 14 +++++++++++---
5 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/ryu/tests/packet_data/of13/4-12-ofp_flow_stats_reply.packet
b/ryu/tests/packet_data/of13/4-12-ofp_flow_stats_reply.packet
index
90ff249092abec6935ffb04f8a4b3a3d3f85e78e..c7c1ac88e268b5de06f903558a4e0f79e0b1b5bf
100644
GIT binary patch
delta 74
zcmeBRS;4}>BFv;Qk>xG71p@;E%Zb@m<uM%-6{RPOGm0=Cn5@G%N8$f}1_9Q`TotJm
W1@S3~C5a$D1B0>xj6eAVqXPgi=ok3_
delta 41
xcmZ3%(!s*QBFw}wk>xG71Oo#D%Zb@m<uM%-6{RPOGm0=Sn5@G%XYvb12LRES3q$|_
diff --git a/ryu/tests/packet_data/of13/4-2-ofp_flow_mod.packet
b/ryu/tests/packet_data/of13/4-2-ofp_flow_mod.packet
index
5e2a9d69ec5eb4408f1a9afab6278165ad74aa37..0c2029bdab8bbeabe6e03747fee9bb326291d392
100644
GIT binary patch
delta 37
tcmeBRn!&`v!pA5vk;R^I!$g-Ff&c#*1Q-|?QW+STm|0la*e4$F005%-2x0&L
delta 20
bcmbQi)WO8U!pF!lk;R^I!9<sui5ENoF2Dt|
diff --git a/ryu/tests/packet_data_generator/src/x4.erl
b/ryu/tests/packet_data_generator/src/x4.erl
index 6098b45..a749fbc 100644
--- a/ryu/tests/packet_data_generator/src/x4.erl
+++ b/ryu/tests/packet_data_generator/src/x4.erl
@@ -268,6 +268,9 @@ x() ->
#ofp_action_set_mpls_ttl{mpls_ttl = 10},
#ofp_action_dec_nw_ttl{},
#ofp_action_set_nw_ttl{nw_ttl = 10},
+ #ofp_action_experimenter{
+ experimenter = 101,
+ data = <<0,1,2,3,4,5,6,7>>},
#ofp_action_set_queue{queue_id = 3},
#ofp_action_group{group_id = 99},
#ofp_action_output{port = 6,max_len = no_buffer}]},
@@ -449,7 +452,12 @@ x() ->
#ofp_action_set_queue{queue_id = 3},
#ofp_action_group{group_id = 99},
#ofp_action_output{port = 6,
- max_len = no_buffer}]},
+ max_len = no_buffer},
+ #ofp_action_experimenter{experimenter =
98765432,
+ data =
<<"exp_data">>},
+ #ofp_action_experimenter{experimenter =
8992,
+ data =
<<"exp_data">>}
+ ]},
#ofp_instruction_apply_actions{
actions =
[#ofp_action_set_field{
diff --git
a/ryu/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json
b/ryu/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json
index 3250527..04339dc 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json
@@ -249,9 +249,26 @@
"port": 6,
"type": 0
}
+ },
+ {
+ "OFPActionExperimenterUnknown": {
+ "len": 16,
+ "data": "ZXhwX2RhdGE=",
+ "experimenter": 98765432,
+ "type": 65535
+ }
+ },
+ {
+ "NXActionUnknown": {
+ "len": 16,
+ "data": "cF9kYXRh",
+ "experimenter": 8992,
+ "type": 65535,
+ "subtype": 25976
+ }
}
],
- "len": 160,
+ "len": 192,
"type": 3
}
},
@@ -306,7 +323,7 @@
}
}
],
- "length": 280,
+ "length": 312,
"match": {
"OFPMatch": {
"length": 4,
diff --git a/ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json
b/ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json
index e2c0e82..0e3a2cc 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json
@@ -107,7 +107,15 @@
"nw_ttl": 10,
"type": 23
}
- },
+ },
+ {
+ "OFPActionExperimenterUnknown": {
+ "data": "AAECAwQFBgc=",
+ "experimenter": 101,
+ "len": 16,
+ "type": 65535
+ }
+ },
{
"OFPActionSetQueue": {
"len": 8,
@@ -130,8 +138,8 @@
"type": 0
}
}
- ],
- "len": 160,
+ ],
+ "len": 176,
"type": 3
}
},
--
1.9.1
------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785111&iu=/4140
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
