Signed-off-by: YAMAMOTO Takashi <[email protected]>
---
.../of12/3-11-ofp_flow_stats_request.packet.json | 8 ++-
.../of12/3-12-ofp_flow_stats_reply.packet.json | 50 +++++-------------
.../ofproto/json/of12/3-2-ofp_flow_mod.packet.json | 14 ++---
.../3-25-ofp_aggregate_stats_request.packet.json | 6 +--
.../ofproto/json/of12/3-3-ofp_flow_mod.packet.json | 20 ++------
.../json/of12/3-4-ofp_packet_in.packet.json | 59 ++++------------------
.../json/of12/3-40-ofp_flow_removed.packet.json | 9 +---
7 files changed, 38 insertions(+), 128 deletions(-)
diff --git
a/ryu/tests/unit/ofproto/json/of12/3-11-ofp_flow_stats_request.packet.json
b/ryu/tests/unit/ofproto/json/of12/3-11-ofp_flow_stats_request.packet.json
index e9597ce..e677585 100644
--- a/ryu/tests/unit/ofproto/json/of12/3-11-ofp_flow_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-11-ofp_flow_stats_request.packet.json
@@ -1,15 +1,13 @@
{
"OFPFlowStatsRequest" : {
"table_id" : 0,
- "out_group" : 4294967295,
"flags" : 0,
- "out_port" : 4294967295,
+ "out_group" : 4294967295,
"match" : {
- "OFPMatch" : {
- "fields" : []
- }
+ "OFPMatch" : {}
},
"cookie" : 0,
+ "out_port" : 4294967295,
"cookie_mask" : 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 e9e941f..04ee86a 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
@@ -4,18 +4,15 @@
{
"OFPFlowStats" : {
"table_id" : 0,
- "priority" : 65535,
"hard_timeout" : 0,
+ "priority" : 65535,
"instructions" : [],
"duration_nsec" : 115277000,
"match" : {
- "OFPMatch" : {
- "fields" : [],
- "type" : 1
- }
+ "OFPMatch" : {}
},
- "idle_timeout" : 0,
"cookie" : 0,
+ "idle_timeout" : 0,
"byte_count" : 0,
"duration_sec" : 358,
"packet_count" : 0
@@ -24,8 +21,8 @@
{
"OFPFlowStats" : {
"table_id" : 0,
- "priority" : 65534,
"hard_timeout" : 0,
+ "priority" : 65534,
"instructions" : [
{
"OFPInstructionActions" : {
@@ -44,18 +41,11 @@
"duration_nsec" : 115055000,
"match" : {
"OFPMatch" : {
- "fields" : [
- {
- "MTEthType" : {
- "value" : 2054
- }
- }
- ],
- "type" : 1
+ "eth_type" : 2054
}
},
- "idle_timeout" : 0,
"cookie" : 0,
+ "idle_timeout" : 0,
"byte_count" : 0,
"duration_sec" : 358,
"packet_count" : 0
@@ -64,8 +54,8 @@
{
"OFPFlowStats" : {
"table_id" : 0,
- "priority" : 123,
"hard_timeout" : 0,
+ "priority" : 123,
"instructions" : [
{
"OFPInstructionGotoTable" : {
@@ -76,23 +66,12 @@
"duration_nsec" : 511582000,
"match" : {
"OFPMatch" : {
- "fields" : [
- {
- "MTInPort" : {
- "value" : 6
- }
- },
- {
- "MTEthSrc" : {
- "value" : "8gukffjq"
- }
- }
- ],
- "type" : 1
+ "eth_src" : "f2:0b:a4:7d:f8:ea",
+ "in_port" : 6
}
},
- "idle_timeout" : 0,
"cookie" : 0,
+ "idle_timeout" : 0,
"byte_count" : 238,
"duration_sec" : 316220,
"packet_count" : 3
@@ -101,8 +80,8 @@
{
"OFPFlowStats" : {
"table_id" : 0,
- "priority" : 0,
"hard_timeout" : 0,
+ "priority" : 0,
"instructions" : [
{
"OFPInstructionActions" : {
@@ -120,13 +99,10 @@
],
"duration_nsec" : 980901000,
"match" : {
- "OFPMatch" : {
- "fields" : [],
- "type" : 1
- }
+ "OFPMatch" : {}
},
- "idle_timeout" : 0,
"cookie" : 0,
+ "idle_timeout" : 0,
"byte_count" : 98,
"duration_sec" : 313499,
"packet_count" : 1
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 f157f07..415a20f 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
@@ -2,9 +2,8 @@
"OFPFlowMod" : {
"table_id" : 1,
"priority" : 123,
- "hard_timeout" : 0,
"buffer_id" : 65535,
- "out_group" : 4294967295,
+ "hard_timeout" : 0,
"instructions" : [
{
"OFPInstructionActions" : {
@@ -20,20 +19,15 @@
}
}
],
+ "out_group" : 4294967295,
"flags" : 0,
"match" : {
"OFPMatch" : {
- "fields" : [
- {
- "MTEthDst" : {
- "value" : "8gukffjq"
- }
- }
- ]
+ "eth_dst" : "f2:0b:a4:7d:f8:ea"
}
},
- "idle_timeout" : 0,
"cookie" : 0,
+ "idle_timeout" : 0,
"cookie_mask" : 0,
"out_port" : 4294967295,
"command" : 0
diff --git
a/ryu/tests/unit/ofproto/json/of12/3-25-ofp_aggregate_stats_request.packet.json
b/ryu/tests/unit/ofproto/json/of12/3-25-ofp_aggregate_stats_request.packet.json
index 134a61a..1a6f4ec 100644
---
a/ryu/tests/unit/ofproto/json/of12/3-25-ofp_aggregate_stats_request.packet.json
+++
b/ryu/tests/unit/ofproto/json/of12/3-25-ofp_aggregate_stats_request.packet.json
@@ -1,12 +1,10 @@
{
"OFPAggregateStatsRequest" : {
"table_id" : 255,
- "out_group" : 4294967295,
"flags" : 0,
+ "out_group" : 4294967295,
"match" : {
- "OFPMatch" : {
- "fields" : []
- }
+ "OFPMatch" : {}
},
"cookie" : 0,
"out_port" : 4294967295,
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 78bb76b..1432c7c 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
@@ -2,9 +2,8 @@
"OFPFlowMod" : {
"table_id" : 0,
"priority" : 123,
- "hard_timeout" : 0,
"buffer_id" : 65535,
- "out_group" : 4294967295,
+ "hard_timeout" : 0,
"instructions" : [
{
"OFPInstructionGotoTable" : {
@@ -12,25 +11,16 @@
}
}
],
+ "out_group" : 4294967295,
"flags" : 0,
"match" : {
"OFPMatch" : {
- "fields" : [
- {
- "MTInPort" : {
- "value" : 6
- }
- },
- {
- "MTEthSrc" : {
- "value" : "8gukffjq"
- }
- }
- ]
+ "eth_src" : "f2:0b:a4:7d:f8:ea",
+ "in_port" : 6
}
},
- "idle_timeout" : 0,
"cookie" : 0,
+ "idle_timeout" : 0,
"cookie_mask" : 0,
"out_port" : 4294967295,
"command" : 0
diff --git a/ryu/tests/unit/ofproto/json/of12/3-4-ofp_packet_in.packet.json
b/ryu/tests/unit/ofproto/json/of12/3-4-ofp_packet_in.packet.json
index 998a188..f8792c7 100644
--- a/ryu/tests/unit/ofproto/json/of12/3-4-ofp_packet_in.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-4-ofp_packet_in.packet.json
@@ -3,59 +3,20 @@
"table_id" : 1,
"buffer_id" : 2,
"total_len" : 42,
- "reason" : 1,
"match" : {
"OFPMatch" : {
- "fields" : [
- {
- "MTInPort" : {
- "value" : 6
- }
- },
- {
- "MTEthType" : {
- "value" : 2054
- }
- },
- {
- "MTEthDst" : {
- "value" : "////////"
- }
- },
- {
- "MTEthSrc" : {
- "value" : "8gukffjq"
- }
- },
- {
- "MTArpOp" : {
- "value" : 1
- }
- },
- {
- "MTArpSpa" : {
- "value" : 167772161
- }
- },
- {
- "MTArpTpa" : {
- "value" : 167772163
- }
- },
- {
- "MTArpSha" : {
- "value" : "8gukffjq"
- }
- },
- {
- "MTArpTha" : {
- "value" : "AAAAAAAA"
- }
- }
- ],
- "type" : 1
+ "eth_src" : "f2:0b:a4:7d:f8:ea",
+ "in_port" : 6,
+ "eth_dst" : "ff:ff:ff:ff:ff:ff",
+ "arp_tha" : "00:00:00:00:00:00",
+ "arp_spa" : "10.0.0.1",
+ "eth_type" : 2054,
+ "arp_sha" : "f2:0b:a4:7d:f8:ea",
+ "arp_op" : 1,
+ "arp_tpa" : "10.0.0.3"
}
},
+ "reason" : 1,
"data" : "////////8gukffjqCAYAAQgABgQAAfILpH346goAAAEAAAAAAAAKAAAD"
}
}
diff --git a/ryu/tests/unit/ofproto/json/of12/3-40-ofp_flow_removed.packet.json
b/ryu/tests/unit/ofproto/json/of12/3-40-ofp_flow_removed.packet.json
index daafb9c..e223891 100644
--- a/ryu/tests/unit/ofproto/json/of12/3-40-ofp_flow_removed.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-40-ofp_flow_removed.packet.json
@@ -6,14 +6,7 @@
"duration_nsec" : 48825000,
"match" : {
"OFPMatch" : {
- "fields" : [
- {
- "MTEthDst" : {
- "value" : "8gukffjq"
- }
- }
- ],
- "type" : 1
+ "eth_dst" : "f2:0b:a4:7d:f8:ea"
}
},
"reason" : 0,
--
1.8.1.5
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
