diff options
| author | Yusuke Iwase <iwase.yusuke0@gmail.com> | 2015-08-19 11:03:11 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2015-08-20 18:28:40 +0900 |
| commit | ec73df506e89931dc4d1d578b5c5228354356c8a (patch) | |
| tree | 9612035218a98ece250a0dfec52c780ca4540e08 | |
| parent | 90f75158b07af0bd9ebd1772a68a1e2d5889069f (diff) | |
test_parser: Fix some expected json representations
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
16 files changed, 130 insertions, 50 deletions
diff --git a/ryu/tests/unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json b/ryu/tests/unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json index 79bacdf6..a255b9dd 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json @@ -25,7 +25,7 @@ }, { "OFPPortModPropExperimenter": { - "data": "", + "data": [], "exp_type": 0, "experimenter": 101, "length": 12, @@ -34,7 +34,9 @@ }, { "OFPPortModPropExperimenter": { - "data": "AAAAAQ==", + "data": [ + 1 + ], "exp_type": 1, "experimenter": 101, "length": 16, @@ -43,7 +45,10 @@ }, { "OFPPortModPropExperimenter": { - "data": "AAAAAQAAAAI=", + "data": [ + 1, + 2 + ], "exp_type": 2, "experimenter": 101, "length": 20, diff --git a/ryu/tests/unit/ofproto/json/of14/5-23-ofp_table_mod.packet.json b/ryu/tests/unit/ofproto/json/of14/5-23-ofp_table_mod.packet.json index e2e968ca..97acd144 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-23-ofp_table_mod.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-23-ofp_table_mod.packet.json @@ -20,7 +20,7 @@ }, { "OFPTableModPropExperimenter": { - "data": "", + "data": [], "exp_type": 0, "experimenter": 101, "length": 12, @@ -29,7 +29,9 @@ }, { "OFPTableModPropExperimenter": { - "data": "AAAAAQ==", + "data": [ + 1 + ], "exp_type": 1, "experimenter": 101, "length": 16, @@ -38,7 +40,10 @@ }, { "OFPTableModPropExperimenter": { - "data": "AAAAAQAAAAI=", + "data": [ + 1, + 2 + ], "exp_type": 2, "experimenter": 101, "length": 20, diff --git a/ryu/tests/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json index 68310f20..4ea41742 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json @@ -37,7 +37,7 @@ }, { "OFPPortStatsPropExperimenter": { - "data": "", + "data": [], "exp_type": 0, "experimenter": 101, "length": 12, @@ -46,7 +46,9 @@ }, { "OFPPortStatsPropExperimenter": { - "data": "AAAAAQ==", + "data": [ + 1 + ], "exp_type": 1, "experimenter": 101, "length": 16, @@ -55,7 +57,10 @@ }, { "OFPPortStatsPropExperimenter": { - "data": "AAAAAQAAAAI=", + "data": [ + 1, + 2 + ], "exp_type": 2, "experimenter": 101, "length": 20, diff --git a/ryu/tests/unit/ofproto/json/of14/5-36-ofp_queue_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-36-ofp_queue_stats_reply.packet.json index c9fa0cd8..2c190977 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-36-ofp_queue_stats_reply.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-36-ofp_queue_stats_reply.packet.json @@ -10,7 +10,7 @@ "properties": [ { "OFPQueueStatsPropExperimenter": { - "data": "", + "data": [], "exp_type": 0, "experimenter": 101, "length": 12, @@ -19,7 +19,9 @@ }, { "OFPQueueStatsPropExperimenter": { - "data": "AAAAAQ==", + "data": [ + 1 + ], "exp_type": 1, "experimenter": 101, "length": 16, @@ -28,7 +30,10 @@ }, { "OFPQueueStatsPropExperimenter": { - "data": "AAAAAQAAAAI=", + "data": [ + 1, + 2 + ], "exp_type": 2, "experimenter": 101, "length": 20, diff --git a/ryu/tests/unit/ofproto/json/of14/5-37-ofp_port_status.packet.json b/ryu/tests/unit/ofproto/json/of14/5-37-ofp_port_status.packet.json index 9d3683c9..b273ac22 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-37-ofp_port_status.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-37-ofp_port_status.packet.json @@ -37,7 +37,7 @@ }, { "OFPPortDescPropExperimenter": { - "data": "", + "data": [], "exp_type": 0, "experimenter": 101, "length": 12, @@ -46,7 +46,9 @@ }, { "OFPPortDescPropExperimenter": { - "data": "AAAAAQ==", + "data": [ + 1 + ], "exp_type": 1, "experimenter": 101, "length": 16, @@ -55,7 +57,10 @@ }, { "OFPPortDescPropExperimenter": { - "data": "AAAAAQAAAAI=", + "data": [ + 1, + 2 + ], "exp_type": 2, "experimenter": 101, "length": 20, diff --git a/ryu/tests/unit/ofproto/json/of14/5-41-ofp_get_async_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-41-ofp_get_async_reply.packet.json index 35e6ce1f..82c9e794 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-41-ofp_get_async_reply.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-41-ofp_get_async_reply.packet.json @@ -87,7 +87,7 @@ }, { "OFPAsyncConfigPropExperimenter": { - "data": "", + "data": [], "exp_type": 0, "experimenter": 101, "length": 12, @@ -96,7 +96,9 @@ }, { "OFPAsyncConfigPropExperimenter": { - "data": "AAAAAQ==", + "data": [ + 1 + ], "exp_type": 1, "experimenter": 101, "length": 16, @@ -105,7 +107,10 @@ }, { "OFPAsyncConfigPropExperimenter": { - "data": "AAAAAQAAAAI=", + "data": [ + 1, + 2 + ], "exp_type": 2, "experimenter": 101, "length": 20, diff --git a/ryu/tests/unit/ofproto/json/of14/5-42-ofp_set_async.packet.json b/ryu/tests/unit/ofproto/json/of14/5-42-ofp_set_async.packet.json index aa0aa5f6..0802c14e 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-42-ofp_set_async.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-42-ofp_set_async.packet.json @@ -87,7 +87,7 @@ }, { "OFPAsyncConfigPropExperimenter": { - "data": "", + "data": [], "exp_type": 0, "experimenter": 101, "length": 12, @@ -96,7 +96,9 @@ }, { "OFPAsyncConfigPropExperimenter": { - "data": "AAAAAQ==", + "data": [ + 1 + ], "exp_type": 1, "experimenter": 101, "length": 16, @@ -105,7 +107,10 @@ }, { "OFPAsyncConfigPropExperimenter": { - "data": "AAAAAQAAAAI=", + "data": [ + 1, + 2 + ], "exp_type": 2, "experimenter": 101, "length": 20, diff --git a/ryu/tests/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json index 07491eff..c281c0f8 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json @@ -38,7 +38,7 @@ }, { "OFPPortDescPropExperimenter": { - "data": "", + "data": [], "exp_type": 0, "experimenter": 101, "length": 12, @@ -47,7 +47,9 @@ }, { "OFPPortDescPropExperimenter": { - "data": "AAAAAQ==", + "data": [ + 1 + ], "exp_type": 1, "experimenter": 101, "length": 16, @@ -56,7 +58,10 @@ }, { "OFPPortDescPropExperimenter": { - "data": "AAAAAQAAAAI=", + "data": [ + 1, + 2 + ], "exp_type": 2, "experimenter": 101, "length": 20, diff --git a/ryu/tests/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json index e0e78edd..2a1a4308 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json @@ -1594,7 +1594,7 @@ }, { "OFPTableFeaturePropExperimenter": { - "data": "", + "data": [], "exp_type": 0, "experimenter": 101, "length": 12, @@ -1603,7 +1603,9 @@ }, { "OFPTableFeaturePropExperimenter": { - "data": "AAAAAQ==", + "data": [ + 1 + ], "exp_type": 1, "experimenter": 101, "length": 16, @@ -1612,7 +1614,10 @@ }, { "OFPTableFeaturePropExperimenter": { - "data": "AAAAAQAAAAI=", + "data": [ + 1, + 2 + ], "exp_type": 2, "experimenter": 101, "length": 20, diff --git a/ryu/tests/unit/ofproto/json/of14/5-54-ofp_table_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-54-ofp_table_features_reply.packet.json index 5257e081..ea056e8f 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-54-ofp_table_features_reply.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-54-ofp_table_features_reply.packet.json @@ -1594,7 +1594,7 @@ }, { "OFPTableFeaturePropExperimenter": { - "data": "", + "data": [], "exp_type": 0, "experimenter": 101, "length": 12, @@ -1603,7 +1603,9 @@ }, { "OFPTableFeaturePropExperimenter": { - "data": "AAAAAQ==", + "data": [ + 1 + ], "exp_type": 1, "experimenter": 101, "length": 16, @@ -1612,7 +1614,10 @@ }, { "OFPTableFeaturePropExperimenter": { - "data": "AAAAAQAAAAI=", + "data": [ + 1, + 2 + ], "exp_type": 2, "experimenter": 101, "length": 20, diff --git a/ryu/tests/unit/ofproto/json/of14/5-62-ofp_table_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-62-ofp_table_desc_reply.packet.json index 94f96594..1f3d7142 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-62-ofp_table_desc_reply.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-62-ofp_table_desc_reply.packet.json @@ -8,7 +8,7 @@ "properties": [ { "OFPTableModPropExperimenter": { - "data": "", + "data": [], "exp_type": 0, "experimenter": 101, "length": 12, @@ -42,7 +42,7 @@ }, { "OFPTableModPropExperimenter": { - "data": "", + "data": [], "exp_type": 0, "experimenter": 101, "length": 12, @@ -51,7 +51,9 @@ }, { "OFPTableModPropExperimenter": { - "data": "AAAAAQ==", + "data": [ + 1 + ], "exp_type": 1, "experimenter": 101, "length": 16, @@ -60,7 +62,10 @@ }, { "OFPTableModPropExperimenter": { - "data": "AAAAAQAAAAI=", + "data": [ + 1, + 2 + ], "exp_type": 2, "experimenter": 101, "length": 20, diff --git a/ryu/tests/unit/ofproto/json/of14/5-64-ofp_queue_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-64-ofp_queue_desc_reply.packet.json index a1dc9697..26c8f7d5 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-64-ofp_queue_desc_reply.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-64-ofp_queue_desc_reply.packet.json @@ -8,7 +8,7 @@ "properties": [ { "OFPQueueDescPropExperimenter": { - "data": "", + "data": [], "exp_type": 0, "experimenter": 101, "length": 12, @@ -40,7 +40,7 @@ }, { "OFPQueueDescPropExperimenter": { - "data": "", + "data": [], "exp_type": 0, "experimenter": 101, "length": 12, @@ -49,7 +49,9 @@ }, { "OFPQueueDescPropExperimenter": { - "data": "AAAAAQ==", + "data": [ + 1 + ], "exp_type": 1, "experimenter": 101, "length": 16, @@ -58,7 +60,10 @@ }, { "OFPQueueDescPropExperimenter": { - "data": "AAAAAQAAAAI=", + "data": [ + 1, + 2 + ], "exp_type": 2, "experimenter": 101, "length": 20, diff --git a/ryu/tests/unit/ofproto/json/of14/5-65-ofp_role_status.packet.json b/ryu/tests/unit/ofproto/json/of14/5-65-ofp_role_status.packet.json index 6bb86df9..08e46df3 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-65-ofp_role_status.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-65-ofp_role_status.packet.json @@ -4,7 +4,7 @@ "properties": [ { "OFPRolePropExperimenter": { - "data": "", + "data": [], "exp_type": 0, "experimenter": 101, "length": 12, @@ -13,7 +13,9 @@ }, { "OFPRolePropExperimenter": { - "data": "AAAAAQ==", + "data": [ + 1 + ], "exp_type": 1, "experimenter": 101, "length": 16, @@ -22,7 +24,10 @@ }, { "OFPRolePropExperimenter": { - "data": "AAAAAQAAAAI=", + "data": [ + 1, + 2 + ], "exp_type": 2, "experimenter": 101, "length": 20, diff --git a/ryu/tests/unit/ofproto/json/of14/5-68-ofp_table_status.packet.json b/ryu/tests/unit/ofproto/json/of14/5-68-ofp_table_status.packet.json index b66831b8..fde5fb77 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-68-ofp_table_status.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-68-ofp_table_status.packet.json @@ -24,7 +24,7 @@ }, { "OFPTableModPropExperimenter": { - "data": "", + "data": [], "exp_type": 0, "experimenter": 101, "length": 12, @@ -33,7 +33,9 @@ }, { "OFPTableModPropExperimenter": { - "data": "AAAAAQ==", + "data": [ + 1 + ], "exp_type": 1, "experimenter": 101, "length": 16, @@ -42,7 +44,10 @@ }, { "OFPTableModPropExperimenter": { - "data": "AAAAAQAAAAI=", + "data": [ + 1, + 2 + ], "exp_type": 2, "experimenter": 101, "length": 20, diff --git a/ryu/tests/unit/ofproto/json/of14/5-69-ofp_bundle_ctrl_msg.packet.json b/ryu/tests/unit/ofproto/json/of14/5-69-ofp_bundle_ctrl_msg.packet.json index 370036fd..3e996eb5 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-69-ofp_bundle_ctrl_msg.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-69-ofp_bundle_ctrl_msg.packet.json @@ -5,7 +5,7 @@ "properties": [ { "OFPBundlePropExperimenter": { - "data": "", + "data": [], "exp_type": 0, "experimenter": 101, "length": 12, @@ -14,7 +14,9 @@ }, { "OFPBundlePropExperimenter": { - "data": "AAAAAQ==", + "data": [ + 1 + ], "exp_type": 1, "experimenter": 101, "length": 16, @@ -23,7 +25,10 @@ }, { "OFPBundlePropExperimenter": { - "data": "AAAAAQAAAAI=", + "data": [ + 1, + 2 + ], "exp_type": 2, "experimenter": 101, "length": 20, diff --git a/ryu/tests/unit/ofproto/json/of14/5-70-ofp_bundle_add_msg.packet.json b/ryu/tests/unit/ofproto/json/of14/5-70-ofp_bundle_add_msg.packet.json index 3c267599..53e9f7ea 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-70-ofp_bundle_add_msg.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-70-ofp_bundle_add_msg.packet.json @@ -10,7 +10,7 @@ "properties": [ { "OFPBundlePropExperimenter": { - "data": "", + "data": [], "exp_type": 0, "experimenter": 101, "length": 12, @@ -19,7 +19,9 @@ }, { "OFPBundlePropExperimenter": { - "data": "AAAAAQ==", + "data": [ + 1 + ], "exp_type": 1, "experimenter": 101, "length": 16, @@ -28,7 +30,10 @@ }, { "OFPBundlePropExperimenter": { - "data": "AAAAAQAAAAI=", + "data": [ + 1, + 2 + ], "exp_type": 2, "experimenter": 101, "length": 20, |