summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>2013-09-02 15:06:18 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-09-02 19:41:38 +0900
commit52bece11b1744d7cd177e0060efc3f932212f918 (patch)
tree255971ca4d856b130e909ec9287e2f44b1c4d358
parent1957204de4fb54773c870e993a08b7a11d059a52 (diff)
of13: update *.json after multipart request/reply's "type" changes
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-0-ofp_desc_reply.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-11-ofp_flow_stats_request.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-24-ofp_desc_request.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-25-ofp_aggregate_stats_request.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-26-ofp_aggregate_stats_reply.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-27-ofp_table_stats_request.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-28-ofp_table_stats_reply.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-29-ofp_port_stats_request.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-30-ofp_port_stats_reply.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-31-ofp_group_features_request.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-32-ofp_group_features_reply.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-33-ofp_group_desc_request.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-34-ofp_group_desc_reply.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-37-ofp_queue_stats_request.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-38-ofp_queue_stats_reply.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-47-ofp_meter_config_request.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-48-ofp_meter_config_reply.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-49-ofp_meter_stats_request.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-50-ofp_meter_stats_reply.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-51-ofp_meter_features_request.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-52-ofp_meter_features_reply.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-53-ofp_port_desc_request.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-54-ofp_port_desc_reply.packet.json3
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-56-ofp_table_features_reply.packet.json3
25 files changed, 50 insertions, 25 deletions
diff --git a/ryu/tests/unit/ofproto/json/of13/4-0-ofp_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-0-ofp_desc_reply.packet.json
index 9fb21255..26e5dc2d 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-0-ofp_desc_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-0-ofp_desc_reply.packet.json
@@ -9,6 +9,7 @@
"sw_desc": "sw"
}
},
- "flags": 0
+ "flags": 0,
+ "type": 0
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-11-ofp_flow_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-11-ofp_flow_stats_request.packet.json
index d12cac71..2baccad4 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-11-ofp_flow_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-11-ofp_flow_stats_request.packet.json
@@ -12,6 +12,7 @@
},
"out_group": 4294967295,
"out_port": 4294967295,
- "table_id": 0
+ "table_id": 0,
+ "type": 1
}
}
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 7b4603a5..686da592 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
@@ -155,6 +155,7 @@
}
}
],
- "flags": 0
+ "flags": 0,
+ "type": 1
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-24-ofp_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-24-ofp_desc_request.packet.json
index 6129d409..5b23f8bc 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-24-ofp_desc_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-24-ofp_desc_request.packet.json
@@ -1,5 +1,6 @@
{
"OFPDescStatsRequest": {
- "flags": 0
+ "flags": 0,
+ "type": 0
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-25-ofp_aggregate_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-25-ofp_aggregate_stats_request.packet.json
index cc3d76fd..248131fd 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-25-ofp_aggregate_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-25-ofp_aggregate_stats_request.packet.json
@@ -12,6 +12,7 @@
},
"out_group": 4294967295,
"out_port": 4294967295,
- "table_id": 255
+ "table_id": 255,
+ "type": 2
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-26-ofp_aggregate_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-26-ofp_aggregate_stats_reply.packet.json
index e6fe4fe8..153ad4f0 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-26-ofp_aggregate_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-26-ofp_aggregate_stats_reply.packet.json
@@ -7,6 +7,7 @@
"packet_count": 7
}
},
- "flags": 0
+ "flags": 0,
+ "type": 2
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-27-ofp_table_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-27-ofp_table_stats_request.packet.json
index 03adedd1..1f965d77 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-27-ofp_table_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-27-ofp_table_stats_request.packet.json
@@ -1,5 +1,6 @@
{
"OFPTableStatsRequest": {
- "flags": 0
+ "flags": 0,
+ "type": 3
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-28-ofp_table_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-28-ofp_table_stats_reply.packet.json
index 437eebee..94801adb 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-28-ofp_table_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-28-ofp_table_stats_reply.packet.json
@@ -18,6 +18,7 @@
}
}
],
- "flags": 0
+ "flags": 0,
+ "type": 3
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-29-ofp_port_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-29-ofp_port_stats_request.packet.json
index 9a94ed8b..5228710d 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-29-ofp_port_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-29-ofp_port_stats_request.packet.json
@@ -1,6 +1,7 @@
{
"OFPPortStatsRequest": {
"flags": 0,
- "port_no": 4294967295
+ "port_no": 4294967295,
+ "type": 4
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-30-ofp_port_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-30-ofp_port_stats_reply.packet.json
index 17fb0091..01157449 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-30-ofp_port_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-30-ofp_port_stats_reply.packet.json
@@ -40,6 +40,7 @@
}
}
],
- "flags": 0
+ "flags": 0,
+ "type": 4
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-31-ofp_group_features_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-31-ofp_group_features_request.packet.json
index 03974d3e..edba5dc5 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-31-ofp_group_features_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-31-ofp_group_features_request.packet.json
@@ -1,5 +1,6 @@
{
"OFPGroupFeaturesStatsRequest": {
- "flags": 0
+ "flags": 0,
+ "type": 8
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-32-ofp_group_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-32-ofp_group_features_reply.packet.json
index ab49599d..f059f994 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-32-ofp_group_features_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-32-ofp_group_features_reply.packet.json
@@ -18,6 +18,7 @@
"types": 15
}
},
- "flags": 0
+ "flags": 0,
+ "type": 8
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-33-ofp_group_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-33-ofp_group_desc_request.packet.json
index e62fe9a0..bea140c2 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-33-ofp_group_desc_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-33-ofp_group_desc_request.packet.json
@@ -1,5 +1,6 @@
{
"OFPGroupDescStatsRequest": {
- "flags": 0
+ "flags": 0,
+ "type": 7
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-34-ofp_group_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-34-ofp_group_desc_reply.packet.json
index 5c64db50..c4f30190 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-34-ofp_group_desc_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-34-ofp_group_desc_reply.packet.json
@@ -28,6 +28,7 @@
}
}
],
- "flags": 0
+ "flags": 0,
+ "type": 7
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-37-ofp_queue_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-37-ofp_queue_stats_request.packet.json
index 5c7479d3..7a12acc3 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-37-ofp_queue_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-37-ofp_queue_stats_request.packet.json
@@ -2,6 +2,7 @@
"OFPQueueStatsRequest": {
"flags": 0,
"port_no": 4294967295,
- "queue_id": 4294967295
+ "queue_id": 4294967295,
+ "type": 5
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-38-ofp_queue_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-38-ofp_queue_stats_reply.packet.json
index 377d753f..80b59cf2 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-38-ofp_queue_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-38-ofp_queue_stats_reply.packet.json
@@ -35,6 +35,7 @@
}
}
],
- "flags": 0
+ "flags": 0,
+ "type": 5
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-47-ofp_meter_config_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-47-ofp_meter_config_request.packet.json
index 2cf19172..4703588e 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-47-ofp_meter_config_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-47-ofp_meter_config_request.packet.json
@@ -1,6 +1,7 @@
{
"OFPMeterConfigStatsRequest": {
"flags": 0,
- "meter_id": 4294967295
+ "meter_id": 4294967295,
+ "type": 10
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-48-ofp_meter_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-48-ofp_meter_config_reply.packet.json
index 3f130e2f..164bc55f 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-48-ofp_meter_config_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-48-ofp_meter_config_reply.packet.json
@@ -16,6 +16,7 @@
}
}
],
- "flags": 0
+ "flags": 0,
+ "type": 10
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-49-ofp_meter_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-49-ofp_meter_stats_request.packet.json
index 966ecd30..8d45799b 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-49-ofp_meter_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-49-ofp_meter_stats_request.packet.json
@@ -1,6 +1,7 @@
{
"OFPMeterStatsRequest": {
"flags": 0,
- "meter_id": 4294967295
+ "meter_id": 4294967295,
+ "type": 9
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-50-ofp_meter_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-50-ofp_meter_stats_reply.packet.json
index 92ffec8d..aa56fd0d 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-50-ofp_meter_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-50-ofp_meter_stats_reply.packet.json
@@ -20,6 +20,7 @@
}
}
],
- "flags": 0
+ "flags": 0,
+ "type": 9
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-51-ofp_meter_features_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-51-ofp_meter_features_request.packet.json
index ffeab770..7363a342 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-51-ofp_meter_features_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-51-ofp_meter_features_request.packet.json
@@ -1,5 +1,6 @@
{
"OFPMeterFeaturesStatsRequest": {
- "flags": 0
+ "flags": 0,
+ "type": 11
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-52-ofp_meter_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-52-ofp_meter_features_reply.packet.json
index f673f38d..4c101575 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-52-ofp_meter_features_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-52-ofp_meter_features_reply.packet.json
@@ -11,6 +11,7 @@
}
}
],
- "flags": 0
+ "flags": 0,
+ "type": 11
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-53-ofp_port_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-53-ofp_port_desc_request.packet.json
index 9ba67f20..f166c34a 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-53-ofp_port_desc_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-53-ofp_port_desc_request.packet.json
@@ -1,5 +1,6 @@
{
"OFPPortDescStatsRequest": {
- "flags": 0
+ "flags": 0,
+ "type": 13
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-54-ofp_port_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-54-ofp_port_desc_reply.packet.json
index 164a9fb5..d447cda8 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-54-ofp_port_desc_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-54-ofp_port_desc_reply.packet.json
@@ -32,6 +32,7 @@
}
}
],
- "flags": 0
+ "flags": 0,
+ "type": 13
}
}
diff --git a/ryu/tests/unit/ofproto/json/of13/4-56-ofp_table_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-56-ofp_table_features_reply.packet.json
index 17a0c289..022644ff 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-56-ofp_table_features_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-56-ofp_table_features_reply.packet.json
@@ -112,6 +112,7 @@
}
}
],
- "flags": 2
+ "flags": 2,
+ "type": 12
}
}