Apply normalize_json.py

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

15 files changed, 552 insertions, 487 deletions

diff --git a/ryu/tests/unit/ofproto/json/of13/4-46-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-46-ofp_flow_mod.packet.json
index 736f7cdd..f4e59c76 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-46-ofp_flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-46-ofp_flow_mod.packet.json
@@ -10,9 +10,9 @@
       "instructions": [
          {
             "OFPInstructionMeter": {
-               "len": 8,
-               "type": 6,
-               "meter_id": 1
+               "len": 8, 
+               "meter_id": 1, 
+               "type": 6
             }
          }, 
          {
diff --git a/ryu/tests/unit/ofproto/json/of13/4-55-ofp_table_features_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-55-ofp_table_features_request.packet.json
index 56002983..2a1a4308 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-55-ofp_table_features_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-55-ofp_table_features_request.packet.json
@@ -1591,32 +1591,37 @@
                         ], 
                         "type": 14
                      }
-                  },
+                  }, 
                   {
                      "OFPTableFeaturePropExperimenter": {
-                         "length": 12, 
-                         "type": 65534, 
-                         "exp_type": 0, 
-                         "experimenter": 101, 
-                         "data": []
+                        "data": [], 
+                        "exp_type": 0, 
+                        "experimenter": 101, 
+                        "length": 12, 
+                        "type": 65534
                      }
                   }, 
                   {
                      "OFPTableFeaturePropExperimenter": {
-                         "length": 16, 
-                         "type": 65534, 
-                         "exp_type": 1, 
-                         "experimenter": 101, 
-                         "data": [1]
+                        "data": [
+                           1
+                        ], 
+                        "exp_type": 1, 
+                        "experimenter": 101, 
+                        "length": 16, 
+                        "type": 65534
                      }
                   }, 
                   {
                      "OFPTableFeaturePropExperimenter": {
-                         "length": 20, 
-                         "type": 65534, 
-                         "exp_type": 2, 
-                         "experimenter": 101, 
-                         "data": [1, 2]
+                        "data": [
+                           1, 
+                           2
+                        ], 
+                        "exp_type": 2, 
+                        "experimenter": 101, 
+                        "length": 20, 
+                        "type": 65534
                      }
                   }
                ], 
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 4f46c567..ea056e8f 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
@@ -1591,32 +1591,37 @@
                         ], 
                         "type": 14
                      }
-                  },
+                  }, 
                   {
                      "OFPTableFeaturePropExperimenter": {
-                         "length": 12, 
-                         "type": 65534, 
-                         "exp_type": 0, 
-                         "experimenter": 101, 
-                         "data": []
+                        "data": [], 
+                        "exp_type": 0, 
+                        "experimenter": 101, 
+                        "length": 12, 
+                        "type": 65534
                      }
                   }, 
                   {
                      "OFPTableFeaturePropExperimenter": {
-                         "length": 16, 
-                         "type": 65534, 
-                         "exp_type": 1, 
-                         "experimenter": 101, 
-                         "data": [1]
+                        "data": [
+                           1
+                        ], 
+                        "exp_type": 1, 
+                        "experimenter": 101, 
+                        "length": 16, 
+                        "type": 65534
                      }
                   }, 
                   {
                      "OFPTableFeaturePropExperimenter": {
-                         "length": 20, 
-                         "type": 65534, 
-                         "exp_type": 2, 
-                         "experimenter": 101, 
-                         "data": [1, 2]
+                        "data": [
+                           1, 
+                           2
+                        ], 
+                        "exp_type": 2, 
+                        "experimenter": 101, 
+                        "length": 20, 
+                        "type": 65534
                      }
                   }
                ], 
diff --git a/ryu/tests/unit/ofproto/json/of14/5-2-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of14/5-2-ofp_flow_mod.packet.json
index f2fd8c43..2b4eaead 100644
--- a/ryu/tests/unit/ofproto/json/of14/5-2-ofp_flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-2-ofp_flow_mod.packet.json
@@ -108,14 +108,14 @@
                      }
                   }, 
                   {
-                      "OFPActionExperimenter": {
-                         "data": "AAECAwQFBgc=", 
-                         "experimenter": 101, 
-                         "len": 16, 
-                         "type": 65535
-                      }
-                   }, 
-                   {
+                     "OFPActionExperimenter": {
+                        "data": "AAECAwQFBgc=", 
+                        "experimenter": 101, 
+                        "len": 16, 
+                        "type": 65535
+                     }
+                  }, 
+                  {
                      "OFPActionSetQueue": {
                         "len": 8, 
                         "queue_id": 3, 
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 4489d5e1..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
@@ -3,53 +3,58 @@
       "config": 0, 
       "hw_addr": "00:11:00:00:11:11", 
       "mask": 0, 
+      "port_no": 1, 
       "properties": [
-          {
-              "OFPPortModPropEthernet": {
-                  "type": 0, 
-                  "length": 8, 
-                  "advertise": 4096
-              }
-           },
-           {
-              "OFPPortModPropOptical": {
-                  "length": 24, 
-                  "type": 1, 
-                  "configure": 3, 
-                  "freq_lmda": 1500, 
-                  "fl_offset": 2000, 
-                  "grid_span": 3000, 
-                  "tx_pwr": 300
-              }
-           },
-           {
-              "OFPPortModPropExperimenter": {
-                  "length": 12, 
-                  "type": 65535, 
-                  "exp_type": 0, 
-                  "experimenter": 101, 
-                  "data": []
-              }
-           }, 
-           {
-              "OFPPortModPropExperimenter": {
-                  "length": 16, 
-                  "type": 65535, 
-                  "exp_type": 1, 
-                  "experimenter": 101, 
-                  "data": [1]
-              }
-           }, 
-           {
-              "OFPPortModPropExperimenter": {
-                  "length": 20, 
-                  "type": 65535, 
-                  "exp_type": 2, 
-                  "experimenter": 101, 
-                  "data": [1, 2]
-              }
-          }
-      ], 
-      "port_no": 1
+         {
+            "OFPPortModPropEthernet": {
+               "advertise": 4096, 
+               "length": 8, 
+               "type": 0
+            }
+         }, 
+         {
+            "OFPPortModPropOptical": {
+               "configure": 3, 
+               "fl_offset": 2000, 
+               "freq_lmda": 1500, 
+               "grid_span": 3000, 
+               "length": 24, 
+               "tx_pwr": 300, 
+               "type": 1
+            }
+         }, 
+         {
+            "OFPPortModPropExperimenter": {
+               "data": [], 
+               "exp_type": 0, 
+               "experimenter": 101, 
+               "length": 12, 
+               "type": 65535
+            }
+         }, 
+         {
+            "OFPPortModPropExperimenter": {
+               "data": [
+                  1
+               ], 
+               "exp_type": 1, 
+               "experimenter": 101, 
+               "length": 16, 
+               "type": 65535
+            }
+         }, 
+         {
+            "OFPPortModPropExperimenter": {
+               "data": [
+                  1, 
+                  2
+               ], 
+               "exp_type": 2, 
+               "experimenter": 101, 
+               "length": 20, 
+               "type": 65535
+            }
+         }
+      ]
    }
 }
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 1725e199..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
@@ -1,51 +1,56 @@
 {
    "OFPTableMod": {
       "config": 0, 
-      "table_id": 255, 
-       "properties": [
-           {
-               "OFPTableModPropEviction": {
-                   "flags": 0, 
-                   "length": 8, 
-                   "type": 2
-               }
-           },
-           {
-               "OFPTableModPropVacancy": {
-                   "length": 8, 
-                   "type": 3, 
-                   "vacancy": 0, 
-                   "vacancy_down": 0, 
-                   "vacancy_up": 0
-               }
-           },
-           {
-               "OFPTableModPropExperimenter": {
-                   "length": 12, 
-                   "type": 65535, 
-                   "exp_type": 0, 
-                   "experimenter": 101, 
-                   "data": []
-               }
-           },
-           {
-               "OFPTableModPropExperimenter": {
-                   "length": 16, 
-                   "type": 65535, 
-                   "exp_type": 1, 
-                   "experimenter": 101, 
-                   "data": [1]
-               }
-           },
-           {
-               "OFPTableModPropExperimenter": {
-                   "length": 20, 
-                   "type": 65535, 
-                   "exp_type": 2, 
-                   "experimenter": 101, 
-                   "data": [1, 2]
-               }
-           }
-       ]
+      "properties": [
+         {
+            "OFPTableModPropEviction": {
+               "flags": 0, 
+               "length": 8, 
+               "type": 2
+            }
+         }, 
+         {
+            "OFPTableModPropVacancy": {
+               "length": 8, 
+               "type": 3, 
+               "vacancy": 0, 
+               "vacancy_down": 0, 
+               "vacancy_up": 0
+            }
+         }, 
+         {
+            "OFPTableModPropExperimenter": {
+               "data": [], 
+               "exp_type": 0, 
+               "experimenter": 101, 
+               "length": 12, 
+               "type": 65535
+            }
+         }, 
+         {
+            "OFPTableModPropExperimenter": {
+               "data": [
+                  1
+               ], 
+               "exp_type": 1, 
+               "experimenter": 101, 
+               "length": 16, 
+               "type": 65535
+            }
+         }, 
+         {
+            "OFPTableModPropExperimenter": {
+               "data": [
+                  1, 
+                  2
+               ], 
+               "exp_type": 2, 
+               "experimenter": 101, 
+               "length": 20, 
+               "type": 65535
+            }
+         }
+      ], 
+      "table_id": 255
    }
 }
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 eb39856d..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
@@ -19,47 +19,52 @@
                      }
                   }, 
                   {
-                      "OFPPortStatsPropOptical": {
-                          "bias_current": 300, 
-                          "tx_freq_lmda": 1500, 
-                          "temperature": 273, 
-                          "rx_freq_lmda": 1500, 
-                          "tx_pwr": 2000, 
-                          "length": 44, 
-                          "flags": 3, 
-                          "rx_offset": 700, 
-                          "rx_grid_span": 500, 
-                          "rx_pwr": 2000, 
-                          "tx_offset": 700, 
-                          "type": 1, 
-                          "tx_grid_span": 500
-                      }
-                  },
+                     "OFPPortStatsPropOptical": {
+                        "bias_current": 300, 
+                        "flags": 3, 
+                        "length": 44, 
+                        "rx_freq_lmda": 1500, 
+                        "rx_grid_span": 500, 
+                        "rx_offset": 700, 
+                        "rx_pwr": 2000, 
+                        "temperature": 273, 
+                        "tx_freq_lmda": 1500, 
+                        "tx_grid_span": 500, 
+                        "tx_offset": 700, 
+                        "tx_pwr": 2000, 
+                        "type": 1
+                     }
+                  }, 
                   {
                      "OFPPortStatsPropExperimenter": {
-                         "length": 12, 
-                         "type": 65535, 
-                         "exp_type": 0, 
-                         "experimenter": 101, 
-                         "data": []
+                        "data": [], 
+                        "exp_type": 0, 
+                        "experimenter": 101, 
+                        "length": 12, 
+                        "type": 65535
                      }
                   }, 
                   {
                      "OFPPortStatsPropExperimenter": {
-                         "length": 16, 
-                         "type": 65535, 
-                         "exp_type": 1, 
-                         "experimenter": 101, 
-                         "data": [1]
+                        "data": [
+                           1
+                        ], 
+                        "exp_type": 1, 
+                        "experimenter": 101, 
+                        "length": 16, 
+                        "type": 65535
                      }
                   }, 
                   {
                      "OFPPortStatsPropExperimenter": {
-                         "length": 20, 
-                         "type": 65535, 
-                         "exp_type": 2, 
-                         "experimenter": 101, 
-                         "data": [1, 2]
+                        "data": [
+                           1, 
+                           2
+                        ], 
+                        "exp_type": 2, 
+                        "experimenter": 101, 
+                        "length": 20, 
+                        "type": 65535
                      }
                   }
                ], 
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 5fecc669..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,32 +10,37 @@
                "properties": [
                   {
                      "OFPQueueStatsPropExperimenter": {
-                         "length": 12, 
-                         "type": 65535, 
-                         "exp_type": 0, 
-                         "experimenter": 101, 
-                         "data": []
+                        "data": [], 
+                        "exp_type": 0, 
+                        "experimenter": 101, 
+                        "length": 12, 
+                        "type": 65535
                      }
                   }, 
                   {
                      "OFPQueueStatsPropExperimenter": {
-                         "length": 16, 
-                         "type": 65535, 
-                         "exp_type": 1, 
-                         "experimenter": 101, 
-                         "data": [1]
+                        "data": [
+                           1
+                        ], 
+                        "exp_type": 1, 
+                        "experimenter": 101, 
+                        "length": 16, 
+                        "type": 65535
                      }
                   }, 
                   {
                      "OFPQueueStatsPropExperimenter": {
-                         "length": 20, 
-                         "type": 65535, 
-                         "exp_type": 2, 
-                         "experimenter": 101, 
-                         "data": [1, 2]
+                        "data": [
+                           1, 
+                           2
+                        ], 
+                        "exp_type": 2, 
+                        "experimenter": 101, 
+                        "length": 20, 
+                        "type": 65535
                      }
-                  } 
-               ],
+                  }
+               ], 
                "queue_id": 1, 
                "tx_bytes": 0, 
                "tx_errors": 0, 
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 129ee211..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
@@ -9,60 +9,65 @@
             "port_no": 7, 
             "properties": [
                {
-                   "OFPPortDescPropEthernet": {
-                      "length": 32, 
-                      "type": 0, 
-                      "advertised": 10240, 
-                      "curr": 10248, 
-                      "curr_speed": 5000, 
-                      "max_speed": 5000, 
-                      "peer": 10248, 
-                      "supported": 10248
-                   }
-                },
-                {
-                   "OFPPortDescPropOptical": {
-                       "length": 40, 
-                       "type": 1, 
-                       "rx_grid_freq_lmda": 1500, 
-                       "rx_max_freq_lmda": 2000, 
-                       "rx_min_freq_lmda": 1000, 
-                       "supported": 1, 
-                       "tx_grid_freq_lmda": 1500, 
-                       "tx_max_freq_lmda": 2000, 
-                       "tx_min_freq_lmda": 1000, 
-                       "tx_pwr_max": 2000, 
-                       "tx_pwr_min": 1000
-                   }
-                },
-                {
-                   "OFPPortDescPropExperimenter": {
-                       "length": 12, 
-                       "type": 65535, 
-                       "exp_type": 0, 
-                       "experimenter": 101, 
-                       "data": []
-                   }
-                },
-                {
-                   "OFPPortDescPropExperimenter": {
-                       "length": 16, 
-                       "type": 65535, 
-                       "exp_type": 1, 
-                       "experimenter": 101, 
-                       "data": [1]
-                   }
-                },
-                {
-                   "OFPPortDescPropExperimenter": {
-                       "length": 20, 
-                       "type": 65535, 
-                       "exp_type": 2, 
-                       "experimenter": 101, 
-                       "data": [1, 2]
-                   }
+                  "OFPPortDescPropEthernet": {
+                     "advertised": 10240, 
+                     "curr": 10248, 
+                     "curr_speed": 5000, 
+                     "length": 32, 
+                     "max_speed": 5000, 
+                     "peer": 10248, 
+                     "supported": 10248, 
+                     "type": 0
+                  }
+               }, 
+               {
+                  "OFPPortDescPropOptical": {
+                     "length": 40, 
+                     "rx_grid_freq_lmda": 1500, 
+                     "rx_max_freq_lmda": 2000, 
+                     "rx_min_freq_lmda": 1000, 
+                     "supported": 1, 
+                     "tx_grid_freq_lmda": 1500, 
+                     "tx_max_freq_lmda": 2000, 
+                     "tx_min_freq_lmda": 1000, 
+                     "tx_pwr_max": 2000, 
+                     "tx_pwr_min": 1000, 
+                     "type": 1
+                  }
+               }, 
+               {
+                  "OFPPortDescPropExperimenter": {
+                     "data": [], 
+                     "exp_type": 0, 
+                     "experimenter": 101, 
+                     "length": 12, 
+                     "type": 65535
+                  }
+               }, 
+               {
+                  "OFPPortDescPropExperimenter": {
+                     "data": [
+                        1
+                     ], 
+                     "exp_type": 1, 
+                     "experimenter": 101, 
+                     "length": 16, 
+                     "type": 65535
+                  }
+               }, 
+               {
+                  "OFPPortDescPropExperimenter": {
+                     "data": [
+                        1, 
+                        2
+                     ], 
+                     "exp_type": 2, 
+                     "experimenter": 101, 
+                     "length": 20, 
+                     "type": 65535
+                  }
                }
-            ],
+            ], 
             "state": 4
          }
       }, 
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 e1b787e3..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
@@ -7,63 +7,68 @@
                "hw_addr": "f2:0b:a4:d0:3f:70", 
                "length": 168, 
                "name": "Port7", 
-               "properties": [
-                   {
-                       "OFPPortDescPropEthernet": {
-                           "length": 32, 
-                           "type": 0, 
-                           "advertised": 10240, 
-                           "curr": 10248, 
-                           "curr_speed": 5000, 
-                           "max_speed": 5000, 
-                           "peer": 10248, 
-                           "supported": 10248
-                       }
-                    },
-                    {
-                       "OFPPortDescPropOptical": {
-                           "length": 40, 
-                           "type": 1, 
-                           "rx_grid_freq_lmda": 1500, 
-                           "rx_max_freq_lmda": 2000, 
-                           "rx_min_freq_lmda": 1000, 
-                           "supported": 1, 
-                           "tx_grid_freq_lmda": 1500, 
-                           "tx_max_freq_lmda": 2000, 
-                           "tx_min_freq_lmda": 1000, 
-                           "tx_pwr_max": 2000, 
-                           "tx_pwr_min": 1000
-                       }
-                    },
-                    {
-                       "OFPPortDescPropExperimenter": {
-                           "length": 12, 
-                           "type": 65535, 
-                           "exp_type": 0, 
-                           "experimenter": 101, 
-                           "data": []
-                       }
-                    },
-                    {
-                       "OFPPortDescPropExperimenter": {
-                           "length": 16, 
-                           "type": 65535, 
-                           "exp_type": 1, 
-                           "experimenter": 101, 
-                           "data": [1]
-                       }
-                    },
-                    {
-                       "OFPPortDescPropExperimenter": {
-                           "length": 20, 
-                           "type": 65535, 
-                           "exp_type": 2, 
-                           "experimenter": 101, 
-                           "data": [1, 2]
-                       }
-                   }
-               ],
                "port_no": 7, 
+               "properties": [
+                  {
+                     "OFPPortDescPropEthernet": {
+                        "advertised": 10240, 
+                        "curr": 10248, 
+                        "curr_speed": 5000, 
+                        "length": 32, 
+                        "max_speed": 5000, 
+                        "peer": 10248, 
+                        "supported": 10248, 
+                        "type": 0
+                     }
+                  }, 
+                  {
+                     "OFPPortDescPropOptical": {
+                        "length": 40, 
+                        "rx_grid_freq_lmda": 1500, 
+                        "rx_max_freq_lmda": 2000, 
+                        "rx_min_freq_lmda": 1000, 
+                        "supported": 1, 
+                        "tx_grid_freq_lmda": 1500, 
+                        "tx_max_freq_lmda": 2000, 
+                        "tx_min_freq_lmda": 1000, 
+                        "tx_pwr_max": 2000, 
+                        "tx_pwr_min": 1000, 
+                        "type": 1
+                     }
+                  }, 
+                  {
+                     "OFPPortDescPropExperimenter": {
+                        "data": [], 
+                        "exp_type": 0, 
+                        "experimenter": 101, 
+                        "length": 12, 
+                        "type": 65535
+                     }
+                  }, 
+                  {
+                     "OFPPortDescPropExperimenter": {
+                        "data": [
+                           1
+                        ], 
+                        "exp_type": 1, 
+                        "experimenter": 101, 
+                        "length": 16, 
+                        "type": 65535
+                     }
+                  }, 
+                  {
+                     "OFPPortDescPropExperimenter": {
+                        "data": [
+                           1, 
+                           2
+                        ], 
+                        "exp_type": 2, 
+                        "experimenter": 101, 
+                        "length": 20, 
+                        "type": 65535
+                     }
+                  }
+               ], 
                "state": 4
             }
          }, 
@@ -73,21 +78,21 @@
                "hw_addr": "f2:0b:a4:7d:f8:ea", 
                "length": 72, 
                "name": "Port6", 
-               "properties": [
-                   {
-                       "OFPPortDescPropEthernet": {
-                           "length": 32, 
-                           "type": 0, 
-                           "advertised": 10240, 
-                           "curr": 10248, 
-                           "curr_speed": 5000, 
-                           "max_speed": 5000, 
-                           "peer": 10248, 
-                           "supported": 10248
-                       }
-                   }
-               ],
                "port_no": 6, 
+               "properties": [
+                  {
+                     "OFPPortDescPropEthernet": {
+                        "advertised": 10240, 
+                        "curr": 10248, 
+                        "curr_speed": 5000, 
+                        "length": 32, 
+                        "max_speed": 5000, 
+                        "peer": 10248, 
+                        "supported": 10248, 
+                        "type": 0
+                     }
+                  }
+               ], 
                "state": 4
             }
          }
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 e5a1b74e..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
@@ -779,7 +779,7 @@
                                  "length": 0, 
                                  "type": "mpls_bos"
                               }
-                           },
+                           }, 
                            {
                               "OFPOxmId": {
                                  "hasmask": 0, 
@@ -1591,32 +1591,37 @@
                         ], 
                         "type": 14
                      }
-                  },
+                  }, 
                   {
                      "OFPTableFeaturePropExperimenter": {
-                         "length": 12, 
-                         "type": 65534, 
-                         "exp_type": 0, 
-                         "experimenter": 101, 
-                         "data": []
+                        "data": [], 
+                        "exp_type": 0, 
+                        "experimenter": 101, 
+                        "length": 12, 
+                        "type": 65534
                      }
                   }, 
                   {
                      "OFPTableFeaturePropExperimenter": {
-                         "length": 16, 
-                         "type": 65534, 
-                         "exp_type": 1, 
-                         "experimenter": 101, 
-                         "data": [1]
+                        "data": [
+                           1
+                        ], 
+                        "exp_type": 1, 
+                        "experimenter": 101, 
+                        "length": 16, 
+                        "type": 65534
                      }
                   }, 
                   {
                      "OFPTableFeaturePropExperimenter": {
-                         "length": 20, 
-                         "type": 65534, 
-                         "exp_type": 2, 
-                         "experimenter": 101, 
-                         "data": [1, 2]
+                        "data": [
+                           1, 
+                           2
+                        ], 
+                        "exp_type": 2, 
+                        "experimenter": 101, 
+                        "length": 20, 
+                        "type": 65534
                      }
                   }
                ], 
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 93365584..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
@@ -1590,35 +1590,40 @@
                            }
                         ], 
                         "type": 14
-                       }
-                    }, 
-                    {
-                       "OFPTableFeaturePropExperimenter": {
-                           "length": 12, 
-                           "type": 65534, 
-                           "exp_type": 0, 
-                           "experimenter": 101, 
-                           "data": []
-                       }
-                    }, 
-                    {
-                       "OFPTableFeaturePropExperimenter": {
-                           "length": 16, 
-                           "type": 65534, 
-                           "exp_type": 1, 
-                           "experimenter": 101, 
-                           "data": [1]
-                       }
-                    }, 
-                    {
-                       "OFPTableFeaturePropExperimenter": {
-                           "length": 20, 
-                           "type": 65534, 
-                           "exp_type": 2, 
-                           "experimenter": 101, 
-                           "data": [1, 2]
-                       }
-                    }
+                     }
+                  }, 
+                  {
+                     "OFPTableFeaturePropExperimenter": {
+                        "data": [], 
+                        "exp_type": 0, 
+                        "experimenter": 101, 
+                        "length": 12, 
+                        "type": 65534
+                     }
+                  }, 
+                  {
+                     "OFPTableFeaturePropExperimenter": {
+                        "data": [
+                           1
+                        ], 
+                        "exp_type": 1, 
+                        "experimenter": 101, 
+                        "length": 16, 
+                        "type": 65534
+                     }
+                  }, 
+                  {
+                     "OFPTableFeaturePropExperimenter": {
+                        "data": [
+                           1, 
+                           2
+                        ], 
+                        "exp_type": 2, 
+                        "experimenter": 101, 
+                        "length": 20, 
+                        "type": 65534
+                     }
+                  }
                ], 
                "table_id": 0
             }
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 c713bc79..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
@@ -6,68 +6,73 @@
                "config": 0, 
                "length": 24, 
                "properties": [
-                   {
-                       "OFPTableModPropExperimenter": {
-                           "length": 12, 
-                           "type": 65535, 
-                           "exp_type": 0, 
-                           "experimenter": 101, 
-                           "data": []
-                       }
-                   }
-               ],
+                  {
+                     "OFPTableModPropExperimenter": {
+                        "data": [], 
+                        "exp_type": 0, 
+                        "experimenter": 101, 
+                        "length": 12, 
+                        "type": 65535
+                     }
+                  }
+               ], 
                "table_id": 7
             }
-         },
+         }, 
          {
             "OFPTableDesc": {
                "config": 0, 
                "length": 80, 
                "properties": [
-                   {
-                       "OFPTableModPropEviction": {
-                           "flags": 0, 
-                           "length": 8, 
-                           "type": 2
-                       }
-                   },
-                   {
-                       "OFPTableModPropVacancy": {
-                           "length": 8, 
-                           "type": 3, 
-                           "vacancy": 0, 
-                           "vacancy_down": 0, 
-                           "vacancy_up": 0
-                       }
-                   },
-                   {
-                       "OFPTableModPropExperimenter": {
-                           "length": 12, 
-                           "type": 65535, 
-                           "exp_type": 0, 
-                           "experimenter": 101, 
-                           "data": []
-                       }
-                   },
-                   {
-                       "OFPTableModPropExperimenter": {
-                           "length": 16, 
-                           "type": 65535, 
-                           "exp_type": 1, 
-                           "experimenter": 101, 
-                           "data": [1]
-                       }
-                   },
-                   {
-                       "OFPTableModPropExperimenter": {
-                           "length": 20, 
-                           "type": 65535, 
-                           "exp_type": 2, 
-                           "experimenter": 101, 
-                           "data": [1, 2]
-                       }
-                   }
-               ],
+                  {
+                     "OFPTableModPropEviction": {
+                        "flags": 0, 
+                        "length": 8, 
+                        "type": 2
+                     }
+                  }, 
+                  {
+                     "OFPTableModPropVacancy": {
+                        "length": 8, 
+                        "type": 3, 
+                        "vacancy": 0, 
+                        "vacancy_down": 0, 
+                        "vacancy_up": 0
+                     }
+                  }, 
+                  {
+                     "OFPTableModPropExperimenter": {
+                        "data": [], 
+                        "exp_type": 0, 
+                        "experimenter": 101, 
+                        "length": 12, 
+                        "type": 65535
+                     }
+                  }, 
+                  {
+                     "OFPTableModPropExperimenter": {
+                        "data": [
+                           1
+                        ], 
+                        "exp_type": 1, 
+                        "experimenter": 101, 
+                        "length": 16, 
+                        "type": 65535
+                     }
+                  }, 
+                  {
+                     "OFPTableModPropExperimenter": {
+                        "data": [
+                           1, 
+                           2
+                        ], 
+                        "exp_type": 2, 
+                        "experimenter": 101, 
+                        "length": 20, 
+                        "type": 65535
+                     }
+                  }
+               ], 
                "table_id": 8
             }
          }
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 25989ad2..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
@@ -6,65 +6,70 @@
                "len": 32, 
                "port_no": 7, 
                "properties": [
-                   {
-                       "OFPQueueDescPropExperimenter": {
-                           "length": 12, 
-                           "type": 65535, 
-                           "exp_type": 0, 
-                           "experimenter": 101, 
-                           "data": []
-                       }
-                   }
+                  {
+                     "OFPQueueDescPropExperimenter": {
+                        "data": [], 
+                        "exp_type": 0, 
+                        "experimenter": 101, 
+                        "length": 12, 
+                        "type": 65535
+                     }
+                  }
                ], 
                "queue_id": 0
             }
-         },
+         }, 
          {
             "OFPQueueDesc": {
                "len": 88, 
                "port_no": 8, 
                "properties": [
-                   {
-		       "OFPQueueDescPropMinRate": {
-			   "length": 8, 
-		           "type": 1, 
-			   "rate": 300
-                       }
-                   },
-                   {
-		       "OFPQueueDescPropMaxRate": {
-			   "length": 8, 
-		           "type": 2, 
-			   "rate": 900
-                       }
-                   },
-                   {
-                       "OFPQueueDescPropExperimenter": {
-                           "length": 12, 
-                           "type": 65535, 
-                           "exp_type": 0, 
-                           "experimenter": 101, 
-                           "data": []
-                       }
-                   },
-                   {
-                       "OFPQueueDescPropExperimenter": {
-                           "length": 16, 
-                           "type": 65535, 
-                           "exp_type": 1, 
-                           "experimenter": 101, 
-                           "data": [1]
-                       }
-                   },
-                   {
-                       "OFPQueueDescPropExperimenter": {
-                           "length": 20, 
-                           "type": 65535, 
-                           "exp_type": 2, 
-                           "experimenter": 101, 
-                           "data": [1, 2]
-                       }
-                   }
+                  {
+                     "OFPQueueDescPropMinRate": {
+                        "length": 8, 
+                        "rate": 300, 
+                        "type": 1
+                     }
+                  }, 
+                  {
+                     "OFPQueueDescPropMaxRate": {
+                        "length": 8, 
+                        "rate": 900, 
+                        "type": 2
+                     }
+                  }, 
+                  {
+                     "OFPQueueDescPropExperimenter": {
+                        "data": [], 
+                        "exp_type": 0, 
+                        "experimenter": 101, 
+                        "length": 12, 
+                        "type": 65535
+                     }
+                  }, 
+                  {
+                     "OFPQueueDescPropExperimenter": {
+                        "data": [
+                           1
+                        ], 
+                        "exp_type": 1, 
+                        "experimenter": 101, 
+                        "length": 16, 
+                        "type": 65535
+                     }
+                  }, 
+                  {
+                     "OFPQueueDescPropExperimenter": {
+                        "data": [
+                           1, 
+                           2
+                        ], 
+                        "exp_type": 2, 
+                        "experimenter": 101, 
+                        "length": 20, 
+                        "type": 65535
+                     }
+                  }
                ], 
                "queue_id": 1
             }
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 ac56eb67..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
@@ -2,34 +2,39 @@
    "OFPRoleStatus": {
       "generation_id": 7, 
       "properties": [
-          {
-              "OFPRolePropExperimenter": {
-                  "length": 12, 
-                  "type": 65535, 
-                  "exp_type": 0, 
-                  "experimenter": 101, 
-                  "data": []
-              }
-          },
-          {
-              "OFPRolePropExperimenter": {
-                  "length": 16, 
-                  "type": 65535, 
-                  "exp_type": 1, 
-                  "experimenter": 101, 
-                  "data": [1]
-              }
-          },
-          {
-              "OFPRolePropExperimenter": {
-                  "length": 20, 
-                  "type": 65535, 
-                  "exp_type": 2, 
-                  "experimenter": 101, 
-                  "data": [1, 2]
-              }
-          }
-      ],
+         {
+            "OFPRolePropExperimenter": {
+               "data": [], 
+               "exp_type": 0, 
+               "experimenter": 101, 
+               "length": 12, 
+               "type": 65535
+            }
+         }, 
+         {
+            "OFPRolePropExperimenter": {
+               "data": [
+                  1
+               ], 
+               "exp_type": 1, 
+               "experimenter": 101, 
+               "length": 16, 
+               "type": 65535
+            }
+         }, 
+         {
+            "OFPRolePropExperimenter": {
+               "data": [
+                  1, 
+                  2
+               ], 
+               "exp_type": 2, 
+               "experimenter": 101, 
+               "length": 20, 
+               "type": 65535
+            }
+         }
+      ], 
       "reason": 0, 
       "role": 2
    }