Signed-off-by: YAMAMOTO Takashi <[email protected]>
---
.../unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json | 4 +++-
.../json/of12/3-12-ofp_flow_stats_reply.packet.json | 14 +++++++++++---
.../unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json | 5 ++++-
.../unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json | 5 ++++-
.../unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json | 4 +++-
.../json/of12/3-34-ofp_group_desc_stats_reply.packet.json | 5 ++++-
.../json/of12/3-36-ofp_queue_get_config_reply.packet.json | 6 ++++++
7 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/ryu/tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json
b/ryu/tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json
index 64fb790..e6bf245 100644
--- a/ryu/tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json
@@ -3,8 +3,10 @@
"actions": [
{
"OFPActionOutput": {
+ "len": 16,
"max_len": 65535,
- "port": 4294967292
+ "port": 4294967292,
+ "type": 0
}
}
],
diff --git
a/ryu/tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json
b/ryu/tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json
index 72e5be7..f2e382b 100644
--- a/ryu/tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json
@@ -34,11 +34,14 @@
"actions": [
{
"OFPActionOutput": {
+ "len": 16,
"max_len": 0,
- "port": 4294967290
+ "port": 4294967290,
+ "type": 0
}
}
],
+ "len": 24,
"type": 4
}
}
@@ -72,7 +75,9 @@
"instructions": [
{
"OFPInstructionGotoTable": {
- "table_id": 1
+ "len": 8,
+ "table_id": 1,
+ "type": 1
}
}
],
@@ -115,11 +120,14 @@
"actions": [
{
"OFPActionOutput": {
+ "len": 16,
"max_len": 65535,
- "port": 4294967293
+ "port": 4294967293,
+ "type": 0
}
}
],
+ "len": 24,
"type": 3
}
}
diff --git a/ryu/tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json
b/ryu/tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json
index 558affc..7fb726e 100644
--- a/ryu/tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json
@@ -24,11 +24,14 @@
},
{
"OFPActionOutput": {
+ "len": 16,
"max_len": 65535,
- "port": 6
+ "port": 6,
+ "type": 0
}
}
],
+ "len": 40,
"type": 3
}
}
diff --git a/ryu/tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json
b/ryu/tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json
index 6b66df4..1a3767d 100644
--- a/ryu/tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json
@@ -6,11 +6,14 @@
"actions": [
{
"OFPActionOutput": {
+ "len": 16,
"max_len": 65535,
- "port": 2
+ "port": 2,
+ "type": 0
}
}
],
+ "len": 32,
"watch_group": 1,
"watch_port": 1,
"weight": 1
diff --git a/ryu/tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json
b/ryu/tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json
index 55ff165..012f650 100644
--- a/ryu/tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json
@@ -10,7 +10,9 @@
"instructions": [
{
"OFPInstructionGotoTable": {
- "table_id": 1
+ "len": 8,
+ "table_id": 1,
+ "type": 1
}
}
],
diff --git
a/ryu/tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json
b/ryu/tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json
index d662e5d..9946b58 100644
---
a/ryu/tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json
+++
b/ryu/tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json
@@ -9,11 +9,14 @@
"actions": [
{
"OFPActionOutput": {
+ "len": 16,
"max_len": 65535,
- "port": 2
+ "port": 2,
+ "type": 0
}
}
],
+ "len": 32,
"watch_group": 1,
"watch_port": 1,
"weight": 1
diff --git
a/ryu/tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json
b/ryu/tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json
index 818ca76..1322af7 100644
---
a/ryu/tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json
+++
b/ryu/tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json
@@ -4,15 +4,18 @@
"queues": [
{
"OFPPacketQueue": {
+ "len": 48,
"port": 77,
"properties": [
{
"OFPQueuePropMinRate": {
+ "len": 16,
"rate": 10
}
},
{
"OFPQueuePropMaxRate": {
+ "len": 16,
"rate": 900
}
}
@@ -22,15 +25,18 @@
},
{
"OFPPacketQueue": {
+ "len": 48,
"port": 77,
"properties": [
{
"OFPQueuePropMinRate": {
+ "len": 16,
"rate": 100
}
},
{
"OFPQueuePropMaxRate": {
+ "len": 16,
"rate": 200
}
}
--
1.8.3.1
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
