summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>2014-03-05 16:56:42 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2014-03-05 17:07:55 +0900
commitb570fca1aa4b6016572dc068ba284900368b5176 (patch)
treedf29ab20619b6001db845f0f8e251bbc6cc7687b
parente0ce84983ef41fff1299a435b37a683e74c639ec (diff)
test_parser: update expected json representation
Update after experimenter data change. 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/of14/5-22-ofp_port_mod.packet.json11
-rw-r--r--ryu/tests/unit/ofproto/json/of14/5-23-ofp_table_mod.packet.json11
-rw-r--r--ryu/tests/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json11
-rw-r--r--ryu/tests/unit/ofproto/json/of14/5-36-ofp_queue_stats_reply.packet.json11
-rw-r--r--ryu/tests/unit/ofproto/json/of14/5-37-ofp_port_status.packet.json11
-rw-r--r--ryu/tests/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json11
-rw-r--r--ryu/tests/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json11
-rw-r--r--ryu/tests/unit/ofproto/json/of14/5-54-ofp_table_features_reply.packet.json11
-rw-r--r--ryu/tests/unit/ofproto/json/of14/5-62-ofp_table_desc_reply.packet.json13
-rw-r--r--ryu/tests/unit/ofproto/json/of14/5-64-ofp_queue_desc_reply.packet.json13
-rw-r--r--ryu/tests/unit/ofproto/json/of14/5-65-ofp_role_status.packet.json11
11 files changed, 35 insertions, 90 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 a255b9dd..79bacdf6 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,9 +34,7 @@
},
{
"OFPPortModPropExperimenter": {
- "data": [
- 1
- ],
+ "data": "AAAAAQ==",
"exp_type": 1,
"experimenter": 101,
"length": 16,
@@ -45,10 +43,7 @@
},
{
"OFPPortModPropExperimenter": {
- "data": [
- 1,
- 2
- ],
+ "data": "AAAAAQAAAAI=",
"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 97acd144..e2e968ca 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,9 +29,7 @@
},
{
"OFPTableModPropExperimenter": {
- "data": [
- 1
- ],
+ "data": "AAAAAQ==",
"exp_type": 1,
"experimenter": 101,
"length": 16,
@@ -40,10 +38,7 @@
},
{
"OFPTableModPropExperimenter": {
- "data": [
- 1,
- 2
- ],
+ "data": "AAAAAQAAAAI=",
"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 4ea41742..68310f20 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,9 +46,7 @@
},
{
"OFPPortStatsPropExperimenter": {
- "data": [
- 1
- ],
+ "data": "AAAAAQ==",
"exp_type": 1,
"experimenter": 101,
"length": 16,
@@ -57,10 +55,7 @@
},
{
"OFPPortStatsPropExperimenter": {
- "data": [
- 1,
- 2
- ],
+ "data": "AAAAAQAAAAI=",
"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 2c190977..c9fa0cd8 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,9 +19,7 @@
},
{
"OFPQueueStatsPropExperimenter": {
- "data": [
- 1
- ],
+ "data": "AAAAAQ==",
"exp_type": 1,
"experimenter": 101,
"length": 16,
@@ -30,10 +28,7 @@
},
{
"OFPQueueStatsPropExperimenter": {
- "data": [
- 1,
- 2
- ],
+ "data": "AAAAAQAAAAI=",
"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 b273ac22..9d3683c9 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,9 +46,7 @@
},
{
"OFPPortDescPropExperimenter": {
- "data": [
- 1
- ],
+ "data": "AAAAAQ==",
"exp_type": 1,
"experimenter": 101,
"length": 16,
@@ -57,10 +55,7 @@
},
{
"OFPPortDescPropExperimenter": {
- "data": [
- 1,
- 2
- ],
+ "data": "AAAAAQAAAAI=",
"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 c281c0f8..07491eff 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,9 +47,7 @@
},
{
"OFPPortDescPropExperimenter": {
- "data": [
- 1
- ],
+ "data": "AAAAAQ==",
"exp_type": 1,
"experimenter": 101,
"length": 16,
@@ -58,10 +56,7 @@
},
{
"OFPPortDescPropExperimenter": {
- "data": [
- 1,
- 2
- ],
+ "data": "AAAAAQAAAAI=",
"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 2a1a4308..e0e78edd 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,9 +1603,7 @@
},
{
"OFPTableFeaturePropExperimenter": {
- "data": [
- 1
- ],
+ "data": "AAAAAQ==",
"exp_type": 1,
"experimenter": 101,
"length": 16,
@@ -1614,10 +1612,7 @@
},
{
"OFPTableFeaturePropExperimenter": {
- "data": [
- 1,
- 2
- ],
+ "data": "AAAAAQAAAAI=",
"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 ea056e8f..5257e081 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,9 +1603,7 @@
},
{
"OFPTableFeaturePropExperimenter": {
- "data": [
- 1
- ],
+ "data": "AAAAAQ==",
"exp_type": 1,
"experimenter": 101,
"length": 16,
@@ -1614,10 +1612,7 @@
},
{
"OFPTableFeaturePropExperimenter": {
- "data": [
- 1,
- 2
- ],
+ "data": "AAAAAQAAAAI=",
"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 1f3d7142..94f96594 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,9 +51,7 @@
},
{
"OFPTableModPropExperimenter": {
- "data": [
- 1
- ],
+ "data": "AAAAAQ==",
"exp_type": 1,
"experimenter": 101,
"length": 16,
@@ -62,10 +60,7 @@
},
{
"OFPTableModPropExperimenter": {
- "data": [
- 1,
- 2
- ],
+ "data": "AAAAAQAAAAI=",
"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 26c8f7d5..a1dc9697 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,9 +49,7 @@
},
{
"OFPQueueDescPropExperimenter": {
- "data": [
- 1
- ],
+ "data": "AAAAAQ==",
"exp_type": 1,
"experimenter": 101,
"length": 16,
@@ -60,10 +58,7 @@
},
{
"OFPQueueDescPropExperimenter": {
- "data": [
- 1,
- 2
- ],
+ "data": "AAAAAQAAAAI=",
"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 08e46df3..6bb86df9 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,9 +13,7 @@
},
{
"OFPRolePropExperimenter": {
- "data": [
- 1
- ],
+ "data": "AAAAAQ==",
"exp_type": 1,
"experimenter": 101,
"length": 16,
@@ -24,10 +22,7 @@
},
{
"OFPRolePropExperimenter": {
- "data": [
- 1,
- 2
- ],
+ "data": "AAAAAQAAAAI=",
"exp_type": 2,
"experimenter": 101,
"length": 20,