Revert "tests: Separate test files from Ryu module"

This reverts commit a67ed2858417b9d795460f05126c01fb0cd344f9. The commit breaks OpenStack neutron dynamic routing.
author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> 2017-06-30 14:23:03 +0900
committer: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> 2017-06-30 14:23:03 +0900
commit: a991fed7e4faa485dc67daf50ba64fe01f83415d (patch)
tree: a600daa350a36c1fdc7776c111575bef56f78627
parent: a67ed2858417b9d795460f05126c01fb0cd344f9 (diff)
984 files changed, 349 insertions, 359 deletions
diff --git a/.travis.yml b/.travis.yml
index 7f35ff23..9e5474a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ sudo: required  # Required to enable Docker service
 
 install:
   - pip install tox coveralls
-  - bash tests/integrated/common/install_docker_test_pkg_for_travis.sh
+  - bash ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh
 
 script:
   - NOSE_VERBOSE=0 tox -e $TOX_ENV
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 8d80de20..8e4945d3 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -87,7 +87,7 @@ Coding style guide
 
 * JSON files:
 
-  Ryu source tree has JSON files under tests/unit/ofproto/json.
+  Ryu source tree has JSON files under ryu/tests/unit/ofproto/json.
   They are used by unit tests.  To make patches easier to read,
   they are normalized using tools/normalize_json.py.  Please re-run
   the script before committing changes to these JSON files.
diff --git a/MANIFEST.in b/MANIFEST.in
index d782ce6a..990c333f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,7 +6,8 @@ graft doc
 graft etc
 graft tools
 recursive-exclude doc/build *
-recursive-exclude tests/*
+recursive-exclude ryu/tests/packet_data_generator *
+recursive-exclude ryu/tests/packet_data_generator2 *
 global-exclude *~
 global-exclude *.pyc
 global-exclude .gitignore
diff --git a/doc/source/ofproto_v1_0_ref.rst b/doc/source/ofproto_v1_0_ref.rst
index 8d8f0898..91ed2a45 100644
--- a/doc/source/ofproto_v1_0_ref.rst
+++ b/doc/source/ofproto_v1_0_ref.rst
@@ -14,13 +14,13 @@ Handshake
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-5-features_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-5-features_request.packet.json
 
 .. autoclass:: OFPSwitchFeatures
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-6-ofp_switch_features.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-6-ofp_switch_features.packet.json
 
 Switch Configuration
 --------------------
@@ -29,19 +29,19 @@ Switch Configuration
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-7-ofp_set_config.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-7-ofp_set_config.packet.json
 
 .. autoclass:: OFPGetConfigRequest
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-8-ofp_get_config_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-8-ofp_get_config_request.packet.json
 
 .. autoclass:: OFPGetConfigReply
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-9-ofp_get_config_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-9-ofp_get_config_reply.packet.json
 
 Modify State Messages
 ---------------------
@@ -50,14 +50,14 @@ Modify State Messages
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-2-ofp_flow_mod.packet.json
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-3-ofp_flow_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-2-ofp_flow_mod.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-3-ofp_flow_mod.packet.json
 
 .. autoclass:: OFPPortMod
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-22-ofp_port_mod.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-22-ofp_port_mod.packet.json
 
 Queue Configuration Messages
 ----------------------------
@@ -66,13 +66,13 @@ Queue Configuration Messages
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-35-ofp_queue_get_config_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-35-ofp_queue_get_config_request.packet.json
 
 .. autoclass:: OFPQueueGetConfigReply
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-36-ofp_queue_get_config_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-36-ofp_queue_get_config_reply.packet.json
 
 Read State Messages
 -------------------
@@ -81,74 +81,74 @@ Read State Messages
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-24-ofp_desc_stats_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-24-ofp_desc_stats_request.packet.json
 
 .. autoclass:: OFPDescStatsReply
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-0-ofp_desc_stats_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-0-ofp_desc_stats_reply.packet.json
 
 .. autoclass:: OFPFlowStatsRequest
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-11-ofp_flow_stats_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-11-ofp_flow_stats_request.packet.json
 
 .. autoclass:: OFPFlowStatsReply
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-12-ofp_flow_stats_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-12-ofp_flow_stats_reply.packet.json
 
 .. autoclass:: OFPAggregateStatsRequest
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-25-ofp_aggregate_stats_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-25-ofp_aggregate_stats_request.packet.json
 
 .. autoclass:: OFPAggregateStatsReply
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-26-ofp_aggregate_stats_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-26-ofp_aggregate_stats_reply.packet.json
 
 .. autoclass:: OFPTableStatsRequest
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-27-ofp_table_stats_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-27-ofp_table_stats_request.packet.json
 
 .. autoclass:: OFPTableStatsReply
 
 ..    XXX commented out because it's too long
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-28-ofp_table_stats_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-28-ofp_table_stats_reply.packet.json
 
 .. autoclass:: OFPPortStatsRequest
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-29-ofp_port_stats_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-29-ofp_port_stats_request.packet.json
 
 .. autoclass:: OFPPortStatsReply
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-30-ofp_port_stats_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-30-ofp_port_stats_reply.packet.json
 
 .. autoclass:: OFPQueueStatsRequest
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-37-ofp_queue_stats_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-37-ofp_queue_stats_request.packet.json
 
 .. autoclass:: OFPQueueStatsReply
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-38-ofp_queue_stats_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-38-ofp_queue_stats_reply.packet.json
 
 .. autoclass:: OFPVendorStatsRequest
 .. autoclass:: OFPVendorStatsReply
@@ -160,7 +160,7 @@ Send Packet Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-1-ofp_packet_out.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-1-ofp_packet_out.packet.json
 
 Barrier Message
 ---------------
@@ -169,13 +169,13 @@ Barrier Message
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-17-ofp_barrier_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-17-ofp_barrier_request.packet.json
 
 .. autoclass:: OFPBarrierReply
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-18-ofp_barrier_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-18-ofp_barrier_reply.packet.json
 
 
 Asynchronous Messages
@@ -188,7 +188,7 @@ Packet-In Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-4-ofp_packet_in.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-4-ofp_packet_in.packet.json
 
 Flow Removed Message
 --------------------
@@ -197,7 +197,7 @@ Flow Removed Message
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-40-ofp_flow_removed.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-40-ofp_flow_removed.packet.json
 
 Port Status Message
 -------------------
@@ -206,7 +206,7 @@ Port Status Message
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-39-ofp_port_status.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-39-ofp_port_status.packet.json
 
 Error Message
 -------------
@@ -215,8 +215,8 @@ Error Message
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-15-ofp_error_msg.packet.json
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-41-ofp_error_msg_vendor.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-15-ofp_error_msg.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-41-ofp_error_msg_vendor.packet.json
 
 Symmetric Messages
 ==================
@@ -228,7 +228,7 @@ Hello
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-10-ofp_hello.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-10-ofp_hello.packet.json
 
 Echo Request
 ------------
@@ -237,7 +237,7 @@ Echo Request
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-13-ofp_echo_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-13-ofp_echo_request.packet.json
 
 
 Echo Reply
@@ -247,7 +247,7 @@ Echo Reply
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-14-ofp_echo_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-14-ofp_echo_reply.packet.json
 
 
 Vendor
@@ -257,7 +257,7 @@ Vendor
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-16-ofp_vendor.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-16-ofp_vendor.packet.json
 
 Port Structures
 ===============
diff --git a/doc/source/ofproto_v1_2_ref.rst b/doc/source/ofproto_v1_2_ref.rst
index f592ae6f..525cdcc9 100644
--- a/doc/source/ofproto_v1_2_ref.rst
+++ b/doc/source/ofproto_v1_2_ref.rst
@@ -14,13 +14,13 @@ Handshake
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-5-ofp_features_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-5-ofp_features_request.packet.json
 
 .. autoclass:: OFPSwitchFeatures
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-6-ofp_features_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-6-ofp_features_reply.packet.json
 
 Switch Configuration
 --------------------
@@ -29,19 +29,19 @@ Switch Configuration
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-7-ofp_set_config.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-7-ofp_set_config.packet.json
 
 .. autoclass:: OFPGetConfigRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-8-ofp_get_config_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-8-ofp_get_config_request.packet.json
 
 .. autoclass:: OFPGetConfigReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-9-ofp_get_config_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-9-ofp_get_config_reply.packet.json
 
 Flow Table Configuration
 ------------------------
@@ -50,7 +50,7 @@ Flow Table Configuration
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-23-ofp_table_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-23-ofp_table_mod.packet.json
 
 Modify State Messages
 ---------------------
@@ -59,20 +59,20 @@ Modify State Messages
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json
 
 .. autoclass:: OFPGroupMod
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json
 
 .. autoclass:: OFPPortMod
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-22-ofp_port_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-22-ofp_port_mod.packet.json
 
 Read State Messages
 -------------------
@@ -81,74 +81,74 @@ Read State Messages
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-24-ofp_desc_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-24-ofp_desc_stats_request.packet.json
 
 .. autoclass:: OFPDescStats
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-0-ofp_desc_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-0-ofp_desc_stats_reply.packet.json
 
 .. autoclass:: OFPFlowStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-11-ofp_flow_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-11-ofp_flow_stats_request.packet.json
 
 .. autoclass:: OFPFlowStats
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json
 
 .. autoclass:: OFPAggregateStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-25-ofp_aggregate_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-25-ofp_aggregate_stats_request.packet.json
 
 .. autoclass:: OFPAggregateStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-26-ofp_aggregate_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-26-ofp_aggregate_stats_reply.packet.json
 
 .. autoclass:: OFPTableStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-27-ofp_table_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-27-ofp_table_stats_request.packet.json
 
 .. autoclass:: OFPTableStats
 
 ..    XXX commented out because it's too long
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-28-ofp_table_stats_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-28-ofp_table_stats_reply.packet.json
 
 .. autoclass:: OFPPortStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-29-ofp_port_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-29-ofp_port_stats_request.packet.json
 
 .. autoclass:: OFPPortStats
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-30-ofp_port_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-30-ofp_port_stats_reply.packet.json
 
 .. autoclass:: OFPQueueStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-37-ofp_queue_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-37-ofp_queue_stats_request.packet.json
 
 .. autoclass:: OFPQueueStats
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-38-ofp_queue_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-38-ofp_queue_stats_reply.packet.json
 
 .. autoclass:: OFPGroupStatsRequest
 .. autoclass:: OFPGroupStats
@@ -156,25 +156,25 @@ Read State Messages
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-33-ofp_group_desc_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-33-ofp_group_desc_stats_request.packet.json
 
 .. autoclass:: OFPGroupDescStats
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json
 
 .. autoclass:: OFPGroupFeaturesStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-31-ofp_group_features_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-31-ofp_group_features_stats_request.packet.json
 
 .. autoclass:: OFPGroupFeaturesStats
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-32-ofp_group_features_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-32-ofp_group_features_stats_reply.packet.json
 
 Queue Configuration Messages
 ----------------------------
@@ -183,13 +183,13 @@ Queue Configuration Messages
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-35-ofp_queue_get_config_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-35-ofp_queue_get_config_request.packet.json
 
 .. autoclass:: OFPQueueGetConfigReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json
 
 Packet-Out Message
 ------------------
@@ -198,7 +198,7 @@ Packet-Out Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json
 
 Barrier Message
 ---------------
@@ -207,13 +207,13 @@ Barrier Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-17-ofp_barrier_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-17-ofp_barrier_request.packet.json
 
 .. autoclass:: OFPBarrierReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-18-ofp_barrier_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-18-ofp_barrier_reply.packet.json
 
 Role Request Message
 --------------------
@@ -222,13 +222,13 @@ Role Request Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-19-ofp_role_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-19-ofp_role_request.packet.json
 
 .. autoclass:: OFPRoleReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-20-ofp_role_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-20-ofp_role_reply.packet.json
 
 
 Asynchronous Messages
@@ -241,7 +241,7 @@ Packet-In Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-4-ofp_packet_in.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-4-ofp_packet_in.packet.json
 
 Flow Removed Message
 --------------------
@@ -250,7 +250,7 @@ Flow Removed Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-40-ofp_flow_removed.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-40-ofp_flow_removed.packet.json
 
 Port Status Message
 -------------------
@@ -259,7 +259,7 @@ Port Status Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-39-ofp_port_status.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-39-ofp_port_status.packet.json
 
 Error Message
 -------------
@@ -268,8 +268,8 @@ Error Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-15-ofp_error_msg.packet.json
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-41-ofp_error_msg_experimenter.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-15-ofp_error_msg.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-41-ofp_error_msg_experimenter.packet.json
 
 Symmetric Messages
 ==================
@@ -281,7 +281,7 @@ Hello
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-10-ofp_hello.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-10-ofp_hello.packet.json
 
 Echo Request
 ------------
@@ -290,7 +290,7 @@ Echo Request
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-13-ofp_echo_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-13-ofp_echo_request.packet.json
 
 
 Echo Reply
@@ -300,7 +300,7 @@ Echo Reply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-14-ofp_echo_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-14-ofp_echo_reply.packet.json
 
 
 Experimenter
@@ -310,7 +310,7 @@ Experimenter
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of12/3-16-ofp_experimenter.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of12/3-16-ofp_experimenter.packet.json
 
 Port Structures
 ===============
diff --git a/doc/source/ofproto_v1_3_ref.rst b/doc/source/ofproto_v1_3_ref.rst
index f5c9d884..e48bb485 100644
--- a/doc/source/ofproto_v1_3_ref.rst
+++ b/doc/source/ofproto_v1_3_ref.rst
@@ -14,13 +14,13 @@ Handshake
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-5-ofp_features_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-5-ofp_features_request.packet.json
 
 .. autoclass:: OFPSwitchFeatures
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-6-ofp_features_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-6-ofp_features_reply.packet.json
 
 Switch Configuration
 --------------------
@@ -29,19 +29,19 @@ Switch Configuration
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-7-ofp_set_config.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-7-ofp_set_config.packet.json
 
 .. autoclass:: OFPGetConfigRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-8-ofp_get_config_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-8-ofp_get_config_request.packet.json
 
 .. autoclass:: OFPGetConfigReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-9-ofp_get_config_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-9-ofp_get_config_reply.packet.json
 
 Flow Table Configuration
 ------------------------
@@ -50,7 +50,7 @@ Flow Table Configuration
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-23-ofp_table_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-23-ofp_table_mod.packet.json
 
 Modify State Messages
 ---------------------
@@ -59,27 +59,27 @@ Modify State Messages
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-3-ofp_flow_mod.packet.json
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-46-ofp_flow_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-3-ofp_flow_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-46-ofp_flow_mod.packet.json
 
 .. autoclass:: OFPGroupMod
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-21-ofp_group_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-21-ofp_group_mod.packet.json
 
 .. autoclass:: OFPPortMod
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-22-ofp_port_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-22-ofp_port_mod.packet.json
 
 .. autoclass:: OFPMeterMod
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-45-ofp_meter_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-45-ofp_meter_mod.packet.json
 
 Multipart Messages
 ------------------
@@ -88,85 +88,85 @@ Multipart Messages
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-24-ofp_desc_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-24-ofp_desc_request.packet.json
 
 .. autoclass:: OFPDescStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-0-ofp_desc_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-0-ofp_desc_reply.packet.json
 
 .. autoclass:: OFPFlowStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-11-ofp_flow_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-11-ofp_flow_stats_request.packet.json
 
 .. autoclass:: OFPFlowStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json
 
 .. autoclass:: OFPAggregateStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-25-ofp_aggregate_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-25-ofp_aggregate_stats_request.packet.json
 
 .. autoclass:: OFPAggregateStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-26-ofp_aggregate_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-26-ofp_aggregate_stats_reply.packet.json
 
 .. autoclass:: OFPTableStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-27-ofp_table_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-27-ofp_table_stats_request.packet.json
 
 .. autoclass:: OFPTableStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-28-ofp_table_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-28-ofp_table_stats_reply.packet.json
 
 .. autoclass:: OFPPortStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-29-ofp_port_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-29-ofp_port_stats_request.packet.json
 
 .. autoclass:: OFPPortStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-30-ofp_port_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-30-ofp_port_stats_reply.packet.json
 
 .. autoclass:: OFPPortDescStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-53-ofp_port_desc_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-53-ofp_port_desc_request.packet.json
 
 .. autoclass:: OFPPortDescStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-54-ofp_port_desc_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-54-ofp_port_desc_reply.packet.json
 
 .. autoclass:: OFPQueueStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-37-ofp_queue_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-37-ofp_queue_stats_request.packet.json
 
 .. autoclass:: OFPQueueStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-38-ofp_queue_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-38-ofp_queue_stats_reply.packet.json
 
 .. autoclass:: OFPGroupStatsRequest
 .. autoclass:: OFPGroupStatsReply
@@ -174,61 +174,61 @@ Multipart Messages
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-33-ofp_group_desc_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-33-ofp_group_desc_request.packet.json
 
 .. autoclass:: OFPGroupDescStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-34-ofp_group_desc_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-34-ofp_group_desc_reply.packet.json
 
 .. autoclass:: OFPGroupFeaturesStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-31-ofp_group_features_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-31-ofp_group_features_request.packet.json
 
 .. autoclass:: OFPGroupFeaturesStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-32-ofp_group_features_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-32-ofp_group_features_reply.packet.json
 
 .. autoclass:: OFPMeterStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-49-ofp_meter_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-49-ofp_meter_stats_request.packet.json
 
 .. autoclass:: OFPMeterStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-50-ofp_meter_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-50-ofp_meter_stats_reply.packet.json
 
 .. autoclass:: OFPMeterConfigStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-47-ofp_meter_config_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-47-ofp_meter_config_request.packet.json
 
 .. autoclass:: OFPMeterConfigStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-48-ofp_meter_config_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-48-ofp_meter_config_reply.packet.json
 
 .. autoclass:: OFPMeterFeaturesStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-51-ofp_meter_features_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-51-ofp_meter_features_request.packet.json
 
 .. autoclass:: OFPMeterFeaturesStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-52-ofp_meter_features_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-52-ofp_meter_features_reply.packet.json
 
 .. autoclass:: OFPTableFeaturesStatsRequest
 .. autoclass:: OFPTableFeaturesStatsReply
@@ -237,7 +237,7 @@ Multipart Messages
 
        See an example in:
 
-       ``tests/unit/ofproto/json/of13/4-56-ofp_table_features_reply.packet.json``
+       ``ryu/tests/unit/ofproto/json/of13/4-56-ofp_table_features_reply.packet.json``
 
 Queue Configuration Messages
 ----------------------------
@@ -246,13 +246,13 @@ Queue Configuration Messages
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-35-ofp_queue_get_config_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-35-ofp_queue_get_config_request.packet.json
 
 .. autoclass:: OFPQueueGetConfigReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-36-ofp_queue_get_config_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-36-ofp_queue_get_config_reply.packet.json
 
 Packet-Out Message
 ------------------
@@ -261,7 +261,7 @@ Packet-Out Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-1-ofp_packet_out.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-1-ofp_packet_out.packet.json
 
 Barrier Message
 ---------------
@@ -270,13 +270,13 @@ Barrier Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-17-ofp_barrier_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-17-ofp_barrier_request.packet.json
 
 .. autoclass:: OFPBarrierReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-18-ofp_barrier_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-18-ofp_barrier_reply.packet.json
 
 Role Request Message
 --------------------
@@ -285,13 +285,13 @@ Role Request Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-19-ofp_role_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-19-ofp_role_request.packet.json
 
 .. autoclass:: OFPRoleReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-20-ofp_role_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-20-ofp_role_reply.packet.json
 
 Set Asynchronous Configuration Message
 --------------------------------------
@@ -300,19 +300,19 @@ Set Asynchronous Configuration Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-44-ofp_set_async.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-44-ofp_set_async.packet.json
 
 .. autoclass:: OFPGetAsyncRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-42-ofp_get_async_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-42-ofp_get_async_request.packet.json
 
 .. autoclass:: OFPGetAsyncReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-43-ofp_get_async_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-43-ofp_get_async_reply.packet.json
 
 
 Asynchronous Messages
@@ -325,7 +325,7 @@ Packet-In Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-4-ofp_packet_in.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-4-ofp_packet_in.packet.json
 
 Flow Removed Message
 --------------------
@@ -334,7 +334,7 @@ Flow Removed Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-40-ofp_flow_removed.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-40-ofp_flow_removed.packet.json
 
 Port Status Message
 -------------------
@@ -343,7 +343,7 @@ Port Status Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-39-ofp_port_status.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-39-ofp_port_status.packet.json
 
 Error Message
 -------------
@@ -352,7 +352,7 @@ Error Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-15-ofp_error_msg.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-15-ofp_error_msg.packet.json
 
 
 Symmetric Messages
@@ -365,7 +365,7 @@ Hello
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-10-ofp_hello.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-10-ofp_hello.packet.json
 
 .. autoclass:: OFPHelloElemVersionBitmap
 
@@ -376,7 +376,7 @@ Echo Request
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-13-ofp_echo_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-13-ofp_echo_request.packet.json
 
 Echo Reply
 ----------
@@ -385,7 +385,7 @@ Echo Reply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-14-ofp_echo_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-14-ofp_echo_reply.packet.json
 
 Experimenter
 ------------
@@ -394,7 +394,7 @@ Experimenter
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of13/4-16-ofp_experimenter.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of13/4-16-ofp_experimenter.packet.json
 
 Port Structures
 ===============
diff --git a/doc/source/ofproto_v1_4_ref.rst b/doc/source/ofproto_v1_4_ref.rst
index 4ab1dcd2..8e84790e 100644
--- a/doc/source/ofproto_v1_4_ref.rst
+++ b/doc/source/ofproto_v1_4_ref.rst
@@ -14,13 +14,13 @@ Handshake
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-5-ofp_features_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-5-ofp_features_request.packet.json
 
 .. autoclass:: OFPSwitchFeatures
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-6-ofp_features_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-6-ofp_features_reply.packet.json
 
 Switch Configuration
 --------------------
@@ -29,19 +29,19 @@ Switch Configuration
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-7-ofp_set_config.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-7-ofp_set_config.packet.json
 
 .. autoclass:: OFPGetConfigRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-8-ofp_get_config_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-8-ofp_get_config_request.packet.json
 
 .. autoclass:: OFPGetConfigReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-9-ofp_get_config_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-9-ofp_get_config_reply.packet.json
 
 Modify State Messages
 ---------------------
@@ -50,34 +50,34 @@ Modify State Messages
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-23-ofp_table_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-23-ofp_table_mod.packet.json
 
 .. autoclass:: OFPFlowMod
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-2-ofp_flow_mod.packet.json
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-3-ofp_flow_mod.packet.json
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-44-ofp_flow_mod.packet.json
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-58-ofp_flow_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-2-ofp_flow_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-3-ofp_flow_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-44-ofp_flow_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-58-ofp_flow_mod.packet.json
 
 .. autoclass:: OFPGroupMod
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-21-ofp_group_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-21-ofp_group_mod.packet.json
 
 .. autoclass:: OFPPortMod
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json
 
 .. autoclass:: OFPMeterMod
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-43-ofp_meter_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-43-ofp_meter_mod.packet.json
 
 Multipart Messages
 ------------------
@@ -86,61 +86,61 @@ Multipart Messages
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-24-ofp_desc_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-24-ofp_desc_request.packet.json
 
 .. autoclass:: OFPDescStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-0-ofp_desc_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-0-ofp_desc_reply.packet.json
 
 .. autoclass:: OFPFlowStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-11-ofp_flow_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-11-ofp_flow_stats_request.packet.json
 
 .. autoclass:: OFPFlowStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-12-ofp_flow_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-12-ofp_flow_stats_reply.packet.json
 
 .. autoclass:: OFPAggregateStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-25-ofp_aggregate_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-25-ofp_aggregate_stats_request.packet.json
 
 .. autoclass:: OFPAggregateStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-26-ofp_aggregate_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-26-ofp_aggregate_stats_reply.packet.json
 
 .. autoclass:: OFPTableStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-27-ofp_table_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-27-ofp_table_stats_request.packet.json
 
 .. autoclass:: OFPTableStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-28-ofp_table_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-28-ofp_table_stats_reply.packet.json
 
 .. autoclass:: OFPTableDescStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-61-ofp_table_desc_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-61-ofp_table_desc_request.packet.json
 
 .. autoclass:: OFPTableDescStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-62-ofp_table_desc_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-62-ofp_table_desc_reply.packet.json
 
 .. autoclass:: OFPTableFeaturesStatsRequest
 
@@ -148,7 +148,7 @@ Multipart Messages
 
        See an example in:
 
-       ``tests/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json``
+       ``ryu/tests/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json``
 
 .. autoclass:: OFPTableFeaturesStatsReply
 
@@ -156,151 +156,151 @@ Multipart Messages
 
        See an example in:
 
-       ``tests/unit/ofproto/json/of14/5-54-ofp_table_features_reply.packet.json``
+       ``ryu/tests/unit/ofproto/json/of14/5-54-ofp_table_features_reply.packet.json``
 
 .. autoclass:: OFPPortStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-29-ofp_port_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-29-ofp_port_stats_request.packet.json
 
 .. autoclass:: OFPPortStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json
 
 .. autoclass:: OFPPortDescStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-51-ofp_port_desc_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-51-ofp_port_desc_request.packet.json
 
 .. autoclass:: OFPPortDescStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json
 
 .. autoclass:: OFPQueueStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-35-ofp_queue_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-35-ofp_queue_stats_request.packet.json
 
 .. autoclass:: OFPQueueStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-36-ofp_queue_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-36-ofp_queue_stats_reply.packet.json
 
 .. autoclass:: OFPQueueDescStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-63-ofp_queue_desc_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-63-ofp_queue_desc_request.packet.json
 
 .. autoclass:: OFPQueueDescStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-64-ofp_queue_desc_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-64-ofp_queue_desc_reply.packet.json
 
 .. autoclass:: OFPGroupStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-55-ofp_group_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-55-ofp_group_stats_request.packet.json
 
 .. autoclass:: OFPGroupStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-56-ofp_group_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-56-ofp_group_stats_reply.packet.json
 
 .. autoclass:: OFPGroupDescStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-33-ofp_group_desc_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-33-ofp_group_desc_request.packet.json
 
 .. autoclass:: OFPGroupDescStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-34-ofp_group_desc_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-34-ofp_group_desc_reply.packet.json
 
 .. autoclass:: OFPGroupFeaturesStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-31-ofp_group_features_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-31-ofp_group_features_request.packet.json
 
 .. autoclass:: OFPGroupFeaturesStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-32-ofp_group_features_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-32-ofp_group_features_reply.packet.json
 
 .. autoclass:: OFPMeterStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-47-ofp_meter_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-47-ofp_meter_stats_request.packet.json
 
 .. autoclass:: OFPMeterStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-48-ofp_meter_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-48-ofp_meter_stats_reply.packet.json
 
 .. autoclass:: OFPMeterConfigStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-45-ofp_meter_config_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-45-ofp_meter_config_request.packet.json
 
 .. autoclass:: OFPMeterConfigStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-46-ofp_meter_config_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-46-ofp_meter_config_reply.packet.json
 
 .. autoclass:: OFPMeterFeaturesStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-49-ofp_meter_features_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-49-ofp_meter_features_request.packet.json
 
 .. autoclass:: OFPMeterFeaturesStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-50-ofp_meter_features_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-50-ofp_meter_features_reply.packet.json
 
 .. autoclass:: OFPFlowMonitorRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-66-ofp_flow_monitor_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-66-ofp_flow_monitor_request.packet.json
 
 .. autoclass:: OFPFlowMonitorReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-67-ofp_flow_monitor_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-67-ofp_flow_monitor_reply.packet.json
 
 .. autoclass:: OFPExperimenterStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-59-ofp_experimenter_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-59-ofp_experimenter_request.packet.json
 
 .. autoclass:: OFPExperimenterStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-60-ofp_experimenter_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-60-ofp_experimenter_reply.packet.json
 
 Packet-Out Message
 ------------------
@@ -309,7 +309,7 @@ Packet-Out Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-1-ofp_packet_out.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-1-ofp_packet_out.packet.json
 
 Barrier Message
 ---------------
@@ -318,13 +318,13 @@ Barrier Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-17-ofp_barrier_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-17-ofp_barrier_request.packet.json
 
 .. autoclass:: OFPBarrierReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-18-ofp_barrier_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-18-ofp_barrier_reply.packet.json
 
 Role Request Message
 --------------------
@@ -333,13 +333,13 @@ Role Request Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-19-ofp_role_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-19-ofp_role_request.packet.json
 
 .. autoclass:: OFPRoleReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-20-ofp_role_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-20-ofp_role_reply.packet.json
 
 Bundle Messages
 ---------------
@@ -348,13 +348,13 @@ Bundle Messages
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-69-ofp_bundle_ctrl_msg.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-69-ofp_bundle_ctrl_msg.packet.json
 
 .. autoclass:: OFPBundleAddMsg
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-70-ofp_bundle_add_msg.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-70-ofp_bundle_add_msg.packet.json
 
 Set Asynchronous Configuration Message
 --------------------------------------
@@ -363,19 +363,19 @@ Set Asynchronous Configuration Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-42-ofp_set_async.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-42-ofp_set_async.packet.json
 
 .. autoclass:: OFPGetAsyncRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-40-ofp_get_async_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-40-ofp_get_async_request.packet.json
 
 .. autoclass:: OFPGetAsyncReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-41-ofp_get_async_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-41-ofp_get_async_reply.packet.json
 
 
 Asynchronous Messages
@@ -388,8 +388,8 @@ Packet-In Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-4-ofp_packet_in.packet.json
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-57-ofp_packet_in.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-4-ofp_packet_in.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-57-ofp_packet_in.packet.json
 
 Flow Removed Message
 --------------------
@@ -398,7 +398,7 @@ Flow Removed Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-38-ofp_flow_removed.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-38-ofp_flow_removed.packet.json
 
 Port Status Message
 -------------------
@@ -407,7 +407,7 @@ Port Status Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-37-ofp_port_status.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-37-ofp_port_status.packet.json
 
 Controller Role Status Message
 ------------------------------
@@ -416,7 +416,7 @@ Controller Role Status Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-65-ofp_role_status.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-65-ofp_role_status.packet.json
 
 Table Status Message
 --------------------
@@ -425,7 +425,7 @@ Table Status Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-68-ofp_table_status.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-68-ofp_table_status.packet.json
 
 Request Forward Message
 -----------------------
@@ -434,7 +434,7 @@ Request Forward Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-71-ofp_requestforward.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-71-ofp_requestforward.packet.json
 
 
 Symmetric Messages
@@ -447,7 +447,7 @@ Hello
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-10-ofp_hello.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-10-ofp_hello.packet.json
 
 .. autoclass:: OFPHelloElemVersionBitmap
 
@@ -458,7 +458,7 @@ Echo Request
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-13-ofp_echo_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-13-ofp_echo_request.packet.json
 
 Echo Reply
 ----------
@@ -467,7 +467,7 @@ Echo Reply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-14-ofp_echo_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-14-ofp_echo_reply.packet.json
 
 Error Message
 -------------
@@ -476,7 +476,7 @@ Error Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-15-ofp_error_msg.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-15-ofp_error_msg.packet.json
 
 Experimenter
 ------------
@@ -485,7 +485,7 @@ Experimenter
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of14/5-16-ofp_experimenter.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of14/5-16-ofp_experimenter.packet.json
 
 Port Structures
 ===============
diff --git a/doc/source/ofproto_v1_5_ref.rst b/doc/source/ofproto_v1_5_ref.rst
index d6a78e2e..a78cfb67 100644
--- a/doc/source/ofproto_v1_5_ref.rst
+++ b/doc/source/ofproto_v1_5_ref.rst
@@ -14,13 +14,13 @@ Handshake
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-features_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-features_request.packet.json
 
 .. autoclass:: OFPSwitchFeatures
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-features_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-features_reply.packet.json
 
 Switch Configuration
 --------------------
@@ -29,19 +29,19 @@ Switch Configuration
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-set_config.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-set_config.packet.json
 
 .. autoclass:: OFPGetConfigRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_request.packet.json
 
 .. autoclass:: OFPGetConfigReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_reply.packet.json
 
 Modify State Messages
 ---------------------
@@ -50,33 +50,33 @@ Modify State Messages
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-table_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_mod.packet.json
 
 .. autoclass:: OFPFlowMod
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_conjunction.packet.json
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_conjunction.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json
 
 .. autoclass:: OFPGroupMod
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-group_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_mod.packet.json
 
 .. autoclass:: OFPPortMod
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-port_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_mod.packet.json
 
 .. autoclass:: OFPMeterMod
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-meter_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_mod.packet.json
 
 Multipart Messages
 ------------------
@@ -85,253 +85,253 @@ Multipart Messages
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-desc_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-desc_request.packet.json
 
 .. autoclass:: OFPDescStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-desc_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-desc_reply.packet.json
 
 .. autoclass:: OFPFlowDescStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_request.packet.json
 
 .. autoclass:: OFPFlowDescStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_reply.packet.json
 
 .. autoclass:: OFPFlowStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_request.packet.json
 
 .. autoclass:: OFPFlowStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_reply.packet.json
 
 .. autoclass:: OFPAggregateStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_request.packet.json
 
 .. autoclass:: OFPAggregateStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json
 
 .. autoclass:: OFPPortStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_request.packet.json
 
 .. autoclass:: OFPPortStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_reply.packet.json
 
 .. autoclass:: OFPPortDescStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_request.packet.json
 
 .. autoclass:: OFPPortDescStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_reply.packet.json
 
 .. autoclass:: OFPQueueStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_request.packet.json
 
 .. autoclass:: OFPQueueStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_reply.packet.json
 
 .. autoclass:: OFPQueueDescStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_request.packet.json
 
 .. autoclass:: OFPQueueDescStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_reply.packet.json
 
 .. autoclass:: OFPGroupStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_request.packet.json
 
 .. autoclass:: OFPGroupStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_reply.packet.json
 
 .. autoclass:: OFPGroupDescStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_request.packet.json
 
 .. autoclass:: OFPGroupDescStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_reply.packet.json
 
 .. autoclass:: OFPGroupFeaturesStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_request.packet.json
 
 .. autoclass:: OFPGroupFeaturesStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_reply.packet.json
 
 .. autoclass:: OFPMeterStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_request.packet.json
 
 .. autoclass:: OFPMeterStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_reply.packet.json
 
 .. autoclass:: OFPMeterDescStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_request.packet.json
 
 .. autoclass:: OFPMeterDescStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_reply.packet.json
 
 .. autoclass:: OFPMeterFeaturesStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_request.packet.json
 
 .. autoclass:: OFPMeterFeaturesStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_reply.packet.json
 
 .. autoclass:: OFPControllerStatusStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_request.packet.json
 
 .. autoclass:: OFPControllerStatusStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_reply.packet.json
 
 .. autoclass:: OFPTableStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_request.packet.json
 
 .. autoclass:: OFPTableStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_reply.packet.json
 
 .. autoclass:: OFPTableDescStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_request.packet.json
 
 .. autoclass:: OFPTableDescStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_reply.packet.json
 
 .. autoclass:: OFPTableFeaturesStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_request.packet.json
 
 .. autoclass:: OFPTableFeaturesStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_reply.packet.json
 
 .. autoclass:: OFPFlowMonitorRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_request.packet.json
 
 .. autoclass:: OFPFlowMonitorReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_reply.packet.json
 
 .. autoclass:: OFPBundleFeaturesStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_request.packet.json
 
 .. autoclass:: OFPBundleFeaturesStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_reply.packet.json
 
 .. autoclass:: OFPExperimenterStatsRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_request.packet.json
 
 .. autoclass:: OFPExperimenterStatsReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_reply.packet.json
 
 Packet-Out Message
 ------------------
@@ -340,7 +340,7 @@ Packet-Out Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-packet_out.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-packet_out.packet.json
 
 Barrier Message
 ---------------
@@ -349,13 +349,13 @@ Barrier Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_request.packet.json
 
 .. autoclass:: OFPBarrierReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_reply.packet.json
 
 Role Request Message
 --------------------
@@ -364,13 +364,13 @@ Role Request Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-role_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_request.packet.json
 
 .. autoclass:: OFPRoleReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-role_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_reply.packet.json
 
 Bundle Messages
 ---------------
@@ -379,13 +379,13 @@ Bundle Messages
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_ctrl.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_ctrl.packet.json
 
 .. autoclass:: OFPBundleAddMsg
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json
 
 Set Asynchronous Configuration Message
 --------------------------------------
@@ -394,19 +394,19 @@ Set Asynchronous Configuration Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-set_async.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-set_async.packet.json
 
 .. autoclass:: OFPGetAsyncRequest
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_request.packet.json
 
 .. autoclass:: OFPGetAsyncReply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_reply.packet.json
 
 Asynchronous Messages
 =====================
@@ -418,7 +418,7 @@ Packet-In Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-packet_in.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-packet_in.packet.json
 
 Flow Removed Message
 --------------------
@@ -427,7 +427,7 @@ Flow Removed Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-flow_removed.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_removed.packet.json
 
 Port Status Message
 -------------------
@@ -436,7 +436,7 @@ Port Status Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-port_status.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_status.packet.json
 
 Controller Role Status Message
 ------------------------------
@@ -445,7 +445,7 @@ Controller Role Status Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-role_status.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_status.packet.json
 
 Table Status Message
 --------------------
@@ -454,7 +454,7 @@ Table Status Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-table_status.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_status.packet.json
 
 Request Forward Message
 -----------------------
@@ -463,7 +463,7 @@ Request Forward Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-requestforward.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-requestforward.packet.json
 
 Controller Status Message
 -------------------------
@@ -472,7 +472,7 @@ Controller Status Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status.packet.json
 
 Symmetric Messages
 ==================
@@ -484,7 +484,7 @@ Hello
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-hello.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-hello.packet.json
 
 .. autoclass:: OFPHelloElemVersionBitmap
 
@@ -495,7 +495,7 @@ Echo Request
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-echo_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_request.packet.json
 
 Echo Reply
 ----------
@@ -504,7 +504,7 @@ Echo Reply
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-echo_reply.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_reply.packet.json
 
 Error Message
 -------------
@@ -513,7 +513,7 @@ Error Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg.packet.json
 
 Experimenter
 ------------
@@ -522,7 +522,7 @@ Experimenter
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg_experimenter.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg_experimenter.packet.json
 
 Port Structures
 ===============
diff --git a/doc/source/test-vrrp.rst b/doc/source/test-vrrp.rst
index aa03d4ae..6e3783a1 100644
--- a/doc/source/test-vrrp.rst
+++ b/doc/source/test-vrrp.rst
@@ -9,8 +9,8 @@ Running integrated tests
 
 Some testing scripts are available.
 
-* tests/integrated/test_vrrp_linux_multi.py
-* tests/integrated/test_vrrp_multi.py
+* ryu/tests/integrated/test_vrrp_linux_multi.py
+* ryu/tests/integrated/test_vrrp_multi.py
 
 Each files include how to run in the comment.
 Please refer to it.
diff --git a/doc/source/writing_ryu_app.rst b/doc/source/writing_ryu_app.rst
index ff1fd755..8f8556bb 100644
--- a/doc/source/writing_ryu_app.rst
+++ b/doc/source/writing_ryu_app.rst
@@ -122,5 +122,5 @@ switch? Move to `the next step
 can learn from the existing Ryu applications at `ryu/app
 <https://github.com/osrg/ryu/blob/master/ryu/app/>`_ directory and
 `integrated tests
-<https://github.com/osrg/ryu/blob/master/tests/integrated/>`_
+<https://github.com/osrg/ryu/blob/master/ryu/tests/integrated/>`_
 directory.
diff --git a/run_tests.sh b/run_tests.sh
index 2f448dce..1ab8aea7 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -90,7 +90,7 @@ run_tests() {
 run_pylint() {
   echo "Running pylint ..."
   PYLINT_OPTIONS="--rcfile=.pylintrc --output-format=parseable"
-  PYLINT_INCLUDE="ryu bin/ryu bin/ryu-manager tests/integrated tests/packet_data_generator3 tests/unit"
+  PYLINT_INCLUDE="ryu bin/ryu bin/ryu-manager ryu/tests/bin/ryu-client"
   export PYTHONPATH=$PYTHONPATH:.ryu
   PYLINT_LOG=pylint.log
 
@@ -115,11 +115,11 @@ run_pep8() {
 run_integrated() {
   echo "Running integrated test ..."
 
-  INTEGRATED_TEST_RUNNER="./tests/integrated/run_tests_with_ovs12.py"
+  INTEGRATED_TEST_RUNNER="./ryu/tests/integrated/run_tests_with_ovs12.py"
   sudo PYTHONPATH=. nosetests -s $INTEGRATED_TEST_RUNNER 
 }
 #NOSETESTS="nosetests $noseopts $noseargs"
-NOSETESTS="${PYTHON} ./tests/run_tests.py $noseopts $noseargs"
+NOSETESTS="${PYTHON} ./ryu/tests/run_tests.py $noseopts $noseargs"
 
 #if [ -n "$PLUGIN_DIR" ]
 #then
diff --git a/tests/__init__.py b/ryu/tests/integrated/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/__init__.py
+++ b/ryu/tests/integrated/__init__.py
diff --git a/tests/integrated/__init__.py b/ryu/tests/integrated/bgp/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/integrated/__init__.py
+++ b/ryu/tests/integrated/bgp/__init__.py
diff --git a/tests/integrated/bgp/base.py b/ryu/tests/integrated/bgp/base.py
index 9d057075..26fa396c 100644
--- a/tests/integrated/bgp/base.py
+++ b/ryu/tests/integrated/bgp/base.py
@@ -20,9 +20,9 @@ import logging
 import sys
 import unittest
 
-from tests.integrated.common import docker_base as ctn_base
-from tests.integrated.common import ryubgp
-from tests.integrated.common import quagga
+from ryu.tests.integrated.common import docker_base as ctn_base
+from ryu.tests.integrated.common import ryubgp
+from ryu.tests.integrated.common import quagga
 
 
 LOG = logging.getLogger(__name__)
diff --git a/tests/integrated/bgp/base_ip6.py b/ryu/tests/integrated/bgp/base_ip6.py
index 8d3ef419..be26fafd 100644
--- a/tests/integrated/bgp/base_ip6.py
+++ b/ryu/tests/integrated/bgp/base_ip6.py
@@ -20,9 +20,9 @@ import logging
 import sys
 import unittest
 
-from tests.integrated.common import docker_base as ctn_base
-from tests.integrated.common import ryubgp
-from tests.integrated.common import quagga
+from ryu.tests.integrated.common import docker_base as ctn_base
+from ryu.tests.integrated.common import ryubgp
+from ryu.tests.integrated.common import quagga
 
 
 LOG = logging.getLogger(__name__)
diff --git a/tests/integrated/bgp/test_basic.py b/ryu/tests/integrated/bgp/test_basic.py
index 9ef430c7..7c6c8cf5 100644
--- a/tests/integrated/bgp/test_basic.py
+++ b/ryu/tests/integrated/bgp/test_basic.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
 
 import time
 
-from tests.integrated.common import docker_base as ctn_base
+from ryu.tests.integrated.common import docker_base as ctn_base
 from . import base
 
 
diff --git a/tests/integrated/bgp/test_ip6_basic.py b/ryu/tests/integrated/bgp/test_ip6_basic.py
index a92e4edb..288e9e68 100644
--- a/tests/integrated/bgp/test_ip6_basic.py
+++ b/ryu/tests/integrated/bgp/test_ip6_basic.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
 
 import time
 
-from tests.integrated.common import docker_base as ctn_base
+from ryu.tests.integrated.common import docker_base as ctn_base
 from . import base_ip6 as base
 
 
diff --git a/tests/integrated/bgp/__init__.py b/ryu/tests/integrated/common/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/integrated/bgp/__init__.py
+++ b/ryu/tests/integrated/common/__init__.py
diff --git a/tests/integrated/common/docker_base.py b/ryu/tests/integrated/common/docker_base.py
index 1ae2cc27..1ae2cc27 100644
--- a/tests/integrated/common/docker_base.py
+++ b/ryu/tests/integrated/common/docker_base.py
diff --git a/tests/integrated/common/install_docker_test_pkg.sh b/ryu/tests/integrated/common/install_docker_test_pkg.sh
index a771dfc1..a771dfc1 100644
--- a/tests/integrated/common/install_docker_test_pkg.sh
+++ b/ryu/tests/integrated/common/install_docker_test_pkg.sh
diff --git a/tests/integrated/common/install_docker_test_pkg_common.sh b/ryu/tests/integrated/common/install_docker_test_pkg_common.sh
index 44a3e107..44a3e107 100644
--- a/tests/integrated/common/install_docker_test_pkg_common.sh
+++ b/ryu/tests/integrated/common/install_docker_test_pkg_common.sh
diff --git a/tests/integrated/common/install_docker_test_pkg_for_travis.sh b/ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh
index d8c3b499..d8c3b499 100644
--- a/tests/integrated/common/install_docker_test_pkg_for_travis.sh
+++ b/ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh
diff --git a/tests/integrated/common/quagga.py b/ryu/tests/integrated/common/quagga.py
index 9b6d2183..9b6d2183 100644
--- a/tests/integrated/common/quagga.py
+++ b/ryu/tests/integrated/common/quagga.py
diff --git a/tests/integrated/common/ryubgp.py b/ryu/tests/integrated/common/ryubgp.py
index 8fe16f49..8fe16f49 100644
--- a/tests/integrated/common/ryubgp.py
+++ b/ryu/tests/integrated/common/ryubgp.py
diff --git a/tests/integrated/run_test.py b/ryu/tests/integrated/run_test.py
index 77d39345..2aca03db 100644
--- a/tests/integrated/run_test.py
+++ b/ryu/tests/integrated/run_test.py
@@ -26,9 +26,9 @@ from ryu import log
 
 def load_tests(loader, tests, pattern):
     dirname = os.path.dirname(os.path.abspath(__file__))
-    base_path = os.path.abspath(dirname + '/../..')
+    base_path = os.path.abspath(dirname + '/../../..')
     suite = unittest.TestSuite()
-    for test_dir in ['tests/integrated/bgp']:
+    for test_dir in ['ryu/tests/integrated/bgp']:
         if not pattern:
             suite.addTests(loader.discover(test_dir,
                                            top_level_dir=base_path))
diff --git a/tests/integrated/run_tests_with_ovs12.py b/ryu/tests/integrated/run_tests_with_ovs12.py
index b6393c43..9d82d370 100755
--- a/tests/integrated/run_tests_with_ovs12.py
+++ b/ryu/tests/integrated/run_tests_with_ovs12.py
@@ -62,22 +62,22 @@ class TestWithOVS12(unittest.TestCase):
 
     @timed(TIMEOUT)
     def test_add_flow_v10(self):
-        app = 'test/integrated/test_add_flow_v10.py'
+        app = 'ryu/tests/integrated/test_add_flow_v10.py'
         self._run_ryu_manager_and_check_output(app)
 
     @timed(TIMEOUT)
     def test_request_reply_v12(self):
-        app = 'test/integrated/test_request_reply_v12.py'
+        app = 'ryu/tests/integrated/test_request_reply_v12.py'
         self._run_ryu_manager_and_check_output(app)
 
     @timed(TIMEOUT)
     def test_add_flow_v12_actions(self):
-        app = 'test/integrated/test_add_flow_v12_actions.py'
+        app = 'ryu/tests/integrated/test_add_flow_v12_actions.py'
         self._run_ryu_manager_and_check_output(app)
 
     @timed(TIMEOUT)
     def test_add_flow_v12_matches(self):
-        app = 'test/integrated/test_add_flow_v12_matches.py'
+        app = 'ryu/tests/integrated/test_add_flow_v12_matches.py'
         self._run_ryu_manager_and_check_output(app)
 
     @nottest
diff --git a/tests/integrated/test_add_flow_v10.py b/ryu/tests/integrated/test_add_flow_v10.py
index 895cf15d..6a09646c 100644
--- a/tests/integrated/test_add_flow_v10.py
+++ b/ryu/tests/integrated/test_add_flow_v10.py
@@ -17,12 +17,11 @@
 
 import logging
 
+from ryu.tests.integrated import tester
 from ryu.ofproto import ofproto_v1_0
 from ryu.ofproto import ether
 from ryu.ofproto import nx_match
 
-from tests.integrated import tester
-
 LOG = logging.getLogger(__name__)
 
 
diff --git a/tests/integrated/test_add_flow_v12_actions.py b/ryu/tests/integrated/test_add_flow_v12_actions.py
index 3c1625ad..7c75aa53 100644
--- a/tests/integrated/test_add_flow_v12_actions.py
+++ b/ryu/tests/integrated/test_add_flow_v12_actions.py
@@ -20,8 +20,7 @@ import logging
 from ryu.ofproto import ofproto_v1_2
 from ryu.ofproto import ether
 from ryu.ofproto import inet
-
-from tests.integrated import tester
+from ryu.tests.integrated import tester
 
 LOG = logging.getLogger(__name__)
 
diff --git a/tests/integrated/test_add_flow_v12_matches.py b/ryu/tests/integrated/test_add_flow_v12_matches.py
index 404e45ef..588855a6 100644
--- a/tests/integrated/test_add_flow_v12_matches.py
+++ b/ryu/tests/integrated/test_add_flow_v12_matches.py
@@ -20,8 +20,7 @@ import logging
 from ryu.ofproto import ofproto_v1_2
 from ryu.ofproto import ether
 from ryu.ofproto import inet
-
-from tests.integrated import tester
+from ryu.tests.integrated import tester
 
 LOG = logging.getLogger(__name__)
 
diff --git a/tests/integrated/test_of_config.py b/ryu/tests/integrated/test_of_config.py
index 654b1489..6bcc7d0b 100644
--- a/tests/integrated/test_of_config.py
+++ b/ryu/tests/integrated/test_of_config.py
@@ -34,7 +34,7 @@ Then run linc
 
 Then run ryu
 # PYTHONPATH=. ./bin/ryu-manager --verbose \
-        tests/integrated/test_of_config.py
+        ryu/tests/integrated/test_of_config.py
 
 
 Here is my sys.config used for this test.
diff --git a/tests/integrated/test_request_reply_v12.py b/ryu/tests/integrated/test_request_reply_v12.py
index ea031182..ae99bcc7 100644
--- a/tests/integrated/test_request_reply_v12.py
+++ b/ryu/tests/integrated/test_request_reply_v12.py
@@ -22,8 +22,7 @@ from ryu.controller import ofp_event
 from ryu.controller.handler import MAIN_DISPATCHER
 from ryu.controller.handler import set_ev_cls
 from ryu.ofproto import ofproto_v1_2
-
-from tests.integrated import tester
+from ryu.tests.integrated import tester
 
 LOG = logging.getLogger(__name__)
 
diff --git a/tests/integrated/test_vrrp_linux_multi.py b/ryu/tests/integrated/test_vrrp_linux_multi.py
index ae4d837a..dca70c47 100644
--- a/tests/integrated/test_vrrp_linux_multi.py
+++ b/ryu/tests/integrated/test_vrrp_linux_multi.py
@@ -19,8 +19,8 @@ Usage:
 PYTHONPATH=. ./bin/ryu-manager --verbose \
              ryu.services.protocols.vrrp.dumper \
              ryu.services.protocols.vrrp.sample_manager.py \
-             ryu.app.rest \
-             tests.integrated.test_vrrp_linux_multi
+             ryu.tests.integrated.test_vrrp_linux_multi \
+             ryu.app.rest
 
 ryu.services.protocols.vrrp.dumper is optional.
 ryu.app.rest is merely to prevent ryu-manager from exiting.
diff --git a/tests/integrated/test_vrrp_linux_multi.sh b/ryu/tests/integrated/test_vrrp_linux_multi.sh
index b1dba4bc..b1dba4bc 100644
--- a/tests/integrated/test_vrrp_linux_multi.sh
+++ b/ryu/tests/integrated/test_vrrp_linux_multi.sh
diff --git a/tests/integrated/test_vrrp_multi.py b/ryu/tests/integrated/test_vrrp_multi.py
index 9d586119..6aee6395 100644
--- a/tests/integrated/test_vrrp_multi.py
+++ b/ryu/tests/integrated/test_vrrp_multi.py
@@ -18,8 +18,8 @@
 Usage:
 PYTHONPATH=. ./bin/ryu-manager --verbose \
              ryu.topology.switches \
-             ryu.services.protocols.vrrp.dumper \
-             tests.integrated.test_vrrp_multi
+             ryu.tests.integrated.test_vrrp_multi \
+             ryu.services.protocols.vrrp.dumper
 
 ryu.services.protocols.vrrp.dumper is optional.
 
diff --git a/tests/integrated/test_vrrp_multi.sh b/ryu/tests/integrated/test_vrrp_multi.sh
index 5118cf7d..5118cf7d 100644
--- a/tests/integrated/test_vrrp_multi.sh
+++ b/ryu/tests/integrated/test_vrrp_multi.sh
diff --git a/tests/integrated/tester.py b/ryu/tests/integrated/tester.py
index f052c6cc..f052c6cc 100644
--- a/tests/integrated/tester.py
+++ b/ryu/tests/integrated/tester.py
diff --git a/tests/integrated/vrrp_common.py b/ryu/tests/integrated/vrrp_common.py
index 58621f45..58621f45 100644
--- a/tests/integrated/vrrp_common.py
+++ b/ryu/tests/integrated/vrrp_common.py
diff --git a/tests/mininet/l2/mpls/PopMPLS_mpls.mn b/ryu/tests/mininet/l2/mpls/PopMPLS_mpls.mn
index 45fa9f96..45fa9f96 100644
--- a/tests/mininet/l2/mpls/PopMPLS_mpls.mn
+++ b/ryu/tests/mininet/l2/mpls/PopMPLS_mpls.mn
diff --git a/tests/mininet/l2/mpls/PushMPLS_ip.mn b/ryu/tests/mininet/l2/mpls/PushMPLS_ip.mn
index 2634e788..2634e788 100644
--- a/tests/mininet/l2/mpls/PushMPLS_ip.mn
+++ b/ryu/tests/mininet/l2/mpls/PushMPLS_ip.mn
diff --git a/tests/mininet/l2/mpls/PushMPLS_mpls.mn b/ryu/tests/mininet/l2/mpls/PushMPLS_mpls.mn
index 5ac1702f..5ac1702f 100644
--- a/tests/mininet/l2/mpls/PushMPLS_mpls.mn
+++ b/ryu/tests/mininet/l2/mpls/PushMPLS_mpls.mn
diff --git a/tests/mininet/l2/mpls/test_mpls.py b/ryu/tests/mininet/l2/mpls/test_mpls.py
index 3090a08c..3090a08c 100644
--- a/tests/mininet/l2/mpls/test_mpls.py
+++ b/ryu/tests/mininet/l2/mpls/test_mpls.py
diff --git a/tests/mininet/l2/vlan/PopVLAN_vlan.mn b/ryu/tests/mininet/l2/vlan/PopVLAN_vlan.mn
index f1d1c6dd..f1d1c6dd 100644
--- a/tests/mininet/l2/vlan/PopVLAN_vlan.mn
+++ b/ryu/tests/mininet/l2/vlan/PopVLAN_vlan.mn
diff --git a/tests/mininet/l2/vlan/PopVLAN_vlanvlan.mn b/ryu/tests/mininet/l2/vlan/PopVLAN_vlanvlan.mn
index 90444a75..90444a75 100644
--- a/tests/mininet/l2/vlan/PopVLAN_vlanvlan.mn
+++ b/ryu/tests/mininet/l2/vlan/PopVLAN_vlanvlan.mn
diff --git a/tests/mininet/l2/vlan/PushVLAN_icmp.mn b/ryu/tests/mininet/l2/vlan/PushVLAN_icmp.mn
index 439ad233..439ad233 100644
--- a/tests/mininet/l2/vlan/PushVLAN_icmp.mn
+++ b/ryu/tests/mininet/l2/vlan/PushVLAN_icmp.mn
diff --git a/tests/mininet/l2/vlan/test_vlan.py b/ryu/tests/mininet/l2/vlan/test_vlan.py
index 0b1be7fc..0b1be7fc 100644
--- a/tests/mininet/l2/vlan/test_vlan.py
+++ b/ryu/tests/mininet/l2/vlan/test_vlan.py
diff --git a/tests/mininet/l3/icmp/ICMP_ping.mn b/ryu/tests/mininet/l3/icmp/ICMP_ping.mn
index f558693d..f558693d 100644
--- a/tests/mininet/l3/icmp/ICMP_ping.mn
+++ b/ryu/tests/mininet/l3/icmp/ICMP_ping.mn
diff --git a/tests/mininet/l3/icmp/ICMP_reply.mn b/ryu/tests/mininet/l3/icmp/ICMP_reply.mn
index eb6bc8b6..eb6bc8b6 100644
--- a/tests/mininet/l3/icmp/ICMP_reply.mn
+++ b/ryu/tests/mininet/l3/icmp/ICMP_reply.mn
diff --git a/tests/mininet/l3/icmp/test_icmp.py b/ryu/tests/mininet/l3/icmp/test_icmp.py
index 090f83e5..090f83e5 100644
--- a/tests/mininet/l3/icmp/test_icmp.py
+++ b/ryu/tests/mininet/l3/icmp/test_icmp.py
diff --git a/tests/mininet/l3/ip_ttl/DecNwTtl.mn b/ryu/tests/mininet/l3/ip_ttl/DecNwTtl.mn
index 60cd4623..60cd4623 100644
--- a/tests/mininet/l3/ip_ttl/DecNwTtl.mn
+++ b/ryu/tests/mininet/l3/ip_ttl/DecNwTtl.mn
diff --git a/tests/mininet/l3/ip_ttl/test_ip_ttl.py b/ryu/tests/mininet/l3/ip_ttl/test_ip_ttl.py
index f6f00ab9..f6f00ab9 100644
--- a/tests/mininet/l3/ip_ttl/test_ip_ttl.py
+++ b/ryu/tests/mininet/l3/ip_ttl/test_ip_ttl.py
diff --git a/tests/mininet/packet_lib/arp/ARP_gratuitous.mn b/ryu/tests/mininet/packet_lib/arp/ARP_gratuitous.mn
index ca7a30ae..ca7a30ae 100644
--- a/tests/mininet/packet_lib/arp/ARP_gratuitous.mn
+++ b/ryu/tests/mininet/packet_lib/arp/ARP_gratuitous.mn
diff --git a/tests/mininet/packet_lib/arp/ARP_reply.mn b/ryu/tests/mininet/packet_lib/arp/ARP_reply.mn
index 3969cba1..3969cba1 100644
--- a/tests/mininet/packet_lib/arp/ARP_reply.mn
+++ b/ryu/tests/mininet/packet_lib/arp/ARP_reply.mn
diff --git a/tests/mininet/packet_lib/arp/ARP_request.mn b/ryu/tests/mininet/packet_lib/arp/ARP_request.mn
index b44450ef..b44450ef 100644
--- a/tests/mininet/packet_lib/arp/ARP_request.mn
+++ b/ryu/tests/mininet/packet_lib/arp/ARP_request.mn
diff --git a/tests/mininet/packet_lib/arp/test_arp.py b/ryu/tests/mininet/packet_lib/arp/test_arp.py
index 39948f54..39948f54 100644
--- a/tests/mininet/packet_lib/arp/test_arp.py
+++ b/ryu/tests/mininet/packet_lib/arp/test_arp.py
diff --git a/tests/mininet/run_mnet-test.sh b/ryu/tests/mininet/run_mnet-test.sh
index c1ecbe23..c1ecbe23 100755
--- a/tests/mininet/run_mnet-test.sh
+++ b/ryu/tests/mininet/run_mnet-test.sh
diff --git a/tests/packet_data/bgp4/bgp4-keepalive.pcap b/ryu/tests/packet_data/bgp4/bgp4-keepalive.pcap
index 355e9dab..355e9dab 100644
--- a/tests/packet_data/bgp4/bgp4-keepalive.pcap
+++ b/ryu/tests/packet_data/bgp4/bgp4-keepalive.pcap
diff --git a/tests/packet_data/bgp4/bgp4-open.pcap b/ryu/tests/packet_data/bgp4/bgp4-open.pcap
index 1ef507bb..1ef507bb 100644
--- a/tests/packet_data/bgp4/bgp4-open.pcap
+++ b/ryu/tests/packet_data/bgp4/bgp4-open.pcap
diff --git a/tests/packet_data/bgp4/bgp4-update.pcap b/ryu/tests/packet_data/bgp4/bgp4-update.pcap
index 37354938..37354938 100644
--- a/tests/packet_data/bgp4/bgp4-update.pcap
+++ b/ryu/tests/packet_data/bgp4/bgp4-update.pcap
diff --git a/tests/packet_data/bgp4/bgp4-update_ipv6.pcap b/ryu/tests/packet_data/bgp4/bgp4-update_ipv6.pcap
index 49ed4d9e..49ed4d9e 100644
--- a/tests/packet_data/bgp4/bgp4-update_ipv6.pcap
+++ b/ryu/tests/packet_data/bgp4/bgp4-update_ipv6.pcap
diff --git a/tests/packet_data/bgp4/bgp4-update_vpnv6.pcap b/ryu/tests/packet_data/bgp4/bgp4-update_vpnv6.pcap
index 07e5ebb3..07e5ebb3 100644
--- a/tests/packet_data/bgp4/bgp4-update_vpnv6.pcap
+++ b/ryu/tests/packet_data/bgp4/bgp4-update_vpnv6.pcap
diff --git a/tests/packet_data/bgp4/evpn_esi_arbitrary.pcap b/ryu/tests/packet_data/bgp4/evpn_esi_arbitrary.pcap
index 490ee839..490ee839 100644
--- a/tests/packet_data/bgp4/evpn_esi_arbitrary.pcap
+++ b/ryu/tests/packet_data/bgp4/evpn_esi_arbitrary.pcap
diff --git a/tests/packet_data/bgp4/evpn_esi_as_based.pcap b/ryu/tests/packet_data/bgp4/evpn_esi_as_based.pcap
index d17183a7..d17183a7 100644
--- a/tests/packet_data/bgp4/evpn_esi_as_based.pcap
+++ b/ryu/tests/packet_data/bgp4/evpn_esi_as_based.pcap
diff --git a/tests/packet_data/bgp4/evpn_esi_l2_bridge.pcap b/ryu/tests/packet_data/bgp4/evpn_esi_l2_bridge.pcap
index 0f8d3f95..0f8d3f95 100644
--- a/tests/packet_data/bgp4/evpn_esi_l2_bridge.pcap
+++ b/ryu/tests/packet_data/bgp4/evpn_esi_l2_bridge.pcap
diff --git a/tests/packet_data/bgp4/evpn_esi_lacp.pcap b/ryu/tests/packet_data/bgp4/evpn_esi_lacp.pcap
index 833109b5..833109b5 100644
--- a/tests/packet_data/bgp4/evpn_esi_lacp.pcap
+++ b/ryu/tests/packet_data/bgp4/evpn_esi_lacp.pcap
diff --git a/tests/packet_data/bgp4/evpn_esi_mac_base.pcap b/ryu/tests/packet_data/bgp4/evpn_esi_mac_base.pcap
index 3b6fa798..3b6fa798 100644
--- a/tests/packet_data/bgp4/evpn_esi_mac_base.pcap
+++ b/ryu/tests/packet_data/bgp4/evpn_esi_mac_base.pcap
diff --git a/tests/packet_data/bgp4/evpn_esi_router_id.pcap b/ryu/tests/packet_data/bgp4/evpn_esi_router_id.pcap
index b69ce620..b69ce620 100644
--- a/tests/packet_data/bgp4/evpn_esi_router_id.pcap
+++ b/ryu/tests/packet_data/bgp4/evpn_esi_router_id.pcap
diff --git a/tests/packet_data/bgp4/evpn_nlri_eth_a-d.pcap b/ryu/tests/packet_data/bgp4/evpn_nlri_eth_a-d.pcap
index 434c898a..434c898a 100644
--- a/tests/packet_data/bgp4/evpn_nlri_eth_a-d.pcap
+++ b/ryu/tests/packet_data/bgp4/evpn_nlri_eth_a-d.pcap
diff --git a/tests/packet_data/bgp4/evpn_nlri_eth_seg.pcap b/ryu/tests/packet_data/bgp4/evpn_nlri_eth_seg.pcap
index a99804b3..a99804b3 100644
--- a/tests/packet_data/bgp4/evpn_nlri_eth_seg.pcap
+++ b/ryu/tests/packet_data/bgp4/evpn_nlri_eth_seg.pcap
diff --git a/tests/packet_data/bgp4/evpn_nlri_inc_multi_eth_tag.pcap b/ryu/tests/packet_data/bgp4/evpn_nlri_inc_multi_eth_tag.pcap
index 293722db..293722db 100644
--- a/tests/packet_data/bgp4/evpn_nlri_inc_multi_eth_tag.pcap
+++ b/ryu/tests/packet_data/bgp4/evpn_nlri_inc_multi_eth_tag.pcap
diff --git a/tests/packet_data/bgp4/evpn_nlri_ip_prefix.pcap b/ryu/tests/packet_data/bgp4/evpn_nlri_ip_prefix.pcap
index f1598ee8..f1598ee8 100644
--- a/tests/packet_data/bgp4/evpn_nlri_ip_prefix.pcap
+++ b/ryu/tests/packet_data/bgp4/evpn_nlri_ip_prefix.pcap
diff --git a/tests/packet_data/bgp4/evpn_nlri_mac_ip_ad.pcap b/ryu/tests/packet_data/bgp4/evpn_nlri_mac_ip_ad.pcap
index f9152e80..f9152e80 100644
--- a/tests/packet_data/bgp4/evpn_nlri_mac_ip_ad.pcap
+++ b/ryu/tests/packet_data/bgp4/evpn_nlri_mac_ip_ad.pcap
diff --git a/tests/packet_data/bgp4/flowspec_action_redirect.pcap b/ryu/tests/packet_data/bgp4/flowspec_action_redirect.pcap
index 70d65ee4..70d65ee4 100644
--- a/tests/packet_data/bgp4/flowspec_action_redirect.pcap
+++ b/ryu/tests/packet_data/bgp4/flowspec_action_redirect.pcap
diff --git a/tests/packet_data/bgp4/flowspec_action_traffic_action.pcap b/ryu/tests/packet_data/bgp4/flowspec_action_traffic_action.pcap
index 952723ea..952723ea 100644
--- a/tests/packet_data/bgp4/flowspec_action_traffic_action.pcap
+++ b/ryu/tests/packet_data/bgp4/flowspec_action_traffic_action.pcap
diff --git a/tests/packet_data/bgp4/flowspec_action_traffic_marking.pcap b/ryu/tests/packet_data/bgp4/flowspec_action_traffic_marking.pcap
index 8f00c0f9..8f00c0f9 100644
--- a/tests/packet_data/bgp4/flowspec_action_traffic_marking.pcap
+++ b/ryu/tests/packet_data/bgp4/flowspec_action_traffic_marking.pcap
diff --git a/tests/packet_data/bgp4/flowspec_action_traffic_rate.pcap b/ryu/tests/packet_data/bgp4/flowspec_action_traffic_rate.pcap
index 9f20f5e6..9f20f5e6 100644
--- a/tests/packet_data/bgp4/flowspec_action_traffic_rate.pcap
+++ b/ryu/tests/packet_data/bgp4/flowspec_action_traffic_rate.pcap
diff --git a/tests/packet_data/bgp4/flowspec_nlri_ipv4.pcap b/ryu/tests/packet_data/bgp4/flowspec_nlri_ipv4.pcap
index 885a106a..885a106a 100644
--- a/tests/packet_data/bgp4/flowspec_nlri_ipv4.pcap
+++ b/ryu/tests/packet_data/bgp4/flowspec_nlri_ipv4.pcap
diff --git a/tests/packet_data/bgp4/flowspec_nlri_ipv6.pcap b/ryu/tests/packet_data/bgp4/flowspec_nlri_ipv6.pcap
index 82534a61..82534a61 100644
--- a/tests/packet_data/bgp4/flowspec_nlri_ipv6.pcap
+++ b/ryu/tests/packet_data/bgp4/flowspec_nlri_ipv6.pcap
diff --git a/tests/packet_data/bgp4/flowspec_nlri_l2vpn.pcap b/ryu/tests/packet_data/bgp4/flowspec_nlri_l2vpn.pcap
index 5236c831..5236c831 100644
--- a/tests/packet_data/bgp4/flowspec_nlri_l2vpn.pcap
+++ b/ryu/tests/packet_data/bgp4/flowspec_nlri_l2vpn.pcap
diff --git a/tests/packet_data/bgp4/flowspec_nlri_vpn4.pcap b/ryu/tests/packet_data/bgp4/flowspec_nlri_vpn4.pcap
index 236110db..236110db 100644
--- a/tests/packet_data/bgp4/flowspec_nlri_vpn4.pcap
+++ b/ryu/tests/packet_data/bgp4/flowspec_nlri_vpn4.pcap
diff --git a/tests/packet_data/bgp4/flowspec_nlri_vpn6.pcap b/ryu/tests/packet_data/bgp4/flowspec_nlri_vpn6.pcap
index cdf4c1c0..cdf4c1c0 100644
--- a/tests/packet_data/bgp4/flowspec_nlri_vpn6.pcap
+++ b/ryu/tests/packet_data/bgp4/flowspec_nlri_vpn6.pcap
diff --git a/tests/packet_data/mrt/rib.20161101.0000_pick.bz2 b/ryu/tests/packet_data/mrt/rib.20161101.0000_pick.bz2
index 0e02ef2d..0e02ef2d 100644
--- a/tests/packet_data/mrt/rib.20161101.0000_pick.bz2
+++ b/ryu/tests/packet_data/mrt/rib.20161101.0000_pick.bz2
diff --git a/tests/packet_data/mrt/updates.20161101.0000.bz2 b/ryu/tests/packet_data/mrt/updates.20161101.0000.bz2
index 6caefe23..6caefe23 100644
--- a/tests/packet_data/mrt/updates.20161101.0000.bz2
+++ b/ryu/tests/packet_data/mrt/updates.20161101.0000.bz2
diff --git a/tests/packet_data/of10/1-1-ofp_packet_out.packet b/ryu/tests/packet_data/of10/1-1-ofp_packet_out.packet
index 8093e84c..8093e84c 100644
--- a/tests/packet_data/of10/1-1-ofp_packet_out.packet
+++ b/ryu/tests/packet_data/of10/1-1-ofp_packet_out.packet
diff --git a/tests/packet_data/of10/1-2-ofp_flow_mod.packet b/ryu/tests/packet_data/of10/1-2-ofp_flow_mod.packet
index 881f4946..881f4946 100644
--- a/tests/packet_data/of10/1-2-ofp_flow_mod.packet
+++ b/ryu/tests/packet_data/of10/1-2-ofp_flow_mod.packet
diff --git a/tests/packet_data/of10/1-4-ofp_packet_in.packet b/ryu/tests/packet_data/of10/1-4-ofp_packet_in.packet
index 9321feb6..9321feb6 100644
--- a/tests/packet_data/of10/1-4-ofp_packet_in.packet
+++ b/ryu/tests/packet_data/of10/1-4-ofp_packet_in.packet
diff --git a/tests/packet_data/of10/1-5-features_request.packet b/ryu/tests/packet_data/of10/1-5-features_request.packet
index 2faaf406..2faaf406 100644
--- a/tests/packet_data/of10/1-5-features_request.packet
+++ b/ryu/tests/packet_data/of10/1-5-features_request.packet
diff --git a/tests/packet_data/of10/1-6-ofp_switch_features.packet b/ryu/tests/packet_data/of10/1-6-ofp_switch_features.packet
index 31f17df3..31f17df3 100644
--- a/tests/packet_data/of10/1-6-ofp_switch_features.packet
+++ b/ryu/tests/packet_data/of10/1-6-ofp_switch_features.packet
diff --git a/tests/packet_data/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet b/ryu/tests/packet_data/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet
index 8093e84c..8093e84c 100644
--- a/tests/packet_data/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet
+++ b/ryu/tests/packet_data/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet
diff --git a/tests/packet_data/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet
index f2f6c279..f2f6c279 100644
--- a/tests/packet_data/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet
+++ b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet
diff --git a/tests/packet_data/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet
index 38e0a2a2..38e0a2a2 100644
--- a/tests/packet_data/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet
+++ b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet
diff --git a/tests/packet_data/of10/ovs-ofctl-of10-action_pop_mpls.packet b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_pop_mpls.packet
index 49c4a862..49c4a862 100644
--- a/tests/packet_data/of10/ovs-ofctl-of10-action_pop_mpls.packet
+++ b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_pop_mpls.packet
diff --git a/tests/packet_data/of10/ovs-ofctl-of10-action_push_mpls.packet b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_push_mpls.packet
index fc478e1f..fc478e1f 100644
--- a/tests/packet_data/of10/ovs-ofctl-of10-action_push_mpls.packet
+++ b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_push_mpls.packet
diff --git a/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_label.packet b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_label.packet
index 4c529139..4c529139 100644
--- a/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_label.packet
+++ b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_label.packet
diff --git a/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_tc.packet b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_tc.packet
index 0b6dc347..0b6dc347 100644
--- a/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_tc.packet
+++ b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_tc.packet
diff --git a/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet
index 424f9a74..424f9a74 100644
--- a/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet
+++ b/ryu/tests/packet_data/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet
diff --git a/tests/packet_data/of12/3-0-ofp_desc_stats_reply.packet b/ryu/tests/packet_data/of12/3-0-ofp_desc_stats_reply.packet
index 17cfd664..17cfd664 100644
--- a/tests/packet_data/of12/3-0-ofp_desc_stats_reply.packet
+++ b/ryu/tests/packet_data/of12/3-0-ofp_desc_stats_reply.packet
diff --git a/tests/packet_data/of12/3-1-ofp_packet_out.packet b/ryu/tests/packet_data/of12/3-1-ofp_packet_out.packet
index a9ebe1ef..a9ebe1ef 100644
--- a/tests/packet_data/of12/3-1-ofp_packet_out.packet
+++ b/ryu/tests/packet_data/of12/3-1-ofp_packet_out.packet
diff --git a/tests/packet_data/of12/3-10-ofp_hello.packet b/ryu/tests/packet_data/of12/3-10-ofp_hello.packet
index 8894b8ce..8894b8ce 100644
--- a/tests/packet_data/of12/3-10-ofp_hello.packet
+++ b/ryu/tests/packet_data/of12/3-10-ofp_hello.packet
diff --git a/tests/packet_data/of12/3-11-ofp_flow_stats_request.packet b/ryu/tests/packet_data/of12/3-11-ofp_flow_stats_request.packet
index 4c825f93..4c825f93 100644
--- a/tests/packet_data/of12/3-11-ofp_flow_stats_request.packet
+++ b/ryu/tests/packet_data/of12/3-11-ofp_flow_stats_request.packet
diff --git a/tests/packet_data/of12/3-12-ofp_flow_stats_reply.packet b/ryu/tests/packet_data/of12/3-12-ofp_flow_stats_reply.packet
index 73f7221e..73f7221e 100644
--- a/tests/packet_data/of12/3-12-ofp_flow_stats_reply.packet
+++ b/ryu/tests/packet_data/of12/3-12-ofp_flow_stats_reply.packet
diff --git a/tests/packet_data/of12/3-13-ofp_echo_request.packet b/ryu/tests/packet_data/of12/3-13-ofp_echo_request.packet
index f67baba2..f67baba2 100644
--- a/tests/packet_data/of12/3-13-ofp_echo_request.packet
+++ b/ryu/tests/packet_data/of12/3-13-ofp_echo_request.packet
diff --git a/tests/packet_data/of12/3-14-ofp_echo_reply.packet b/ryu/tests/packet_data/of12/3-14-ofp_echo_reply.packet
index f227be12..f227be12 100644
--- a/tests/packet_data/of12/3-14-ofp_echo_reply.packet
+++ b/ryu/tests/packet_data/of12/3-14-ofp_echo_reply.packet
diff --git a/tests/packet_data/of12/3-15-ofp_error_msg.packet b/ryu/tests/packet_data/of12/3-15-ofp_error_msg.packet
index 21111bd3..21111bd3 100644
--- a/tests/packet_data/of12/3-15-ofp_error_msg.packet
+++ b/ryu/tests/packet_data/of12/3-15-ofp_error_msg.packet
diff --git a/tests/packet_data/of12/3-16-ofp_experimenter.packet b/ryu/tests/packet_data/of12/3-16-ofp_experimenter.packet
index f9524ca5..f9524ca5 100644
--- a/tests/packet_data/of12/3-16-ofp_experimenter.packet
+++ b/ryu/tests/packet_data/of12/3-16-ofp_experimenter.packet
diff --git a/tests/packet_data/of12/3-17-ofp_barrier_request.packet b/ryu/tests/packet_data/of12/3-17-ofp_barrier_request.packet
index 17a6f76a..17a6f76a 100644
--- a/tests/packet_data/of12/3-17-ofp_barrier_request.packet
+++ b/ryu/tests/packet_data/of12/3-17-ofp_barrier_request.packet
diff --git a/tests/packet_data/of12/3-18-ofp_barrier_reply.packet b/ryu/tests/packet_data/of12/3-18-ofp_barrier_reply.packet
index 8cd2f9e7..8cd2f9e7 100644
--- a/tests/packet_data/of12/3-18-ofp_barrier_reply.packet
+++ b/ryu/tests/packet_data/of12/3-18-ofp_barrier_reply.packet
diff --git a/tests/packet_data/of12/3-19-ofp_role_request.packet b/ryu/tests/packet_data/of12/3-19-ofp_role_request.packet
index db2f24f5..db2f24f5 100644
--- a/tests/packet_data/of12/3-19-ofp_role_request.packet
+++ b/ryu/tests/packet_data/of12/3-19-ofp_role_request.packet
diff --git a/tests/packet_data/of12/3-2-ofp_flow_mod.packet b/ryu/tests/packet_data/of12/3-2-ofp_flow_mod.packet
index f54ec6da..f54ec6da 100644
--- a/tests/packet_data/of12/3-2-ofp_flow_mod.packet
+++ b/ryu/tests/packet_data/of12/3-2-ofp_flow_mod.packet
diff --git a/tests/packet_data/of12/3-20-ofp_role_reply.packet b/ryu/tests/packet_data/of12/3-20-ofp_role_reply.packet
index 3e850878..3e850878 100644
--- a/tests/packet_data/of12/3-20-ofp_role_reply.packet
+++ b/ryu/tests/packet_data/of12/3-20-ofp_role_reply.packet
diff --git a/tests/packet_data/of12/3-21-ofp_group_mod.packet b/ryu/tests/packet_data/of12/3-21-ofp_group_mod.packet
index 0b45c318..0b45c318 100644
--- a/tests/packet_data/of12/3-21-ofp_group_mod.packet
+++ b/ryu/tests/packet_data/of12/3-21-ofp_group_mod.packet
diff --git a/tests/packet_data/of12/3-22-ofp_port_mod.packet b/ryu/tests/packet_data/of12/3-22-ofp_port_mod.packet
index 7bbbb6a5..7bbbb6a5 100644
--- a/tests/packet_data/of12/3-22-ofp_port_mod.packet
+++ b/ryu/tests/packet_data/of12/3-22-ofp_port_mod.packet
diff --git a/tests/packet_data/of12/3-23-ofp_table_mod.packet b/ryu/tests/packet_data/of12/3-23-ofp_table_mod.packet
index b6d68a30..b6d68a30 100644
--- a/tests/packet_data/of12/3-23-ofp_table_mod.packet
+++ b/ryu/tests/packet_data/of12/3-23-ofp_table_mod.packet
diff --git a/tests/packet_data/of12/3-24-ofp_desc_stats_request.packet b/ryu/tests/packet_data/of12/3-24-ofp_desc_stats_request.packet
index c59f6366..c59f6366 100644
--- a/tests/packet_data/of12/3-24-ofp_desc_stats_request.packet
+++ b/ryu/tests/packet_data/of12/3-24-ofp_desc_stats_request.packet
diff --git a/tests/packet_data/of12/3-25-ofp_aggregate_stats_request.packet b/ryu/tests/packet_data/of12/3-25-ofp_aggregate_stats_request.packet
index 05416ffd..05416ffd 100644
--- a/tests/packet_data/of12/3-25-ofp_aggregate_stats_request.packet
+++ b/ryu/tests/packet_data/of12/3-25-ofp_aggregate_stats_request.packet
diff --git a/tests/packet_data/of12/3-26-ofp_aggregate_stats_reply.packet b/ryu/tests/packet_data/of12/3-26-ofp_aggregate_stats_reply.packet
index 43c89051..43c89051 100644
--- a/tests/packet_data/of12/3-26-ofp_aggregate_stats_reply.packet
+++ b/ryu/tests/packet_data/of12/3-26-ofp_aggregate_stats_reply.packet
diff --git a/tests/packet_data/of12/3-27-ofp_table_stats_request.packet b/ryu/tests/packet_data/of12/3-27-ofp_table_stats_request.packet
index 0d426129..0d426129 100644
--- a/tests/packet_data/of12/3-27-ofp_table_stats_request.packet
+++ b/ryu/tests/packet_data/of12/3-27-ofp_table_stats_request.packet
diff --git a/tests/packet_data/of12/3-28-ofp_table_stats_reply.packet b/ryu/tests/packet_data/of12/3-28-ofp_table_stats_reply.packet
index 60e76442..60e76442 100644
--- a/tests/packet_data/of12/3-28-ofp_table_stats_reply.packet
+++ b/ryu/tests/packet_data/of12/3-28-ofp_table_stats_reply.packet
diff --git a/tests/packet_data/of12/3-29-ofp_port_stats_request.packet b/ryu/tests/packet_data/of12/3-29-ofp_port_stats_request.packet
index cebaac69..cebaac69 100644
--- a/tests/packet_data/of12/3-29-ofp_port_stats_request.packet
+++ b/ryu/tests/packet_data/of12/3-29-ofp_port_stats_request.packet
diff --git a/tests/packet_data/of12/3-3-ofp_flow_mod.packet b/ryu/tests/packet_data/of12/3-3-ofp_flow_mod.packet
index a3541cc4..a3541cc4 100644
--- a/tests/packet_data/of12/3-3-ofp_flow_mod.packet
+++ b/ryu/tests/packet_data/of12/3-3-ofp_flow_mod.packet
diff --git a/tests/packet_data/of12/3-30-ofp_port_stats_reply.packet b/ryu/tests/packet_data/of12/3-30-ofp_port_stats_reply.packet
index 77d9369f..77d9369f 100644
--- a/tests/packet_data/of12/3-30-ofp_port_stats_reply.packet
+++ b/ryu/tests/packet_data/of12/3-30-ofp_port_stats_reply.packet
diff --git a/tests/packet_data/of12/3-31-ofp_group_features_stats_request.packet b/ryu/tests/packet_data/of12/3-31-ofp_group_features_stats_request.packet
index 9d11b936..9d11b936 100644
--- a/tests/packet_data/of12/3-31-ofp_group_features_stats_request.packet
+++ b/ryu/tests/packet_data/of12/3-31-ofp_group_features_stats_request.packet
diff --git a/tests/packet_data/of12/3-32-ofp_group_features_stats_reply.packet b/ryu/tests/packet_data/of12/3-32-ofp_group_features_stats_reply.packet
index d1f41595..d1f41595 100644
--- a/tests/packet_data/of12/3-32-ofp_group_features_stats_reply.packet
+++ b/ryu/tests/packet_data/of12/3-32-ofp_group_features_stats_reply.packet
diff --git a/tests/packet_data/of12/3-33-ofp_group_desc_stats_request.packet b/ryu/tests/packet_data/of12/3-33-ofp_group_desc_stats_request.packet
index 1eef2113..1eef2113 100644
--- a/tests/packet_data/of12/3-33-ofp_group_desc_stats_request.packet
+++ b/ryu/tests/packet_data/of12/3-33-ofp_group_desc_stats_request.packet
diff --git a/tests/packet_data/of12/3-34-ofp_group_desc_stats_reply.packet b/ryu/tests/packet_data/of12/3-34-ofp_group_desc_stats_reply.packet
index e17a933a..e17a933a 100644
--- a/tests/packet_data/of12/3-34-ofp_group_desc_stats_reply.packet
+++ b/ryu/tests/packet_data/of12/3-34-ofp_group_desc_stats_reply.packet
diff --git a/tests/packet_data/of12/3-35-ofp_queue_get_config_request.packet b/ryu/tests/packet_data/of12/3-35-ofp_queue_get_config_request.packet
index 66e380d6..66e380d6 100644
--- a/tests/packet_data/of12/3-35-ofp_queue_get_config_request.packet
+++ b/ryu/tests/packet_data/of12/3-35-ofp_queue_get_config_request.packet
diff --git a/tests/packet_data/of12/3-36-ofp_queue_get_config_reply.packet b/ryu/tests/packet_data/of12/3-36-ofp_queue_get_config_reply.packet
index 757308ee..757308ee 100644
--- a/tests/packet_data/of12/3-36-ofp_queue_get_config_reply.packet
+++ b/ryu/tests/packet_data/of12/3-36-ofp_queue_get_config_reply.packet
diff --git a/tests/packet_data/of12/3-37-ofp_queue_stats_request.packet b/ryu/tests/packet_data/of12/3-37-ofp_queue_stats_request.packet
index 0d274478..0d274478 100644
--- a/tests/packet_data/of12/3-37-ofp_queue_stats_request.packet
+++ b/ryu/tests/packet_data/of12/3-37-ofp_queue_stats_request.packet
diff --git a/tests/packet_data/of12/3-38-ofp_queue_stats_reply.packet b/ryu/tests/packet_data/of12/3-38-ofp_queue_stats_reply.packet
index 72a8af36..72a8af36 100644
--- a/tests/packet_data/of12/3-38-ofp_queue_stats_reply.packet
+++ b/ryu/tests/packet_data/of12/3-38-ofp_queue_stats_reply.packet
diff --git a/tests/packet_data/of12/3-39-ofp_port_status.packet b/ryu/tests/packet_data/of12/3-39-ofp_port_status.packet
index 7e3689ac..7e3689ac 100644
--- a/tests/packet_data/of12/3-39-ofp_port_status.packet
+++ b/ryu/tests/packet_data/of12/3-39-ofp_port_status.packet
diff --git a/tests/packet_data/of12/3-4-ofp_packet_in.packet b/ryu/tests/packet_data/of12/3-4-ofp_packet_in.packet
index 295e4d45..295e4d45 100644
--- a/tests/packet_data/of12/3-4-ofp_packet_in.packet
+++ b/ryu/tests/packet_data/of12/3-4-ofp_packet_in.packet
diff --git a/tests/packet_data/of12/3-40-ofp_flow_removed.packet b/ryu/tests/packet_data/of12/3-40-ofp_flow_removed.packet
index 330e429b..330e429b 100644
--- a/tests/packet_data/of12/3-40-ofp_flow_removed.packet
+++ b/ryu/tests/packet_data/of12/3-40-ofp_flow_removed.packet
diff --git a/tests/packet_data/of12/3-41-ofp_error_msg_experimenter.packet b/ryu/tests/packet_data/of12/3-41-ofp_error_msg_experimenter.packet
index 4b7c9bf4..4b7c9bf4 100644
--- a/tests/packet_data/of12/3-41-ofp_error_msg_experimenter.packet
+++ b/ryu/tests/packet_data/of12/3-41-ofp_error_msg_experimenter.packet
diff --git a/tests/packet_data/of12/3-5-ofp_features_request.packet b/ryu/tests/packet_data/of12/3-5-ofp_features_request.packet
index 6a81e9b5..6a81e9b5 100644
--- a/tests/packet_data/of12/3-5-ofp_features_request.packet
+++ b/ryu/tests/packet_data/of12/3-5-ofp_features_request.packet
diff --git a/tests/packet_data/of12/3-59-ofp_packet_in.packet b/ryu/tests/packet_data/of12/3-59-ofp_packet_in.packet
index e4a92b2a..e4a92b2a 100644
--- a/tests/packet_data/of12/3-59-ofp_packet_in.packet
+++ b/ryu/tests/packet_data/of12/3-59-ofp_packet_in.packet
diff --git a/tests/packet_data/of12/3-6-ofp_features_reply.packet b/ryu/tests/packet_data/of12/3-6-ofp_features_reply.packet
index 9e6128dc..9e6128dc 100644
--- a/tests/packet_data/of12/3-6-ofp_features_reply.packet
+++ b/ryu/tests/packet_data/of12/3-6-ofp_features_reply.packet
diff --git a/tests/packet_data/of12/3-60-ofp_flow_mod.packet b/ryu/tests/packet_data/of12/3-60-ofp_flow_mod.packet
index 13566ebe..13566ebe 100644
--- a/tests/packet_data/of12/3-60-ofp_flow_mod.packet
+++ b/ryu/tests/packet_data/of12/3-60-ofp_flow_mod.packet
diff --git a/tests/packet_data/of12/3-61-ofp_group_stats_request.packet b/ryu/tests/packet_data/of12/3-61-ofp_group_stats_request.packet
index 523f4f13..523f4f13 100644
--- a/tests/packet_data/of12/3-61-ofp_group_stats_request.packet
+++ b/ryu/tests/packet_data/of12/3-61-ofp_group_stats_request.packet
diff --git a/tests/packet_data/of12/3-62-ofp_group_stats_reply.packet b/ryu/tests/packet_data/of12/3-62-ofp_group_stats_reply.packet
index 33a5c52c..33a5c52c 100644
--- a/tests/packet_data/of12/3-62-ofp_group_stats_reply.packet
+++ b/ryu/tests/packet_data/of12/3-62-ofp_group_stats_reply.packet
diff --git a/tests/packet_data/of12/3-7-ofp_set_config.packet b/ryu/tests/packet_data/of12/3-7-ofp_set_config.packet
index 77e2d785..77e2d785 100644
--- a/tests/packet_data/of12/3-7-ofp_set_config.packet
+++ b/ryu/tests/packet_data/of12/3-7-ofp_set_config.packet
diff --git a/tests/packet_data/of12/3-8-ofp_get_config_request.packet b/ryu/tests/packet_data/of12/3-8-ofp_get_config_request.packet
index ba897a54..ba897a54 100644
--- a/tests/packet_data/of12/3-8-ofp_get_config_request.packet
+++ b/ryu/tests/packet_data/of12/3-8-ofp_get_config_request.packet
diff --git a/tests/packet_data/of12/3-9-ofp_get_config_reply.packet b/ryu/tests/packet_data/of12/3-9-ofp_get_config_reply.packet
index ebaf895b..ebaf895b 100644
--- a/tests/packet_data/of12/3-9-ofp_get_config_reply.packet
+++ b/ryu/tests/packet_data/of12/3-9-ofp_get_config_reply.packet
diff --git a/tests/packet_data/of12/libofproto-OFP12-ofp_packet_out_packet_library.packet b/ryu/tests/packet_data/of12/libofproto-OFP12-ofp_packet_out_packet_library.packet
index a9ebe1ef..a9ebe1ef 100644
--- a/tests/packet_data/of12/libofproto-OFP12-ofp_packet_out_packet_library.packet
+++ b/ryu/tests/packet_data/of12/libofproto-OFP12-ofp_packet_out_packet_library.packet
diff --git a/tests/packet_data/of13/4-0-ofp_desc_reply.packet b/ryu/tests/packet_data/of13/4-0-ofp_desc_reply.packet
index edfaa375..edfaa375 100644
--- a/tests/packet_data/of13/4-0-ofp_desc_reply.packet
+++ b/ryu/tests/packet_data/of13/4-0-ofp_desc_reply.packet
diff --git a/tests/packet_data/of13/4-1-ofp_packet_out.packet b/ryu/tests/packet_data/of13/4-1-ofp_packet_out.packet
index cf6689f8..cf6689f8 100644
--- a/tests/packet_data/of13/4-1-ofp_packet_out.packet
+++ b/ryu/tests/packet_data/of13/4-1-ofp_packet_out.packet
diff --git a/tests/packet_data/of13/4-10-ofp_hello.packet b/ryu/tests/packet_data/of13/4-10-ofp_hello.packet
index 644b4130..644b4130 100644
--- a/tests/packet_data/of13/4-10-ofp_hello.packet
+++ b/ryu/tests/packet_data/of13/4-10-ofp_hello.packet
diff --git a/tests/packet_data/of13/4-11-ofp_flow_stats_request.packet b/ryu/tests/packet_data/of13/4-11-ofp_flow_stats_request.packet
index 6b9e0a90..6b9e0a90 100644
--- a/tests/packet_data/of13/4-11-ofp_flow_stats_request.packet
+++ b/ryu/tests/packet_data/of13/4-11-ofp_flow_stats_request.packet
diff --git a/tests/packet_data/of13/4-12-ofp_flow_stats_reply.packet b/ryu/tests/packet_data/of13/4-12-ofp_flow_stats_reply.packet
index c7c1ac88..c7c1ac88 100644
--- a/tests/packet_data/of13/4-12-ofp_flow_stats_reply.packet
+++ b/ryu/tests/packet_data/of13/4-12-ofp_flow_stats_reply.packet
diff --git a/tests/packet_data/of13/4-13-ofp_echo_request.packet b/ryu/tests/packet_data/of13/4-13-ofp_echo_request.packet
index d8d8bc42..d8d8bc42 100644
--- a/tests/packet_data/of13/4-13-ofp_echo_request.packet
+++ b/ryu/tests/packet_data/of13/4-13-ofp_echo_request.packet
diff --git a/tests/packet_data/of13/4-14-ofp_echo_reply.packet b/ryu/tests/packet_data/of13/4-14-ofp_echo_reply.packet
index 2ac9c0d5..2ac9c0d5 100644
--- a/tests/packet_data/of13/4-14-ofp_echo_reply.packet
+++ b/ryu/tests/packet_data/of13/4-14-ofp_echo_reply.packet
diff --git a/tests/packet_data/of13/4-15-ofp_error_msg.packet b/ryu/tests/packet_data/of13/4-15-ofp_error_msg.packet
index 196dad1e..196dad1e 100644
--- a/tests/packet_data/of13/4-15-ofp_error_msg.packet
+++ b/ryu/tests/packet_data/of13/4-15-ofp_error_msg.packet
diff --git a/tests/packet_data/of13/4-16-ofp_experimenter.packet b/ryu/tests/packet_data/of13/4-16-ofp_experimenter.packet
index 0b6e2dd2..0b6e2dd2 100644
--- a/tests/packet_data/of13/4-16-ofp_experimenter.packet
+++ b/ryu/tests/packet_data/of13/4-16-ofp_experimenter.packet
diff --git a/tests/packet_data/of13/4-17-ofp_barrier_request.packet b/ryu/tests/packet_data/of13/4-17-ofp_barrier_request.packet
index 4acb2096..4acb2096 100644
--- a/tests/packet_data/of13/4-17-ofp_barrier_request.packet
+++ b/ryu/tests/packet_data/of13/4-17-ofp_barrier_request.packet
diff --git a/tests/packet_data/of13/4-18-ofp_barrier_reply.packet b/ryu/tests/packet_data/of13/4-18-ofp_barrier_reply.packet
index 04376c07..04376c07 100644
--- a/tests/packet_data/of13/4-18-ofp_barrier_reply.packet
+++ b/ryu/tests/packet_data/of13/4-18-ofp_barrier_reply.packet
diff --git a/tests/packet_data/of13/4-19-ofp_role_request.packet b/ryu/tests/packet_data/of13/4-19-ofp_role_request.packet
index e2f3b381..e2f3b381 100644
--- a/tests/packet_data/of13/4-19-ofp_role_request.packet
+++ b/ryu/tests/packet_data/of13/4-19-ofp_role_request.packet
diff --git a/tests/packet_data/of13/4-2-ofp_flow_mod.packet b/ryu/tests/packet_data/of13/4-2-ofp_flow_mod.packet
index 0c2029bd..0c2029bd 100644
--- a/tests/packet_data/of13/4-2-ofp_flow_mod.packet
+++ b/ryu/tests/packet_data/of13/4-2-ofp_flow_mod.packet
diff --git a/tests/packet_data/of13/4-20-ofp_role_reply.packet b/ryu/tests/packet_data/of13/4-20-ofp_role_reply.packet
index 3f5ba399..3f5ba399 100644
--- a/tests/packet_data/of13/4-20-ofp_role_reply.packet
+++ b/ryu/tests/packet_data/of13/4-20-ofp_role_reply.packet
diff --git a/tests/packet_data/of13/4-21-ofp_group_mod.packet b/ryu/tests/packet_data/of13/4-21-ofp_group_mod.packet
index 39554777..39554777 100644
--- a/tests/packet_data/of13/4-21-ofp_group_mod.packet
+++ b/ryu/tests/packet_data/of13/4-21-ofp_group_mod.packet
diff --git a/tests/packet_data/of13/4-22-ofp_port_mod.packet b/ryu/tests/packet_data/of13/4-22-ofp_port_mod.packet
index be7044e1..be7044e1 100644
--- a/tests/packet_data/of13/4-22-ofp_port_mod.packet
+++ b/ryu/tests/packet_data/of13/4-22-ofp_port_mod.packet
diff --git a/tests/packet_data/of13/4-23-ofp_table_mod.packet b/ryu/tests/packet_data/of13/4-23-ofp_table_mod.packet
index 02b8b020..02b8b020 100644
--- a/tests/packet_data/of13/4-23-ofp_table_mod.packet
+++ b/ryu/tests/packet_data/of13/4-23-ofp_table_mod.packet
diff --git a/tests/packet_data/of13/4-24-ofp_desc_request.packet b/ryu/tests/packet_data/of13/4-24-ofp_desc_request.packet
index b6de0577..b6de0577 100644
--- a/tests/packet_data/of13/4-24-ofp_desc_request.packet
+++ b/ryu/tests/packet_data/of13/4-24-ofp_desc_request.packet
diff --git a/tests/packet_data/of13/4-25-ofp_aggregate_stats_request.packet b/ryu/tests/packet_data/of13/4-25-ofp_aggregate_stats_request.packet
index 645ddacf..645ddacf 100644
--- a/tests/packet_data/of13/4-25-ofp_aggregate_stats_request.packet
+++ b/ryu/tests/packet_data/of13/4-25-ofp_aggregate_stats_request.packet
diff --git a/tests/packet_data/of13/4-26-ofp_aggregate_stats_reply.packet b/ryu/tests/packet_data/of13/4-26-ofp_aggregate_stats_reply.packet
index 3d5cd801..3d5cd801 100644
--- a/tests/packet_data/of13/4-26-ofp_aggregate_stats_reply.packet
+++ b/ryu/tests/packet_data/of13/4-26-ofp_aggregate_stats_reply.packet
diff --git a/tests/packet_data/of13/4-27-ofp_table_stats_request.packet b/ryu/tests/packet_data/of13/4-27-ofp_table_stats_request.packet
index 6fec06a4..6fec06a4 100644
--- a/tests/packet_data/of13/4-27-ofp_table_stats_request.packet
+++ b/ryu/tests/packet_data/of13/4-27-ofp_table_stats_request.packet
diff --git a/tests/packet_data/of13/4-28-ofp_table_stats_reply.packet b/ryu/tests/packet_data/of13/4-28-ofp_table_stats_reply.packet
index 1da72ab0..1da72ab0 100644
--- a/tests/packet_data/of13/4-28-ofp_table_stats_reply.packet
+++ b/ryu/tests/packet_data/of13/4-28-ofp_table_stats_reply.packet
diff --git a/tests/packet_data/of13/4-29-ofp_port_stats_request.packet b/ryu/tests/packet_data/of13/4-29-ofp_port_stats_request.packet
index d1116401..d1116401 100644
--- a/tests/packet_data/of13/4-29-ofp_port_stats_request.packet
+++ b/ryu/tests/packet_data/of13/4-29-ofp_port_stats_request.packet
diff --git a/tests/packet_data/of13/4-3-ofp_flow_mod.packet b/ryu/tests/packet_data/of13/4-3-ofp_flow_mod.packet
index 8952a5be..8952a5be 100644
--- a/tests/packet_data/of13/4-3-ofp_flow_mod.packet
+++ b/ryu/tests/packet_data/of13/4-3-ofp_flow_mod.packet
diff --git a/tests/packet_data/of13/4-30-ofp_port_stats_reply.packet b/ryu/tests/packet_data/of13/4-30-ofp_port_stats_reply.packet
index 8b8c182c..8b8c182c 100644
--- a/tests/packet_data/of13/4-30-ofp_port_stats_reply.packet
+++ b/ryu/tests/packet_data/of13/4-30-ofp_port_stats_reply.packet
diff --git a/tests/packet_data/of13/4-31-ofp_group_features_request.packet b/ryu/tests/packet_data/of13/4-31-ofp_group_features_request.packet
index 2175bb52..2175bb52 100644
--- a/tests/packet_data/of13/4-31-ofp_group_features_request.packet
+++ b/ryu/tests/packet_data/of13/4-31-ofp_group_features_request.packet
diff --git a/tests/packet_data/of13/4-32-ofp_group_features_reply.packet b/ryu/tests/packet_data/of13/4-32-ofp_group_features_reply.packet
index 6f7715cd..6f7715cd 100644
--- a/tests/packet_data/of13/4-32-ofp_group_features_reply.packet
+++ b/ryu/tests/packet_data/of13/4-32-ofp_group_features_reply.packet
diff --git a/tests/packet_data/of13/4-33-ofp_group_desc_request.packet b/ryu/tests/packet_data/of13/4-33-ofp_group_desc_request.packet
index 35add41d..35add41d 100644
--- a/tests/packet_data/of13/4-33-ofp_group_desc_request.packet
+++ b/ryu/tests/packet_data/of13/4-33-ofp_group_desc_request.packet
diff --git a/tests/packet_data/of13/4-34-ofp_group_desc_reply.packet b/ryu/tests/packet_data/of13/4-34-ofp_group_desc_reply.packet
index f3796cc1..f3796cc1 100644
--- a/tests/packet_data/of13/4-34-ofp_group_desc_reply.packet
+++ b/ryu/tests/packet_data/of13/4-34-ofp_group_desc_reply.packet
diff --git a/tests/packet_data/of13/4-35-ofp_queue_get_config_request.packet b/ryu/tests/packet_data/of13/4-35-ofp_queue_get_config_request.packet
index 13072c85..13072c85 100644
--- a/tests/packet_data/of13/4-35-ofp_queue_get_config_request.packet
+++ b/ryu/tests/packet_data/of13/4-35-ofp_queue_get_config_request.packet
diff --git a/tests/packet_data/of13/4-36-ofp_queue_get_config_reply.packet b/ryu/tests/packet_data/of13/4-36-ofp_queue_get_config_reply.packet
index 898f0b3f..898f0b3f 100644
--- a/tests/packet_data/of13/4-36-ofp_queue_get_config_reply.packet
+++ b/ryu/tests/packet_data/of13/4-36-ofp_queue_get_config_reply.packet
diff --git a/tests/packet_data/of13/4-37-ofp_queue_stats_request.packet b/ryu/tests/packet_data/of13/4-37-ofp_queue_stats_request.packet
index 4baf6d70..4baf6d70 100644
--- a/tests/packet_data/of13/4-37-ofp_queue_stats_request.packet
+++ b/ryu/tests/packet_data/of13/4-37-ofp_queue_stats_request.packet
diff --git a/tests/packet_data/of13/4-38-ofp_queue_stats_reply.packet b/ryu/tests/packet_data/of13/4-38-ofp_queue_stats_reply.packet
index ad6d1971..ad6d1971 100644
--- a/tests/packet_data/of13/4-38-ofp_queue_stats_reply.packet
+++ b/ryu/tests/packet_data/of13/4-38-ofp_queue_stats_reply.packet
diff --git a/tests/packet_data/of13/4-39-ofp_port_status.packet b/ryu/tests/packet_data/of13/4-39-ofp_port_status.packet
index 63280c7d..63280c7d 100644
--- a/tests/packet_data/of13/4-39-ofp_port_status.packet
+++ b/ryu/tests/packet_data/of13/4-39-ofp_port_status.packet
diff --git a/tests/packet_data/of13/4-4-ofp_packet_in.packet b/ryu/tests/packet_data/of13/4-4-ofp_packet_in.packet
index ebd12b51..ebd12b51 100644
--- a/tests/packet_data/of13/4-4-ofp_packet_in.packet
+++ b/ryu/tests/packet_data/of13/4-4-ofp_packet_in.packet
diff --git a/tests/packet_data/of13/4-40-ofp_flow_removed.packet b/ryu/tests/packet_data/of13/4-40-ofp_flow_removed.packet
index 677c2c4a..677c2c4a 100644
--- a/tests/packet_data/of13/4-40-ofp_flow_removed.packet
+++ b/ryu/tests/packet_data/of13/4-40-ofp_flow_removed.packet
diff --git a/tests/packet_data/of13/4-41-ofp_error_msg_experimenter.packet b/ryu/tests/packet_data/of13/4-41-ofp_error_msg_experimenter.packet
index 6d866b9a..6d866b9a 100644
--- a/tests/packet_data/of13/4-41-ofp_error_msg_experimenter.packet
+++ b/ryu/tests/packet_data/of13/4-41-ofp_error_msg_experimenter.packet
diff --git a/tests/packet_data/of13/4-42-ofp_get_async_request.packet b/ryu/tests/packet_data/of13/4-42-ofp_get_async_request.packet
index 4bffb26f..4bffb26f 100644
--- a/tests/packet_data/of13/4-42-ofp_get_async_request.packet
+++ b/ryu/tests/packet_data/of13/4-42-ofp_get_async_request.packet
diff --git a/tests/packet_data/of13/4-43-ofp_get_async_reply.packet b/ryu/tests/packet_data/of13/4-43-ofp_get_async_reply.packet
index 39897a94..39897a94 100644
--- a/tests/packet_data/of13/4-43-ofp_get_async_reply.packet
+++ b/ryu/tests/packet_data/of13/4-43-ofp_get_async_reply.packet
diff --git a/tests/packet_data/of13/4-44-ofp_set_async.packet b/ryu/tests/packet_data/of13/4-44-ofp_set_async.packet
index de0aa1a4..de0aa1a4 100644
--- a/tests/packet_data/of13/4-44-ofp_set_async.packet
+++ b/ryu/tests/packet_data/of13/4-44-ofp_set_async.packet
diff --git a/tests/packet_data/of13/4-45-ofp_meter_mod.packet b/ryu/tests/packet_data/of13/4-45-ofp_meter_mod.packet
index 1ffbcf7e..1ffbcf7e 100644
--- a/tests/packet_data/of13/4-45-ofp_meter_mod.packet
+++ b/ryu/tests/packet_data/of13/4-45-ofp_meter_mod.packet
diff --git a/tests/packet_data/of13/4-46-ofp_flow_mod.packet b/ryu/tests/packet_data/of13/4-46-ofp_flow_mod.packet
index 496f1da0..496f1da0 100644
--- a/tests/packet_data/of13/4-46-ofp_flow_mod.packet
+++ b/ryu/tests/packet_data/of13/4-46-ofp_flow_mod.packet
diff --git a/tests/packet_data/of13/4-47-ofp_meter_config_request.packet b/ryu/tests/packet_data/of13/4-47-ofp_meter_config_request.packet
index 21a11e10..21a11e10 100644
--- a/tests/packet_data/of13/4-47-ofp_meter_config_request.packet
+++ b/ryu/tests/packet_data/of13/4-47-ofp_meter_config_request.packet
diff --git a/tests/packet_data/of13/4-48-ofp_meter_config_reply.packet b/ryu/tests/packet_data/of13/4-48-ofp_meter_config_reply.packet
index 3f443269..3f443269 100644
--- a/tests/packet_data/of13/4-48-ofp_meter_config_reply.packet
+++ b/ryu/tests/packet_data/of13/4-48-ofp_meter_config_reply.packet
diff --git a/tests/packet_data/of13/4-49-ofp_meter_stats_request.packet b/ryu/tests/packet_data/of13/4-49-ofp_meter_stats_request.packet
index 3b321aff..3b321aff 100644
--- a/tests/packet_data/of13/4-49-ofp_meter_stats_request.packet
+++ b/ryu/tests/packet_data/of13/4-49-ofp_meter_stats_request.packet
diff --git a/tests/packet_data/of13/4-5-ofp_features_request.packet b/ryu/tests/packet_data/of13/4-5-ofp_features_request.packet
index 7bb2775a..7bb2775a 100644
--- a/tests/packet_data/of13/4-5-ofp_features_request.packet
+++ b/ryu/tests/packet_data/of13/4-5-ofp_features_request.packet
diff --git a/tests/packet_data/of13/4-50-ofp_meter_stats_reply.packet b/ryu/tests/packet_data/of13/4-50-ofp_meter_stats_reply.packet
index 2317fc55..2317fc55 100644
--- a/tests/packet_data/of13/4-50-ofp_meter_stats_reply.packet
+++ b/ryu/tests/packet_data/of13/4-50-ofp_meter_stats_reply.packet
diff --git a/tests/packet_data/of13/4-51-ofp_meter_features_request.packet b/ryu/tests/packet_data/of13/4-51-ofp_meter_features_request.packet
index c4007bfb..c4007bfb 100644
--- a/tests/packet_data/of13/4-51-ofp_meter_features_request.packet
+++ b/ryu/tests/packet_data/of13/4-51-ofp_meter_features_request.packet
diff --git a/tests/packet_data/of13/4-52-ofp_meter_features_reply.packet b/ryu/tests/packet_data/of13/4-52-ofp_meter_features_reply.packet
index fd9e3808..fd9e3808 100644
--- a/tests/packet_data/of13/4-52-ofp_meter_features_reply.packet
+++ b/ryu/tests/packet_data/of13/4-52-ofp_meter_features_reply.packet
diff --git a/tests/packet_data/of13/4-53-ofp_port_desc_request.packet b/ryu/tests/packet_data/of13/4-53-ofp_port_desc_request.packet
index 0d859f1d..0d859f1d 100644
--- a/tests/packet_data/of13/4-53-ofp_port_desc_request.packet
+++ b/ryu/tests/packet_data/of13/4-53-ofp_port_desc_request.packet
diff --git a/tests/packet_data/of13/4-54-ofp_port_desc_reply.packet b/ryu/tests/packet_data/of13/4-54-ofp_port_desc_reply.packet
index e30e9ae1..e30e9ae1 100644
--- a/tests/packet_data/of13/4-54-ofp_port_desc_reply.packet
+++ b/ryu/tests/packet_data/of13/4-54-ofp_port_desc_reply.packet
diff --git a/tests/packet_data/of13/4-55-ofp_table_features_request.packet b/ryu/tests/packet_data/of13/4-55-ofp_table_features_request.packet
index 52b9d3b1..52b9d3b1 100644
--- a/tests/packet_data/of13/4-55-ofp_table_features_request.packet
+++ b/ryu/tests/packet_data/of13/4-55-ofp_table_features_request.packet
diff --git a/tests/packet_data/of13/4-56-ofp_table_features_reply.packet b/ryu/tests/packet_data/of13/4-56-ofp_table_features_reply.packet
index 3a467f42..3a467f42 100644
--- a/tests/packet_data/of13/4-56-ofp_table_features_reply.packet
+++ b/ryu/tests/packet_data/of13/4-56-ofp_table_features_reply.packet
diff --git a/tests/packet_data/of13/4-57-ofp_group_stats_request.packet b/ryu/tests/packet_data/of13/4-57-ofp_group_stats_request.packet
index f59329e0..f59329e0 100644
--- a/tests/packet_data/of13/4-57-ofp_group_stats_request.packet
+++ b/ryu/tests/packet_data/of13/4-57-ofp_group_stats_request.packet
diff --git a/tests/packet_data/of13/4-58-ofp_group_stats_reply.packet b/ryu/tests/packet_data/of13/4-58-ofp_group_stats_reply.packet
index fe5a549a..fe5a549a 100644
--- a/tests/packet_data/of13/4-58-ofp_group_stats_reply.packet
+++ b/ryu/tests/packet_data/of13/4-58-ofp_group_stats_reply.packet
diff --git a/tests/packet_data/of13/4-59-ofp_packet_in.packet b/ryu/tests/packet_data/of13/4-59-ofp_packet_in.packet
index f0879a37..f0879a37 100644
--- a/tests/packet_data/of13/4-59-ofp_packet_in.packet
+++ b/ryu/tests/packet_data/of13/4-59-ofp_packet_in.packet
diff --git a/tests/packet_data/of13/4-6-ofp_features_reply.packet b/ryu/tests/packet_data/of13/4-6-ofp_features_reply.packet
index a9536330..a9536330 100644
--- a/tests/packet_data/of13/4-6-ofp_features_reply.packet
+++ b/ryu/tests/packet_data/of13/4-6-ofp_features_reply.packet
diff --git a/tests/packet_data/of13/4-60-ofp_flow_mod.packet b/ryu/tests/packet_data/of13/4-60-ofp_flow_mod.packet
index 0ca98351..0ca98351 100644
--- a/tests/packet_data/of13/4-60-ofp_flow_mod.packet
+++ b/ryu/tests/packet_data/of13/4-60-ofp_flow_mod.packet
diff --git a/tests/packet_data/of13/4-61-ofp_experimenter_request.packet b/ryu/tests/packet_data/of13/4-61-ofp_experimenter_request.packet
index 2ee17648..2ee17648 100644
--- a/tests/packet_data/of13/4-61-ofp_experimenter_request.packet
+++ b/ryu/tests/packet_data/of13/4-61-ofp_experimenter_request.packet
diff --git a/tests/packet_data/of13/4-62-ofp_experimenter_reply.packet b/ryu/tests/packet_data/of13/4-62-ofp_experimenter_reply.packet
index 1f826829..1f826829 100644
--- a/tests/packet_data/of13/4-62-ofp_experimenter_reply.packet
+++ b/ryu/tests/packet_data/of13/4-62-ofp_experimenter_reply.packet
diff --git a/tests/packet_data/of13/4-63-onf_flow_monitor_request.packet b/ryu/tests/packet_data/of13/4-63-onf_flow_monitor_request.packet
index bf6d50e1..bf6d50e1 100644
--- a/tests/packet_data/of13/4-63-onf_flow_monitor_request.packet
+++ b/ryu/tests/packet_data/of13/4-63-onf_flow_monitor_request.packet
diff --git a/tests/packet_data/of13/4-7-ofp_set_config.packet b/ryu/tests/packet_data/of13/4-7-ofp_set_config.packet
index 43602b3e..43602b3e 100644
--- a/tests/packet_data/of13/4-7-ofp_set_config.packet
+++ b/ryu/tests/packet_data/of13/4-7-ofp_set_config.packet
diff --git a/tests/packet_data/of13/4-8-ofp_get_config_request.packet b/ryu/tests/packet_data/of13/4-8-ofp_get_config_request.packet
index 78ad5019..78ad5019 100644
--- a/tests/packet_data/of13/4-8-ofp_get_config_request.packet
+++ b/ryu/tests/packet_data/of13/4-8-ofp_get_config_request.packet
diff --git a/tests/packet_data/of13/4-9-ofp_get_config_reply.packet b/ryu/tests/packet_data/of13/4-9-ofp_get_config_reply.packet
index b23f7bf3..b23f7bf3 100644
--- a/tests/packet_data/of13/4-9-ofp_get_config_reply.packet
+++ b/ryu/tests/packet_data/of13/4-9-ofp_get_config_reply.packet
diff --git a/tests/packet_data/of13/libofproto-OFP13-echo_reply.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-echo_reply.packet
index e54d3802..e54d3802 100644
--- a/tests/packet_data/of13/libofproto-OFP13-echo_reply.packet
+++ b/ryu/tests/packet_data/of13/libofproto-OFP13-echo_reply.packet
diff --git a/tests/packet_data/of13/libofproto-OFP13-echo_request.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-echo_request.packet
index a13c95dd..a13c95dd 100644
--- a/tests/packet_data/of13/libofproto-OFP13-echo_request.packet
+++ b/ryu/tests/packet_data/of13/libofproto-OFP13-echo_request.packet
diff --git a/tests/packet_data/of13/libofproto-OFP13-error_msg.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-error_msg.packet
index 33b43ca1..33b43ca1 100644
--- a/tests/packet_data/of13/libofproto-OFP13-error_msg.packet
+++ b/ryu/tests/packet_data/of13/libofproto-OFP13-error_msg.packet
diff --git a/tests/packet_data/of13/libofproto-OFP13-features_reply.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-features_reply.packet
index 1e5dee82..1e5dee82 100644
--- a/tests/packet_data/of13/libofproto-OFP13-features_reply.packet
+++ b/ryu/tests/packet_data/of13/libofproto-OFP13-features_reply.packet
diff --git a/tests/packet_data/of13/libofproto-OFP13-flow_mod.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-flow_mod.packet
index 8c86982f..8c86982f 100644
--- a/tests/packet_data/of13/libofproto-OFP13-flow_mod.packet
+++ b/ryu/tests/packet_data/of13/libofproto-OFP13-flow_mod.packet
diff --git a/tests/packet_data/of13/libofproto-OFP13-flow_mod.truncated64 b/ryu/tests/packet_data/of13/libofproto-OFP13-flow_mod.truncated64
index e69de29b..e69de29b 100644
--- a/tests/packet_data/of13/libofproto-OFP13-flow_mod.truncated64
+++ b/ryu/tests/packet_data/of13/libofproto-OFP13-flow_mod.truncated64
diff --git a/tests/packet_data/of13/libofproto-OFP13-flow_mod_conjunction.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-flow_mod_conjunction.packet
index e7e0154b..e7e0154b 100644
--- a/tests/packet_data/of13/libofproto-OFP13-flow_mod_conjunction.packet
+++ b/ryu/tests/packet_data/of13/libofproto-OFP13-flow_mod_conjunction.packet
diff --git a/tests/packet_data/of13/libofproto-OFP13-flow_mod_match_conj.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-flow_mod_match_conj.packet
index c377092d..c377092d 100644
--- a/tests/packet_data/of13/libofproto-OFP13-flow_mod_match_conj.packet
+++ b/ryu/tests/packet_data/of13/libofproto-OFP13-flow_mod_match_conj.packet
diff --git a/tests/packet_data/of13/libofproto-OFP13-flow_removed.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-flow_removed.packet
index c98a8f2b..c98a8f2b 100644
--- a/tests/packet_data/of13/libofproto-OFP13-flow_removed.packet
+++ b/ryu/tests/packet_data/of13/libofproto-OFP13-flow_removed.packet
diff --git a/tests/packet_data/of13/libofproto-OFP13-get_config_reply.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-get_config_reply.packet
index b23f7bf3..b23f7bf3 100644
--- a/tests/packet_data/of13/libofproto-OFP13-get_config_reply.packet
+++ b/ryu/tests/packet_data/of13/libofproto-OFP13-get_config_reply.packet
diff --git a/tests/packet_data/of13/libofproto-OFP13-hello.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-hello.packet
index 60b3118a..60b3118a 100644
--- a/tests/packet_data/of13/libofproto-OFP13-hello.packet
+++ b/ryu/tests/packet_data/of13/libofproto-OFP13-hello.packet
diff --git a/tests/packet_data/of13/libofproto-OFP13-meter_mod.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-meter_mod.packet
index 60870dda..60870dda 100644
--- a/tests/packet_data/of13/libofproto-OFP13-meter_mod.packet
+++ b/ryu/tests/packet_data/of13/libofproto-OFP13-meter_mod.packet
diff --git a/tests/packet_data/of13/libofproto-OFP13-ofp_packet_out_packet_library.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-ofp_packet_out_packet_library.packet
index cf6689f8..cf6689f8 100644
--- a/tests/packet_data/of13/libofproto-OFP13-ofp_packet_out_packet_library.packet
+++ b/ryu/tests/packet_data/of13/libofproto-OFP13-ofp_packet_out_packet_library.packet
diff --git a/tests/packet_data/of13/libofproto-OFP13-packet_in.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-packet_in.packet
index 817b51c0..817b51c0 100644
--- a/tests/packet_data/of13/libofproto-OFP13-packet_in.packet
+++ b/ryu/tests/packet_data/of13/libofproto-OFP13-packet_in.packet
diff --git a/tests/packet_data/of13/libofproto-OFP13-port_mod.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-port_mod.packet
index 105a27ee..105a27ee 100644
--- a/tests/packet_data/of13/libofproto-OFP13-port_mod.packet
+++ b/ryu/tests/packet_data/of13/libofproto-OFP13-port_mod.packet
diff --git a/tests/packet_data/of13/libofproto-OFP13-port_status.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-port_status.packet
index 7a2c14c4..7a2c14c4 100644
--- a/tests/packet_data/of13/libofproto-OFP13-port_status.packet
+++ b/ryu/tests/packet_data/of13/libofproto-OFP13-port_status.packet
diff --git a/tests/packet_data/of13/libofproto-OFP13-set_config.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-set_config.packet
index 43602b3e..43602b3e 100644
--- a/tests/packet_data/of13/libofproto-OFP13-set_config.packet
+++ b/ryu/tests/packet_data/of13/libofproto-OFP13-set_config.packet
diff --git a/tests/packet_data/of13/libofproto-OFP13-table_mod.packet b/ryu/tests/packet_data/of13/libofproto-OFP13-table_mod.packet
index 02b8b020..02b8b020 100644
--- a/tests/packet_data/of13/libofproto-OFP13-table_mod.packet
+++ b/ryu/tests/packet_data/of13/libofproto-OFP13-table_mod.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_conjunction.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_conjunction.packet
index ba029b2c..ba029b2c 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-action_conjunction.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_conjunction.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_controller.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_controller.packet
index 8fba9040..8fba9040 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-action_controller.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_controller.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_controller2.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_controller2.packet
index 7e6b046f..7e6b046f 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-action_controller2.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_controller2.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_ct.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct.packet
index 5eb733f9..5eb733f9 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-action_ct.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_ct_exec.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct_exec.packet
index 3f0b3431..3f0b3431 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-action_ct_exec.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct_exec.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_ct_nat.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct_nat.packet
index e210a38c..e210a38c 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-action_ct_nat.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct_nat.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_ct_nat_v6.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct_nat_v6.packet
index 94b2aaa9..94b2aaa9 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-action_ct_nat_v6.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_ct_nat_v6.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_dec_ttl_cnt_ids.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_dec_ttl_cnt_ids.packet
index c4308ccb..c4308ccb 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-action_dec_ttl_cnt_ids.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_dec_ttl_cnt_ids.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_fintimeout.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_fintimeout.packet
index 78c3eab4..78c3eab4 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-action_fintimeout.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_fintimeout.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_learn.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_learn.packet
index 39c71e20..39c71e20 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-action_learn.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_learn.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_note.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_note.packet
index 9a1491c9..9a1491c9 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-action_note.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_note.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_output_trunc.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_output_trunc.packet
index 491cf4c3..491cf4c3 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-action_output_trunc.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_output_trunc.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_resubmit.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_resubmit.packet
index 690b978b..690b978b 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-action_resubmit.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_resubmit.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_sample.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_sample.packet
index c5167ba2..c5167ba2 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-action_sample.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_sample.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_sample2.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_sample2.packet
index 444f094b..444f094b 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-action_sample2.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_sample2.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_stack_pop.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_stack_pop.packet
index d6f99e2c..d6f99e2c 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-action_stack_pop.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_stack_pop.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-action_stack_push.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_stack_push.packet
index e5d38a32..e5d38a32 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-action_stack_push.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-action_stack_push.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-match_conj.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_conj.packet
index 1f9c57cd..1f9c57cd 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-match_conj.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_conj.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-match_load_nx_register.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_load_nx_register.packet
index 03ce7374..03ce7374 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-match_load_nx_register.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_load_nx_register.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-match_move_nx_register.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_move_nx_register.packet
index eb9cf8a6..eb9cf8a6 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-match_move_nx_register.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_move_nx_register.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark.packet
index 46ea0dc9..46ea0dc9 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark.packet
diff --git a/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet
index 26db6b92..26db6b92 100644
--- a/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet
+++ b/ryu/tests/packet_data/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet
diff --git a/tests/packet_data/of14/5-0-ofp_desc_reply.packet b/ryu/tests/packet_data/of14/5-0-ofp_desc_reply.packet
index 8d676ce4..8d676ce4 100644
--- a/tests/packet_data/of14/5-0-ofp_desc_reply.packet
+++ b/ryu/tests/packet_data/of14/5-0-ofp_desc_reply.packet
diff --git a/tests/packet_data/of14/5-1-ofp_packet_out.packet b/ryu/tests/packet_data/of14/5-1-ofp_packet_out.packet
index 207712f1..207712f1 100644
--- a/tests/packet_data/of14/5-1-ofp_packet_out.packet
+++ b/ryu/tests/packet_data/of14/5-1-ofp_packet_out.packet
diff --git a/tests/packet_data/of14/5-10-ofp_hello.packet b/ryu/tests/packet_data/of14/5-10-ofp_hello.packet
index a91b5871..a91b5871 100644
--- a/tests/packet_data/of14/5-10-ofp_hello.packet
+++ b/ryu/tests/packet_data/of14/5-10-ofp_hello.packet
diff --git a/tests/packet_data/of14/5-11-ofp_flow_stats_request.packet b/ryu/tests/packet_data/of14/5-11-ofp_flow_stats_request.packet
index f3ddcb7e..f3ddcb7e 100644
--- a/tests/packet_data/of14/5-11-ofp_flow_stats_request.packet
+++ b/ryu/tests/packet_data/of14/5-11-ofp_flow_stats_request.packet
diff --git a/tests/packet_data/of14/5-12-ofp_flow_stats_reply.packet b/ryu/tests/packet_data/of14/5-12-ofp_flow_stats_reply.packet
index aa6462c5..aa6462c5 100644
--- a/tests/packet_data/of14/5-12-ofp_flow_stats_reply.packet
+++ b/ryu/tests/packet_data/of14/5-12-ofp_flow_stats_reply.packet
diff --git a/tests/packet_data/of14/5-13-ofp_echo_request.packet b/ryu/tests/packet_data/of14/5-13-ofp_echo_request.packet
index b3f04d75..b3f04d75 100644
--- a/tests/packet_data/of14/5-13-ofp_echo_request.packet
+++ b/ryu/tests/packet_data/of14/5-13-ofp_echo_request.packet
diff --git a/tests/packet_data/of14/5-14-ofp_echo_reply.packet b/ryu/tests/packet_data/of14/5-14-ofp_echo_reply.packet
index 74dcf540..74dcf540 100644
--- a/tests/packet_data/of14/5-14-ofp_echo_reply.packet
+++ b/ryu/tests/packet_data/of14/5-14-ofp_echo_reply.packet
diff --git a/tests/packet_data/of14/5-15-ofp_error_msg.packet b/ryu/tests/packet_data/of14/5-15-ofp_error_msg.packet
index a7888dbd..a7888dbd 100644
--- a/tests/packet_data/of14/5-15-ofp_error_msg.packet
+++ b/ryu/tests/packet_data/of14/5-15-ofp_error_msg.packet
diff --git a/tests/packet_data/of14/5-16-ofp_experimenter.packet b/ryu/tests/packet_data/of14/5-16-ofp_experimenter.packet
index 3ccc04a9..3ccc04a9 100644
--- a/tests/packet_data/of14/5-16-ofp_experimenter.packet
+++ b/ryu/tests/packet_data/of14/5-16-ofp_experimenter.packet
diff --git a/tests/packet_data/of14/5-17-ofp_barrier_request.packet b/ryu/tests/packet_data/of14/5-17-ofp_barrier_request.packet
index 7cbd74b9..7cbd74b9 100644
--- a/tests/packet_data/of14/5-17-ofp_barrier_request.packet
+++ b/ryu/tests/packet_data/of14/5-17-ofp_barrier_request.packet
diff --git a/tests/packet_data/of14/5-18-ofp_barrier_reply.packet b/ryu/tests/packet_data/of14/5-18-ofp_barrier_reply.packet
index 16d7a23a..16d7a23a 100644
--- a/tests/packet_data/of14/5-18-ofp_barrier_reply.packet
+++ b/ryu/tests/packet_data/of14/5-18-ofp_barrier_reply.packet
diff --git a/tests/packet_data/of14/5-19-ofp_role_request.packet b/ryu/tests/packet_data/of14/5-19-ofp_role_request.packet
index b6d780be..b6d780be 100644
--- a/tests/packet_data/of14/5-19-ofp_role_request.packet
+++ b/ryu/tests/packet_data/of14/5-19-ofp_role_request.packet
diff --git a/tests/packet_data/of14/5-2-ofp_flow_mod.packet b/ryu/tests/packet_data/of14/5-2-ofp_flow_mod.packet
index f07e8e53..f07e8e53 100644
--- a/tests/packet_data/of14/5-2-ofp_flow_mod.packet
+++ b/ryu/tests/packet_data/of14/5-2-ofp_flow_mod.packet
diff --git a/tests/packet_data/of14/5-20-ofp_role_reply.packet b/ryu/tests/packet_data/of14/5-20-ofp_role_reply.packet
index 3c7f5f74..3c7f5f74 100644
--- a/tests/packet_data/of14/5-20-ofp_role_reply.packet
+++ b/ryu/tests/packet_data/of14/5-20-ofp_role_reply.packet
diff --git a/tests/packet_data/of14/5-21-ofp_group_mod.packet b/ryu/tests/packet_data/of14/5-21-ofp_group_mod.packet
index 63f6efbb..63f6efbb 100644
--- a/tests/packet_data/of14/5-21-ofp_group_mod.packet
+++ b/ryu/tests/packet_data/of14/5-21-ofp_group_mod.packet
diff --git a/tests/packet_data/of14/5-22-ofp_port_mod.packet b/ryu/tests/packet_data/of14/5-22-ofp_port_mod.packet
index 2f733044..2f733044 100644
--- a/tests/packet_data/of14/5-22-ofp_port_mod.packet
+++ b/ryu/tests/packet_data/of14/5-22-ofp_port_mod.packet
diff --git a/tests/packet_data/of14/5-23-ofp_table_mod.packet b/ryu/tests/packet_data/of14/5-23-ofp_table_mod.packet
index 8df2590c..8df2590c 100644
--- a/tests/packet_data/of14/5-23-ofp_table_mod.packet
+++ b/ryu/tests/packet_data/of14/5-23-ofp_table_mod.packet
diff --git a/tests/packet_data/of14/5-24-ofp_desc_request.packet b/ryu/tests/packet_data/of14/5-24-ofp_desc_request.packet
index b6440fba..b6440fba 100644
--- a/tests/packet_data/of14/5-24-ofp_desc_request.packet
+++ b/ryu/tests/packet_data/of14/5-24-ofp_desc_request.packet
diff --git a/tests/packet_data/of14/5-25-ofp_aggregate_stats_request.packet b/ryu/tests/packet_data/of14/5-25-ofp_aggregate_stats_request.packet
index 1adfc206..1adfc206 100644
--- a/tests/packet_data/of14/5-25-ofp_aggregate_stats_request.packet
+++ b/ryu/tests/packet_data/of14/5-25-ofp_aggregate_stats_request.packet
diff --git a/tests/packet_data/of14/5-26-ofp_aggregate_stats_reply.packet b/ryu/tests/packet_data/of14/5-26-ofp_aggregate_stats_reply.packet
index 6e1dcff5..6e1dcff5 100644
--- a/tests/packet_data/of14/5-26-ofp_aggregate_stats_reply.packet
+++ b/ryu/tests/packet_data/of14/5-26-ofp_aggregate_stats_reply.packet
diff --git a/tests/packet_data/of14/5-27-ofp_table_stats_request.packet b/ryu/tests/packet_data/of14/5-27-ofp_table_stats_request.packet
index 909fd9e9..909fd9e9 100644
--- a/tests/packet_data/of14/5-27-ofp_table_stats_request.packet
+++ b/ryu/tests/packet_data/of14/5-27-ofp_table_stats_request.packet
diff --git a/tests/packet_data/of14/5-28-ofp_table_stats_reply.packet b/ryu/tests/packet_data/of14/5-28-ofp_table_stats_reply.packet
index 66234198..66234198 100644
--- a/tests/packet_data/of14/5-28-ofp_table_stats_reply.packet
+++ b/ryu/tests/packet_data/of14/5-28-ofp_table_stats_reply.packet
diff --git a/tests/packet_data/of14/5-29-ofp_port_stats_request.packet b/ryu/tests/packet_data/of14/5-29-ofp_port_stats_request.packet
index 86c828f3..86c828f3 100644
--- a/tests/packet_data/of14/5-29-ofp_port_stats_request.packet
+++ b/ryu/tests/packet_data/of14/5-29-ofp_port_stats_request.packet
diff --git a/tests/packet_data/of14/5-3-ofp_flow_mod.packet b/ryu/tests/packet_data/of14/5-3-ofp_flow_mod.packet
index 130f8d14..130f8d14 100644
--- a/tests/packet_data/of14/5-3-ofp_flow_mod.packet
+++ b/ryu/tests/packet_data/of14/5-3-ofp_flow_mod.packet
diff --git a/tests/packet_data/of14/5-30-ofp_port_stats_reply.packet b/ryu/tests/packet_data/of14/5-30-ofp_port_stats_reply.packet
index 0fd4fea9..0fd4fea9 100644
--- a/tests/packet_data/of14/5-30-ofp_port_stats_reply.packet
+++ b/ryu/tests/packet_data/of14/5-30-ofp_port_stats_reply.packet
diff --git a/tests/packet_data/of14/5-31-ofp_group_features_request.packet b/ryu/tests/packet_data/of14/5-31-ofp_group_features_request.packet
index 8bd123d0..8bd123d0 100644
--- a/tests/packet_data/of14/5-31-ofp_group_features_request.packet
+++ b/ryu/tests/packet_data/of14/5-31-ofp_group_features_request.packet
diff --git a/tests/packet_data/of14/5-32-ofp_group_features_reply.packet b/ryu/tests/packet_data/of14/5-32-ofp_group_features_reply.packet
index 909b7fa4..909b7fa4 100644
--- a/tests/packet_data/of14/5-32-ofp_group_features_reply.packet
+++ b/ryu/tests/packet_data/of14/5-32-ofp_group_features_reply.packet
diff --git a/tests/packet_data/of14/5-33-ofp_group_desc_request.packet b/ryu/tests/packet_data/of14/5-33-ofp_group_desc_request.packet
index 2a86948f..2a86948f 100644
--- a/tests/packet_data/of14/5-33-ofp_group_desc_request.packet
+++ b/ryu/tests/packet_data/of14/5-33-ofp_group_desc_request.packet
diff --git a/tests/packet_data/of14/5-34-ofp_group_desc_reply.packet b/ryu/tests/packet_data/of14/5-34-ofp_group_desc_reply.packet
index 9b00061a..9b00061a 100644
--- a/tests/packet_data/of14/5-34-ofp_group_desc_reply.packet
+++ b/ryu/tests/packet_data/of14/5-34-ofp_group_desc_reply.packet
diff --git a/tests/packet_data/of14/5-35-ofp_queue_stats_request.packet b/ryu/tests/packet_data/of14/5-35-ofp_queue_stats_request.packet
index 7c52c9b4..7c52c9b4 100644
--- a/tests/packet_data/of14/5-35-ofp_queue_stats_request.packet
+++ b/ryu/tests/packet_data/of14/5-35-ofp_queue_stats_request.packet
diff --git a/tests/packet_data/of14/5-36-ofp_queue_stats_reply.packet b/ryu/tests/packet_data/of14/5-36-ofp_queue_stats_reply.packet
index c0a5dd8c..c0a5dd8c 100644
--- a/tests/packet_data/of14/5-36-ofp_queue_stats_reply.packet
+++ b/ryu/tests/packet_data/of14/5-36-ofp_queue_stats_reply.packet
diff --git a/tests/packet_data/of14/5-37-ofp_port_status.packet b/ryu/tests/packet_data/of14/5-37-ofp_port_status.packet
index e8c67823..e8c67823 100644
--- a/tests/packet_data/of14/5-37-ofp_port_status.packet
+++ b/ryu/tests/packet_data/of14/5-37-ofp_port_status.packet
diff --git a/tests/packet_data/of14/5-38-ofp_flow_removed.packet b/ryu/tests/packet_data/of14/5-38-ofp_flow_removed.packet
index b8e35600..b8e35600 100644
--- a/tests/packet_data/of14/5-38-ofp_flow_removed.packet
+++ b/ryu/tests/packet_data/of14/5-38-ofp_flow_removed.packet
diff --git a/tests/packet_data/of14/5-39-ofp_error_msg_experimenter.packet b/ryu/tests/packet_data/of14/5-39-ofp_error_msg_experimenter.packet
index fed58222..fed58222 100644
--- a/tests/packet_data/of14/5-39-ofp_error_msg_experimenter.packet
+++ b/ryu/tests/packet_data/of14/5-39-ofp_error_msg_experimenter.packet
diff --git a/tests/packet_data/of14/5-4-ofp_packet_in.packet b/ryu/tests/packet_data/of14/5-4-ofp_packet_in.packet
index 35a91000..35a91000 100644
--- a/tests/packet_data/of14/5-4-ofp_packet_in.packet
+++ b/ryu/tests/packet_data/of14/5-4-ofp_packet_in.packet
diff --git a/tests/packet_data/of14/5-40-ofp_get_async_request.packet b/ryu/tests/packet_data/of14/5-40-ofp_get_async_request.packet
index b6e2c616..b6e2c616 100644
--- a/tests/packet_data/of14/5-40-ofp_get_async_request.packet
+++ b/ryu/tests/packet_data/of14/5-40-ofp_get_async_request.packet
diff --git a/tests/packet_data/of14/5-41-ofp_get_async_reply.packet b/ryu/tests/packet_data/of14/5-41-ofp_get_async_reply.packet
index 01ad90f6..01ad90f6 100644
--- a/tests/packet_data/of14/5-41-ofp_get_async_reply.packet
+++ b/ryu/tests/packet_data/of14/5-41-ofp_get_async_reply.packet
diff --git a/tests/packet_data/of14/5-42-ofp_set_async.packet b/ryu/tests/packet_data/of14/5-42-ofp_set_async.packet
index 0b3facf7..0b3facf7 100644
--- a/tests/packet_data/of14/5-42-ofp_set_async.packet
+++ b/ryu/tests/packet_data/of14/5-42-ofp_set_async.packet
diff --git a/tests/packet_data/of14/5-43-ofp_meter_mod.packet b/ryu/tests/packet_data/of14/5-43-ofp_meter_mod.packet
index 1e488764..1e488764 100644
--- a/tests/packet_data/of14/5-43-ofp_meter_mod.packet
+++ b/ryu/tests/packet_data/of14/5-43-ofp_meter_mod.packet
diff --git a/tests/packet_data/of14/5-44-ofp_flow_mod.packet b/ryu/tests/packet_data/of14/5-44-ofp_flow_mod.packet
index 6f66406d..6f66406d 100644
--- a/tests/packet_data/of14/5-44-ofp_flow_mod.packet
+++ b/ryu/tests/packet_data/of14/5-44-ofp_flow_mod.packet
diff --git a/tests/packet_data/of14/5-45-ofp_meter_config_request.packet b/ryu/tests/packet_data/of14/5-45-ofp_meter_config_request.packet
index af96b87e..af96b87e 100644
--- a/tests/packet_data/of14/5-45-ofp_meter_config_request.packet
+++ b/ryu/tests/packet_data/of14/5-45-ofp_meter_config_request.packet
diff --git a/tests/packet_data/of14/5-46-ofp_meter_config_reply.packet b/ryu/tests/packet_data/of14/5-46-ofp_meter_config_reply.packet
index 9611e8c4..9611e8c4 100644
--- a/tests/packet_data/of14/5-46-ofp_meter_config_reply.packet
+++ b/ryu/tests/packet_data/of14/5-46-ofp_meter_config_reply.packet
diff --git a/tests/packet_data/of14/5-47-ofp_meter_stats_request.packet b/ryu/tests/packet_data/of14/5-47-ofp_meter_stats_request.packet
index 68145074..68145074 100644
--- a/tests/packet_data/of14/5-47-ofp_meter_stats_request.packet
+++ b/ryu/tests/packet_data/of14/5-47-ofp_meter_stats_request.packet
diff --git a/tests/packet_data/of14/5-48-ofp_meter_stats_reply.packet b/ryu/tests/packet_data/of14/5-48-ofp_meter_stats_reply.packet
index b20f1784..b20f1784 100644
--- a/tests/packet_data/of14/5-48-ofp_meter_stats_reply.packet
+++ b/ryu/tests/packet_data/of14/5-48-ofp_meter_stats_reply.packet
diff --git a/tests/packet_data/of14/5-49-ofp_meter_features_request.packet b/ryu/tests/packet_data/of14/5-49-ofp_meter_features_request.packet
index 72b79cf1..72b79cf1 100644
--- a/tests/packet_data/of14/5-49-ofp_meter_features_request.packet
+++ b/ryu/tests/packet_data/of14/5-49-ofp_meter_features_request.packet
diff --git a/tests/packet_data/of14/5-5-ofp_features_request.packet b/ryu/tests/packet_data/of14/5-5-ofp_features_request.packet
index bc360d55..bc360d55 100644
--- a/tests/packet_data/of14/5-5-ofp_features_request.packet
+++ b/ryu/tests/packet_data/of14/5-5-ofp_features_request.packet
diff --git a/tests/packet_data/of14/5-50-ofp_meter_features_reply.packet b/ryu/tests/packet_data/of14/5-50-ofp_meter_features_reply.packet
index 9d138430..9d138430 100644
--- a/tests/packet_data/of14/5-50-ofp_meter_features_reply.packet
+++ b/ryu/tests/packet_data/of14/5-50-ofp_meter_features_reply.packet
diff --git a/tests/packet_data/of14/5-51-ofp_port_desc_request.packet b/ryu/tests/packet_data/of14/5-51-ofp_port_desc_request.packet
index 5aaa40d1..5aaa40d1 100644
--- a/tests/packet_data/of14/5-51-ofp_port_desc_request.packet
+++ b/ryu/tests/packet_data/of14/5-51-ofp_port_desc_request.packet
diff --git a/tests/packet_data/of14/5-52-ofp_port_desc_reply.packet b/ryu/tests/packet_data/of14/5-52-ofp_port_desc_reply.packet
index c844eef3..c844eef3 100644
--- a/tests/packet_data/of14/5-52-ofp_port_desc_reply.packet
+++ b/ryu/tests/packet_data/of14/5-52-ofp_port_desc_reply.packet
diff --git a/tests/packet_data/of14/5-53-ofp_table_features_request.packet b/ryu/tests/packet_data/of14/5-53-ofp_table_features_request.packet
index 7a7317aa..7a7317aa 100644
--- a/tests/packet_data/of14/5-53-ofp_table_features_request.packet
+++ b/ryu/tests/packet_data/of14/5-53-ofp_table_features_request.packet
diff --git a/tests/packet_data/of14/5-54-ofp_table_features_reply.packet b/ryu/tests/packet_data/of14/5-54-ofp_table_features_reply.packet
index 6b622a36..6b622a36 100644
--- a/tests/packet_data/of14/5-54-ofp_table_features_reply.packet
+++ b/ryu/tests/packet_data/of14/5-54-ofp_table_features_reply.packet
diff --git a/tests/packet_data/of14/5-55-ofp_group_stats_request.packet b/ryu/tests/packet_data/of14/5-55-ofp_group_stats_request.packet
index a3ab88c1..a3ab88c1 100644
--- a/tests/packet_data/of14/5-55-ofp_group_stats_request.packet
+++ b/ryu/tests/packet_data/of14/5-55-ofp_group_stats_request.packet
diff --git a/tests/packet_data/of14/5-56-ofp_group_stats_reply.packet b/ryu/tests/packet_data/of14/5-56-ofp_group_stats_reply.packet
index 2a19c4b6..2a19c4b6 100644
--- a/tests/packet_data/of14/5-56-ofp_group_stats_reply.packet
+++ b/ryu/tests/packet_data/of14/5-56-ofp_group_stats_reply.packet
diff --git a/tests/packet_data/of14/5-57-ofp_packet_in.packet b/ryu/tests/packet_data/of14/5-57-ofp_packet_in.packet
index f313389d..f313389d 100644
--- a/tests/packet_data/of14/5-57-ofp_packet_in.packet
+++ b/ryu/tests/packet_data/of14/5-57-ofp_packet_in.packet
diff --git a/tests/packet_data/of14/5-58-ofp_flow_mod.packet b/ryu/tests/packet_data/of14/5-58-ofp_flow_mod.packet
index 456e89ad..456e89ad 100644
--- a/tests/packet_data/of14/5-58-ofp_flow_mod.packet
+++ b/ryu/tests/packet_data/of14/5-58-ofp_flow_mod.packet
diff --git a/tests/packet_data/of14/5-59-ofp_experimenter_request.packet b/ryu/tests/packet_data/of14/5-59-ofp_experimenter_request.packet
index c41652e2..c41652e2 100644
--- a/tests/packet_data/of14/5-59-ofp_experimenter_request.packet
+++ b/ryu/tests/packet_data/of14/5-59-ofp_experimenter_request.packet
diff --git a/tests/packet_data/of14/5-6-ofp_features_reply.packet b/ryu/tests/packet_data/of14/5-6-ofp_features_reply.packet
index 1236be2d..1236be2d 100644
--- a/tests/packet_data/of14/5-6-ofp_features_reply.packet
+++ b/ryu/tests/packet_data/of14/5-6-ofp_features_reply.packet
diff --git a/tests/packet_data/of14/5-60-ofp_experimenter_reply.packet b/ryu/tests/packet_data/of14/5-60-ofp_experimenter_reply.packet
index 4f2bdc6b..4f2bdc6b 100644
--- a/tests/packet_data/of14/5-60-ofp_experimenter_reply.packet
+++ b/ryu/tests/packet_data/of14/5-60-ofp_experimenter_reply.packet
diff --git a/tests/packet_data/of14/5-61-ofp_table_desc_request.packet b/ryu/tests/packet_data/of14/5-61-ofp_table_desc_request.packet
index 5e728623..5e728623 100644
--- a/tests/packet_data/of14/5-61-ofp_table_desc_request.packet
+++ b/ryu/tests/packet_data/of14/5-61-ofp_table_desc_request.packet
diff --git a/tests/packet_data/of14/5-62-ofp_table_desc_reply.packet b/ryu/tests/packet_data/of14/5-62-ofp_table_desc_reply.packet
index 2f7b6e2e..2f7b6e2e 100644
--- a/tests/packet_data/of14/5-62-ofp_table_desc_reply.packet
+++ b/ryu/tests/packet_data/of14/5-62-ofp_table_desc_reply.packet
diff --git a/tests/packet_data/of14/5-63-ofp_queue_desc_request.packet b/ryu/tests/packet_data/of14/5-63-ofp_queue_desc_request.packet
index 78e584d8..78e584d8 100644
--- a/tests/packet_data/of14/5-63-ofp_queue_desc_request.packet
+++ b/ryu/tests/packet_data/of14/5-63-ofp_queue_desc_request.packet
diff --git a/tests/packet_data/of14/5-64-ofp_queue_desc_reply.packet b/ryu/tests/packet_data/of14/5-64-ofp_queue_desc_reply.packet
index d9f6f11b..d9f6f11b 100644
--- a/tests/packet_data/of14/5-64-ofp_queue_desc_reply.packet
+++ b/ryu/tests/packet_data/of14/5-64-ofp_queue_desc_reply.packet
diff --git a/tests/packet_data/of14/5-65-ofp_role_status.packet b/ryu/tests/packet_data/of14/5-65-ofp_role_status.packet
index cd753a30..cd753a30 100644
--- a/tests/packet_data/of14/5-65-ofp_role_status.packet
+++ b/ryu/tests/packet_data/of14/5-65-ofp_role_status.packet
diff --git a/tests/packet_data/of14/5-66-ofp_flow_monitor_request.packet b/ryu/tests/packet_data/of14/5-66-ofp_flow_monitor_request.packet
index 1f8d8598..1f8d8598 100644
--- a/tests/packet_data/of14/5-66-ofp_flow_monitor_request.packet
+++ b/ryu/tests/packet_data/of14/5-66-ofp_flow_monitor_request.packet
diff --git a/tests/packet_data/of14/5-67-ofp_flow_monitor_reply.packet b/ryu/tests/packet_data/of14/5-67-ofp_flow_monitor_reply.packet
index b50fe8f5..b50fe8f5 100644
--- a/tests/packet_data/of14/5-67-ofp_flow_monitor_reply.packet
+++ b/ryu/tests/packet_data/of14/5-67-ofp_flow_monitor_reply.packet
diff --git a/tests/packet_data/of14/5-68-ofp_table_status.packet b/ryu/tests/packet_data/of14/5-68-ofp_table_status.packet
index f630ccc2..f630ccc2 100644
--- a/tests/packet_data/of14/5-68-ofp_table_status.packet
+++ b/ryu/tests/packet_data/of14/5-68-ofp_table_status.packet
diff --git a/tests/packet_data/of14/5-69-ofp_bundle_ctrl_msg.packet b/ryu/tests/packet_data/of14/5-69-ofp_bundle_ctrl_msg.packet
index 8df1e6f8..8df1e6f8 100644
--- a/tests/packet_data/of14/5-69-ofp_bundle_ctrl_msg.packet
+++ b/ryu/tests/packet_data/of14/5-69-ofp_bundle_ctrl_msg.packet
diff --git a/tests/packet_data/of14/5-7-ofp_set_config.packet b/ryu/tests/packet_data/of14/5-7-ofp_set_config.packet
index 0d22cd5a..0d22cd5a 100644
--- a/tests/packet_data/of14/5-7-ofp_set_config.packet
+++ b/ryu/tests/packet_data/of14/5-7-ofp_set_config.packet
diff --git a/tests/packet_data/of14/5-70-ofp_bundle_add_msg.packet b/ryu/tests/packet_data/of14/5-70-ofp_bundle_add_msg.packet
index 5565f8d3..5565f8d3 100644
--- a/tests/packet_data/of14/5-70-ofp_bundle_add_msg.packet
+++ b/ryu/tests/packet_data/of14/5-70-ofp_bundle_add_msg.packet
diff --git a/tests/packet_data/of14/5-71-ofp_requestforward.packet b/ryu/tests/packet_data/of14/5-71-ofp_requestforward.packet
index d06e8b4a..d06e8b4a 100644
--- a/tests/packet_data/of14/5-71-ofp_requestforward.packet
+++ b/ryu/tests/packet_data/of14/5-71-ofp_requestforward.packet
diff --git a/tests/packet_data/of14/5-8-ofp_get_config_request.packet b/ryu/tests/packet_data/of14/5-8-ofp_get_config_request.packet
index 9e930df3..9e930df3 100644
--- a/tests/packet_data/of14/5-8-ofp_get_config_request.packet
+++ b/ryu/tests/packet_data/of14/5-8-ofp_get_config_request.packet
diff --git a/tests/packet_data/of14/5-9-ofp_get_config_reply.packet b/ryu/tests/packet_data/of14/5-9-ofp_get_config_reply.packet
index f63f6c29..f63f6c29 100644
--- a/tests/packet_data/of14/5-9-ofp_get_config_reply.packet
+++ b/ryu/tests/packet_data/of14/5-9-ofp_get_config_reply.packet
diff --git a/tests/packet_data/of14/libofproto-OFP14-ofp_packet_out_packet_library.packet b/ryu/tests/packet_data/of14/libofproto-OFP14-ofp_packet_out_packet_library.packet
index 207712f1..207712f1 100644
--- a/tests/packet_data/of14/libofproto-OFP14-ofp_packet_out_packet_library.packet
+++ b/ryu/tests/packet_data/of14/libofproto-OFP14-ofp_packet_out_packet_library.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-aggregate_stats_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-aggregate_stats_reply.packet
index bbb51918..bbb51918 100644
--- a/tests/packet_data/of15/libofproto-OFP15-aggregate_stats_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-aggregate_stats_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-aggregate_stats_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-aggregate_stats_request.packet
index 5abee5b4..5abee5b4 100644
--- a/tests/packet_data/of15/libofproto-OFP15-aggregate_stats_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-aggregate_stats_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-barrier_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-barrier_reply.packet
index fc15112c..fc15112c 100644
--- a/tests/packet_data/of15/libofproto-OFP15-barrier_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-barrier_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-barrier_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-barrier_request.packet
index cda0a443..cda0a443 100644
--- a/tests/packet_data/of15/libofproto-OFP15-barrier_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-barrier_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-bundle_add.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-bundle_add.packet
index 744af0fd..744af0fd 100644
--- a/tests/packet_data/of15/libofproto-OFP15-bundle_add.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-bundle_add.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-bundle_ctrl.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-bundle_ctrl.packet
index 34b2f3bf..34b2f3bf 100644
--- a/tests/packet_data/of15/libofproto-OFP15-bundle_ctrl.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-bundle_ctrl.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-bundle_features_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-bundle_features_reply.packet
index 450081e6..450081e6 100644
--- a/tests/packet_data/of15/libofproto-OFP15-bundle_features_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-bundle_features_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-bundle_features_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-bundle_features_request.packet
index 8d078ef2..8d078ef2 100644
--- a/tests/packet_data/of15/libofproto-OFP15-bundle_features_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-bundle_features_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-controller_status.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-controller_status.packet
index 9b63794e..9b63794e 100644
--- a/tests/packet_data/of15/libofproto-OFP15-controller_status.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-controller_status.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-controller_status_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-controller_status_reply.packet
index e859f9b0..e859f9b0 100644
--- a/tests/packet_data/of15/libofproto-OFP15-controller_status_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-controller_status_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-controller_status_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-controller_status_request.packet
index 4c741757..4c741757 100644
--- a/tests/packet_data/of15/libofproto-OFP15-controller_status_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-controller_status_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-desc_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-desc_reply.packet
index 261333c4..261333c4 100644
--- a/tests/packet_data/of15/libofproto-OFP15-desc_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-desc_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-desc_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-desc_request.packet
index 11b39877..11b39877 100644
--- a/tests/packet_data/of15/libofproto-OFP15-desc_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-desc_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-echo_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-echo_reply.packet
index 70d03566..70d03566 100644
--- a/tests/packet_data/of15/libofproto-OFP15-echo_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-echo_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-echo_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-echo_request.packet
index a72ee3aa..a72ee3aa 100644
--- a/tests/packet_data/of15/libofproto-OFP15-echo_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-echo_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-error_msg.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-error_msg.packet
index 596762d8..596762d8 100644
--- a/tests/packet_data/of15/libofproto-OFP15-error_msg.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-error_msg.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-error_msg_experimenter.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-error_msg_experimenter.packet
index 3fba70c2..3fba70c2 100644
--- a/tests/packet_data/of15/libofproto-OFP15-error_msg_experimenter.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-error_msg_experimenter.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-experimenter.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-experimenter.packet
index c96393aa..c96393aa 100644
--- a/tests/packet_data/of15/libofproto-OFP15-experimenter.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-experimenter.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-experimenter_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-experimenter_reply.packet
index 9575ae9b..9575ae9b 100644
--- a/tests/packet_data/of15/libofproto-OFP15-experimenter_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-experimenter_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-experimenter_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-experimenter_request.packet
index 739437cb..739437cb 100644
--- a/tests/packet_data/of15/libofproto-OFP15-experimenter_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-experimenter_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-features_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-features_reply.packet
index 6893fd57..6893fd57 100644
--- a/tests/packet_data/of15/libofproto-OFP15-features_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-features_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-features_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-features_request.packet
index 8d7159e5..8d7159e5 100644
--- a/tests/packet_data/of15/libofproto-OFP15-features_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-features_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_desc_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_desc_reply.packet
index 4bf534cf..4bf534cf 100644
--- a/tests/packet_data/of15/libofproto-OFP15-flow_desc_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_desc_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_desc_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_desc_request.packet
index a5a5bc11..a5a5bc11 100644
--- a/tests/packet_data/of15/libofproto-OFP15-flow_desc_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_desc_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_mod.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_mod.packet
index d70a062c..d70a062c 100644
--- a/tests/packet_data/of15/libofproto-OFP15-flow_mod.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_mod.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_mod_conjunction.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_mod_conjunction.packet
index 6fee113a..6fee113a 100644
--- a/tests/packet_data/of15/libofproto-OFP15-flow_mod_conjunction.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_mod_conjunction.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_mod_match_conj.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_mod_match_conj.packet
index 4bc17eef..4bc17eef 100644
--- a/tests/packet_data/of15/libofproto-OFP15-flow_mod_match_conj.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_mod_match_conj.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_monitor_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_monitor_reply.packet
index 94129c1c..94129c1c 100644
--- a/tests/packet_data/of15/libofproto-OFP15-flow_monitor_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_monitor_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_monitor_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_monitor_request.packet
index 203af31f..203af31f 100644
--- a/tests/packet_data/of15/libofproto-OFP15-flow_monitor_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_monitor_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_removed.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_removed.packet
index 1df2b2ed..1df2b2ed 100644
--- a/tests/packet_data/of15/libofproto-OFP15-flow_removed.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_removed.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_stats_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_stats_reply.packet
index 5ca44bbd..5ca44bbd 100644
--- a/tests/packet_data/of15/libofproto-OFP15-flow_stats_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_stats_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-flow_stats_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_stats_request.packet
index 8481a1bb..8481a1bb 100644
--- a/tests/packet_data/of15/libofproto-OFP15-flow_stats_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-flow_stats_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-get_async_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-get_async_reply.packet
index aa14b1e2..aa14b1e2 100644
--- a/tests/packet_data/of15/libofproto-OFP15-get_async_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-get_async_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-get_async_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-get_async_request.packet
index b8672b82..b8672b82 100644
--- a/tests/packet_data/of15/libofproto-OFP15-get_async_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-get_async_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-get_config_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-get_config_reply.packet
index 6e7b6191..6e7b6191 100644
--- a/tests/packet_data/of15/libofproto-OFP15-get_config_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-get_config_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-get_config_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-get_config_request.packet
index 15fc95f0..15fc95f0 100644
--- a/tests/packet_data/of15/libofproto-OFP15-get_config_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-get_config_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-group_desc_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-group_desc_reply.packet
index 6420c149..6420c149 100644
--- a/tests/packet_data/of15/libofproto-OFP15-group_desc_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-group_desc_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-group_desc_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-group_desc_request.packet
index ee6ee7ce..ee6ee7ce 100644
--- a/tests/packet_data/of15/libofproto-OFP15-group_desc_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-group_desc_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-group_features_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-group_features_reply.packet
index 14ddc120..14ddc120 100644
--- a/tests/packet_data/of15/libofproto-OFP15-group_features_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-group_features_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-group_features_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-group_features_request.packet
index 90805651..90805651 100644
--- a/tests/packet_data/of15/libofproto-OFP15-group_features_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-group_features_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-group_mod.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-group_mod.packet
index 65761562..65761562 100644
--- a/tests/packet_data/of15/libofproto-OFP15-group_mod.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-group_mod.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-group_stats_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-group_stats_reply.packet
index 4853628d..4853628d 100644
--- a/tests/packet_data/of15/libofproto-OFP15-group_stats_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-group_stats_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-group_stats_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-group_stats_request.packet
index 3c8dd862..3c8dd862 100644
--- a/tests/packet_data/of15/libofproto-OFP15-group_stats_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-group_stats_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-hello.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-hello.packet
index 3afdec41..3afdec41 100644
--- a/tests/packet_data/of15/libofproto-OFP15-hello.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-hello.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-meter_desc_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_desc_reply.packet
index 026199ae..026199ae 100644
--- a/tests/packet_data/of15/libofproto-OFP15-meter_desc_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_desc_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-meter_desc_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_desc_request.packet
index 3a008900..3a008900 100644
--- a/tests/packet_data/of15/libofproto-OFP15-meter_desc_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_desc_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-meter_features_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_features_reply.packet
index b7e5a935..b7e5a935 100644
--- a/tests/packet_data/of15/libofproto-OFP15-meter_features_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_features_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-meter_features_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_features_request.packet
index d85918df..d85918df 100644
--- a/tests/packet_data/of15/libofproto-OFP15-meter_features_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_features_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-meter_mod.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_mod.packet
index 2f25474f..2f25474f 100644
--- a/tests/packet_data/of15/libofproto-OFP15-meter_mod.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_mod.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-meter_stats_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_stats_reply.packet
index 2db08d65..2db08d65 100644
--- a/tests/packet_data/of15/libofproto-OFP15-meter_stats_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_stats_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-meter_stats_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_stats_request.packet
index 6cec3f59..6cec3f59 100644
--- a/tests/packet_data/of15/libofproto-OFP15-meter_stats_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-meter_stats_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-packet_in.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-packet_in.packet
index 7a6aab01..7a6aab01 100644
--- a/tests/packet_data/of15/libofproto-OFP15-packet_in.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-packet_in.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-packet_out.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-packet_out.packet
index b3569026..b3569026 100644
--- a/tests/packet_data/of15/libofproto-OFP15-packet_out.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-packet_out.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-port_desc_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-port_desc_reply.packet
index c687e5cd..c687e5cd 100644
--- a/tests/packet_data/of15/libofproto-OFP15-port_desc_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-port_desc_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-port_desc_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-port_desc_request.packet
index cf9ecc6e..cf9ecc6e 100644
--- a/tests/packet_data/of15/libofproto-OFP15-port_desc_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-port_desc_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-port_mod.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-port_mod.packet
index 1aab2c48..1aab2c48 100644
--- a/tests/packet_data/of15/libofproto-OFP15-port_mod.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-port_mod.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-port_stats_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-port_stats_reply.packet
index 9d190d01..9d190d01 100644
--- a/tests/packet_data/of15/libofproto-OFP15-port_stats_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-port_stats_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-port_stats_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-port_stats_request.packet
index af7d6892..af7d6892 100644
--- a/tests/packet_data/of15/libofproto-OFP15-port_stats_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-port_stats_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-port_status.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-port_status.packet
index 1d2d5305..1d2d5305 100644
--- a/tests/packet_data/of15/libofproto-OFP15-port_status.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-port_status.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-queue_desc_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-queue_desc_reply.packet
index d8f8e318..d8f8e318 100644
--- a/tests/packet_data/of15/libofproto-OFP15-queue_desc_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-queue_desc_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-queue_desc_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-queue_desc_request.packet
index 960dbeff..960dbeff 100644
--- a/tests/packet_data/of15/libofproto-OFP15-queue_desc_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-queue_desc_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-queue_stats_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-queue_stats_reply.packet
index 11744f90..11744f90 100644
--- a/tests/packet_data/of15/libofproto-OFP15-queue_stats_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-queue_stats_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-queue_stats_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-queue_stats_request.packet
index 416a6185..416a6185 100644
--- a/tests/packet_data/of15/libofproto-OFP15-queue_stats_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-queue_stats_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-requestforward.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-requestforward.packet
index 153a99f2..153a99f2 100644
--- a/tests/packet_data/of15/libofproto-OFP15-requestforward.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-requestforward.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-role_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-role_reply.packet
index c92ba974..c92ba974 100644
--- a/tests/packet_data/of15/libofproto-OFP15-role_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-role_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-role_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-role_request.packet
index 82c99197..82c99197 100644
--- a/tests/packet_data/of15/libofproto-OFP15-role_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-role_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-role_status.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-role_status.packet
index de85d1f8..de85d1f8 100644
--- a/tests/packet_data/of15/libofproto-OFP15-role_status.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-role_status.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-set_async.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-set_async.packet
index 9fbfd415..9fbfd415 100644
--- a/tests/packet_data/of15/libofproto-OFP15-set_async.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-set_async.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-set_config.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-set_config.packet
index eb3ed3dd..eb3ed3dd 100644
--- a/tests/packet_data/of15/libofproto-OFP15-set_config.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-set_config.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-table_desc_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-table_desc_reply.packet
index 4177a743..4177a743 100644
--- a/tests/packet_data/of15/libofproto-OFP15-table_desc_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-table_desc_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-table_desc_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-table_desc_request.packet
index c2a47776..c2a47776 100644
--- a/tests/packet_data/of15/libofproto-OFP15-table_desc_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-table_desc_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-table_features_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-table_features_reply.packet
index ce826483..ce826483 100644
--- a/tests/packet_data/of15/libofproto-OFP15-table_features_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-table_features_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-table_features_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-table_features_request.packet
index 706d8756..706d8756 100644
--- a/tests/packet_data/of15/libofproto-OFP15-table_features_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-table_features_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-table_mod.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-table_mod.packet
index 884fc42b..884fc42b 100644
--- a/tests/packet_data/of15/libofproto-OFP15-table_mod.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-table_mod.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-table_stats_reply.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-table_stats_reply.packet
index 6693467f..6693467f 100644
--- a/tests/packet_data/of15/libofproto-OFP15-table_stats_reply.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-table_stats_reply.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-table_stats_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-table_stats_request.packet
index aae25d76..aae25d76 100644
--- a/tests/packet_data/of15/libofproto-OFP15-table_stats_request.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-table_stats_request.packet
diff --git a/tests/packet_data/of15/libofproto-OFP15-table_status.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-table_status.packet
index 3410d23c..3410d23c 100644
--- a/tests/packet_data/of15/libofproto-OFP15-table_status.packet
+++ b/ryu/tests/packet_data/of15/libofproto-OFP15-table_status.packet
diff --git a/tests/packet_data/pcap/big_endian.pcap b/ryu/tests/packet_data/pcap/big_endian.pcap
index 1387f5dd..1387f5dd 100644
--- a/tests/packet_data/pcap/big_endian.pcap
+++ b/ryu/tests/packet_data/pcap/big_endian.pcap
diff --git a/tests/packet_data/pcap/geneve_unknown.pcap b/ryu/tests/packet_data/pcap/geneve_unknown.pcap
index dc65d944..dc65d944 100644
--- a/tests/packet_data/pcap/geneve_unknown.pcap
+++ b/ryu/tests/packet_data/pcap/geneve_unknown.pcap
diff --git a/tests/packet_data/pcap/gre_full_options.pcap b/ryu/tests/packet_data/pcap/gre_full_options.pcap
index cabf5199..cabf5199 100644
--- a/tests/packet_data/pcap/gre_full_options.pcap
+++ b/ryu/tests/packet_data/pcap/gre_full_options.pcap
diff --git a/tests/packet_data/pcap/gre_no_option.pcap b/ryu/tests/packet_data/pcap/gre_no_option.pcap
index 258126ba..258126ba 100644
--- a/tests/packet_data/pcap/gre_no_option.pcap
+++ b/ryu/tests/packet_data/pcap/gre_no_option.pcap
diff --git a/tests/packet_data/pcap/gre_nvgre_option.pcap b/ryu/tests/packet_data/pcap/gre_nvgre_option.pcap
index fb1b2980..fb1b2980 100644
--- a/tests/packet_data/pcap/gre_nvgre_option.pcap
+++ b/ryu/tests/packet_data/pcap/gre_nvgre_option.pcap
diff --git a/tests/packet_data/pcap/little_endian.pcap b/ryu/tests/packet_data/pcap/little_endian.pcap
index 11072bdd..11072bdd 100644
--- a/tests/packet_data/pcap/little_endian.pcap
+++ b/ryu/tests/packet_data/pcap/little_endian.pcap
diff --git a/tests/packet_data/pcap/openflow_flowmod.pcap b/ryu/tests/packet_data/pcap/openflow_flowmod.pcap
index e72a0425..e72a0425 100644
--- a/tests/packet_data/pcap/openflow_flowmod.pcap
+++ b/ryu/tests/packet_data/pcap/openflow_flowmod.pcap
diff --git a/tests/packet_data/pcap/openflow_flowstats_req.pcap b/ryu/tests/packet_data/pcap/openflow_flowstats_req.pcap
index 7ce270d5..7ce270d5 100644
--- a/tests/packet_data/pcap/openflow_flowstats_req.pcap
+++ b/ryu/tests/packet_data/pcap/openflow_flowstats_req.pcap
diff --git a/tests/packet_data/pcap/openflow_invalid_version.pcap b/ryu/tests/packet_data/pcap/openflow_invalid_version.pcap
index 2c22675b..2c22675b 100644
--- a/tests/packet_data/pcap/openflow_invalid_version.pcap
+++ b/ryu/tests/packet_data/pcap/openflow_invalid_version.pcap
diff --git a/tests/packet_data/pcap/zebra_v2.pcap b/ryu/tests/packet_data/pcap/zebra_v2.pcap
index b5ca677b..b5ca677b 100644
--- a/tests/packet_data/pcap/zebra_v2.pcap
+++ b/ryu/tests/packet_data/pcap/zebra_v2.pcap
diff --git a/tests/packet_data/pcap/zebra_v3.pcap b/ryu/tests/packet_data/pcap/zebra_v3.pcap
index f2e01a91..f2e01a91 100644
--- a/tests/packet_data/pcap/zebra_v3.pcap
+++ b/ryu/tests/packet_data/pcap/zebra_v3.pcap
diff --git a/tests/packet_data_generator/Makefile b/ryu/tests/packet_data_generator/Makefile
index be1e8d85..be1e8d85 100644
--- a/tests/packet_data_generator/Makefile
+++ b/ryu/tests/packet_data_generator/Makefile
diff --git a/tests/packet_data_generator/rebar.config b/ryu/tests/packet_data_generator/rebar.config
index e060319c..e060319c 100644
--- a/tests/packet_data_generator/rebar.config
+++ b/ryu/tests/packet_data_generator/rebar.config
diff --git a/tests/packet_data_generator/src/er.app.src b/ryu/tests/packet_data_generator/src/er.app.src
index 5252b564..5252b564 100644
--- a/tests/packet_data_generator/src/er.app.src
+++ b/ryu/tests/packet_data_generator/src/er.app.src
diff --git a/tests/packet_data_generator/src/x.erl b/ryu/tests/packet_data_generator/src/x.erl
index 1b624e8f..1b624e8f 100644
--- a/tests/packet_data_generator/src/x.erl
+++ b/ryu/tests/packet_data_generator/src/x.erl
diff --git a/tests/packet_data_generator/src/x1.erl b/ryu/tests/packet_data_generator/src/x1.erl
index 6935e021..6935e021 100644
--- a/tests/packet_data_generator/src/x1.erl
+++ b/ryu/tests/packet_data_generator/src/x1.erl
diff --git a/tests/packet_data_generator/src/x3.erl b/ryu/tests/packet_data_generator/src/x3.erl
index 7098fd8d..7098fd8d 100644
--- a/tests/packet_data_generator/src/x3.erl
+++ b/ryu/tests/packet_data_generator/src/x3.erl
diff --git a/tests/packet_data_generator/src/x4.erl b/ryu/tests/packet_data_generator/src/x4.erl
index a749fbc8..a749fbc8 100644
--- a/tests/packet_data_generator/src/x4.erl
+++ b/ryu/tests/packet_data_generator/src/x4.erl
diff --git a/tests/packet_data_generator/src/x5.erl b/ryu/tests/packet_data_generator/src/x5.erl
index c9fa429b..c9fa429b 100644
--- a/tests/packet_data_generator/src/x5.erl
+++ b/ryu/tests/packet_data_generator/src/x5.erl
diff --git a/tests/packet_data_generator/src/x_flower_packet.erl b/ryu/tests/packet_data_generator/src/x_flower_packet.erl
index 5c2e3742..5c2e3742 100644
--- a/tests/packet_data_generator/src/x_flower_packet.erl
+++ b/ryu/tests/packet_data_generator/src/x_flower_packet.erl
diff --git a/tests/packet_data_generator/src/x_of_protocol.erl b/ryu/tests/packet_data_generator/src/x_of_protocol.erl
index 38405dbb..38405dbb 100644
--- a/tests/packet_data_generator/src/x_of_protocol.erl
+++ b/ryu/tests/packet_data_generator/src/x_of_protocol.erl
diff --git a/tests/packet_data_generator2/Makefile.BSD b/ryu/tests/packet_data_generator2/Makefile.BSD
index a6319c42..a6319c42 100644
--- a/tests/packet_data_generator2/Makefile.BSD
+++ b/ryu/tests/packet_data_generator2/Makefile.BSD
diff --git a/tests/packet_data_generator2/Makefile.GNU b/ryu/tests/packet_data_generator2/Makefile.GNU
index 3e037f8e..3e037f8e 100644
--- a/tests/packet_data_generator2/Makefile.GNU
+++ b/ryu/tests/packet_data_generator2/Makefile.GNU
diff --git a/tests/packet_data_generator2/README b/ryu/tests/packet_data_generator2/README
index 8f341709..3ad19301 100644
--- a/tests/packet_data_generator2/README
+++ b/ryu/tests/packet_data_generator2/README
@@ -4,8 +4,8 @@ unit tests [2].  As we have the generated files in the repository,
 you don't need to build this program unless you want to (re-)generate
 the files for some reasons, typically adding new test cases.
 
-[1] tests/packet_data/of*/libofproto-*.packet
-[2] tests.unit.ofproto.test_parser
+[1] ryu/tests/packet_data/of*/libofproto-*.packet
+[2] ryu.tests.unit.ofproto.test_parser
 
 The program requires libofproto library provided by Open vSwitch.
 It's a little tricky to build because Open vSwitch distribution
diff --git a/tests/packet_data_generator2/gen.c b/ryu/tests/packet_data_generator2/gen.c
index dbdcf4c2..dbdcf4c2 100644
--- a/tests/packet_data_generator2/gen.c
+++ b/ryu/tests/packet_data_generator2/gen.c
diff --git a/tests/packet_data_generator3/gen.py b/ryu/tests/packet_data_generator3/gen.py
index 92676e46..92676e46 100644
--- a/tests/packet_data_generator3/gen.py
+++ b/ryu/tests/packet_data_generator3/gen.py
diff --git a/tests/run_tests.py b/ryu/tests/run_tests.py
index 133c7e7e..835e789b 100755
--- a/tests/run_tests.py
+++ b/ryu/tests/run_tests.py
@@ -11,8 +11,8 @@ sys.path.append(os.getcwd())
 sys.path.append(os.path.dirname(__file__))
 
 
-import tests.unit
-from tests.test_lib import run_tests
+import ryu.tests.unit
+from ryu.tests.test_lib import run_tests
 
 
 if __name__ == '__main__':
@@ -29,7 +29,7 @@ if __name__ == '__main__':
                       includeExe=True,
                       traverseNamespace=True,
                       plugins=core.DefaultPluginManager())
-    c.configureWhere(tests.unit.__path__)
+    c.configureWhere(ryu.tests.unit.__path__)
 
     exit_status = run_tests(c)
     sys.exit(exit_status)
diff --git a/tests/test_lib.py b/ryu/tests/test_lib.py
index c1c0f82e..c1c0f82e 100644
--- a/tests/test_lib.py
+++ b/ryu/tests/test_lib.py
diff --git a/tests/unit/__init__.py b/ryu/tests/unit/__init__.py
index de6e5a33..de6e5a33 100644
--- a/tests/unit/__init__.py
+++ b/ryu/tests/unit/__init__.py
diff --git a/tests/integrated/common/__init__.py b/ryu/tests/unit/app/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/integrated/common/__init__.py
+++ b/ryu/tests/unit/app/__init__.py
diff --git a/tests/unit/app/ofctl_rest_json/of10.json b/ryu/tests/unit/app/ofctl_rest_json/of10.json
index 266eb80c..266eb80c 100644
--- a/tests/unit/app/ofctl_rest_json/of10.json
+++ b/ryu/tests/unit/app/ofctl_rest_json/of10.json
diff --git a/tests/unit/app/ofctl_rest_json/of12.json b/ryu/tests/unit/app/ofctl_rest_json/of12.json
index 89a81919..89a81919 100644
--- a/tests/unit/app/ofctl_rest_json/of12.json
+++ b/ryu/tests/unit/app/ofctl_rest_json/of12.json
diff --git a/tests/unit/app/ofctl_rest_json/of13.json b/ryu/tests/unit/app/ofctl_rest_json/of13.json
index d515f628..d515f628 100644
--- a/tests/unit/app/ofctl_rest_json/of13.json
+++ b/ryu/tests/unit/app/ofctl_rest_json/of13.json
diff --git a/tests/unit/app/ofctl_rest_json/of14.json b/ryu/tests/unit/app/ofctl_rest_json/of14.json
index 0cc4eb6c..0cc4eb6c 100644
--- a/tests/unit/app/ofctl_rest_json/of14.json
+++ b/ryu/tests/unit/app/ofctl_rest_json/of14.json
diff --git a/tests/unit/app/ofctl_rest_json/of15.json b/ryu/tests/unit/app/ofctl_rest_json/of15.json
index a7569223..a7569223 100644
--- a/tests/unit/app/ofctl_rest_json/of15.json
+++ b/ryu/tests/unit/app/ofctl_rest_json/of15.json
diff --git a/tests/unit/app/test_ofctl_rest.py b/ryu/tests/unit/app/test_ofctl_rest.py
index 5ed70ec4..5b7a5be7 100644
--- a/tests/unit/app/test_ofctl_rest.py
+++ b/ryu/tests/unit/app/test_ofctl_rest.py
@@ -37,8 +37,7 @@ from ryu.ofproto import ofproto_v1_2
 from ryu.ofproto import ofproto_v1_3
 from ryu.ofproto import ofproto_v1_4
 from ryu.ofproto import ofproto_v1_5
-
-from tests import test_lib
+from ryu.tests import test_lib
 
 
 LOG = logging.getLogger(__name__)
diff --git a/tests/unit/app/test_tester.py b/ryu/tests/unit/app/test_tester.py
index 64657f9e..3bba9867 100644
--- a/tests/unit/app/test_tester.py
+++ b/ryu/tests/unit/app/test_tester.py
@@ -411,7 +411,7 @@ class Test_tester(unittest.TestCase):
 
     def test__normalize_test_json(self):
         self.tests = TestPatterns(
-            "../../ryu/tests/switch/of13/action/00_OUTPUT.json",
+            "../switch/of13/action/00_OUTPUT.json",
             logging.getLogger("test_tester"))
 
         self.tests[SAMPLE_DESC]._normalize_test_json(Test_tester.test_json_1)
diff --git a/tests/unit/app/test_ws_topology.py b/ryu/tests/unit/app/test_ws_topology.py
index 6eaaa0e5..6eaaa0e5 100644
--- a/tests/unit/app/test_ws_topology.py
+++ b/ryu/tests/unit/app/test_ws_topology.py
diff --git a/tests/unit/app/test_wsgi.py b/ryu/tests/unit/app/test_wsgi.py
index bec21ddc..bec21ddc 100644
--- a/tests/unit/app/test_wsgi.py
+++ b/ryu/tests/unit/app/test_wsgi.py
diff --git a/tests/unit/cmd/__init__.py b/ryu/tests/unit/cmd/__init__.py
index ca8ef539..ca8ef539 100644
--- a/tests/unit/cmd/__init__.py
+++ b/ryu/tests/unit/cmd/__init__.py
diff --git a/tests/unit/cmd/dummy_app.py b/ryu/tests/unit/cmd/dummy_app.py
index 6c594298..6c594298 100644
--- a/tests/unit/cmd/dummy_app.py
+++ b/ryu/tests/unit/cmd/dummy_app.py
diff --git a/tests/unit/cmd/dummy_openflow_app.py b/ryu/tests/unit/cmd/dummy_openflow_app.py
index 614febcd..614febcd 100644
--- a/tests/unit/cmd/dummy_openflow_app.py
+++ b/ryu/tests/unit/cmd/dummy_openflow_app.py
diff --git a/tests/unit/cmd/test_manager.py b/ryu/tests/unit/cmd/test_manager.py
index 5127fa52..0f8fb624 100644
--- a/tests/unit/cmd/test_manager.py
+++ b/ryu/tests/unit/cmd/test_manager.py
@@ -63,14 +63,14 @@ class Test_Manager(unittest.TestCase):
         reload(ryu.ofproto.ofproto_protocol)
 
     @mock.patch('sys.argv', new=['ryu-manager', '--verbose',
-                                 'tests.unit.cmd.dummy_app'])
+                                 'ryu.tests.unit.cmd.dummy_app'])
     def test_no_services(self):
         self._reset_globals()
         main()
         self._reset_globals()
 
     @mock.patch('sys.argv', new=['ryu-manager', '--verbose',
-                                 'tests.unit.cmd.dummy_openflow_app'])
+                                 'ryu.tests.unit.cmd.dummy_openflow_app'])
     def test_openflow_app(self):
         self._reset_globals()
         main()
diff --git a/tests/unit/app/__init__.py b/ryu/tests/unit/controller/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/unit/app/__init__.py
+++ b/ryu/tests/unit/controller/__init__.py
diff --git a/tests/unit/controller/test_controller.py b/ryu/tests/unit/controller/test_controller.py
index 27a2bce6..27a2bce6 100644
--- a/tests/unit/controller/test_controller.py
+++ b/ryu/tests/unit/controller/test_controller.py
diff --git a/tests/unit/controller/__init__.py b/ryu/tests/unit/lib/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/unit/controller/__init__.py
+++ b/ryu/tests/unit/lib/__init__.py
diff --git a/tests/unit/lib/ofctl_json/of10/1-2-ofp_flow_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of10/1-2-ofp_flow_mod.packet.json
index cc0b13d9..cc0b13d9 100644
--- a/tests/unit/lib/ofctl_json/of10/1-2-ofp_flow_mod.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of10/1-2-ofp_flow_mod.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/3-0-ofp_desc_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-0-ofp_desc_stats_reply.packet.json
index 8fc54b74..8fc54b74 100644
--- a/tests/unit/lib/ofctl_json/of12/3-0-ofp_desc_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/3-0-ofp_desc_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/3-11-ofp_flow_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-11-ofp_flow_stats_request.packet.json
index a42dfef0..a42dfef0 100644
--- a/tests/unit/lib/ofctl_json/of12/3-11-ofp_flow_stats_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/3-11-ofp_flow_stats_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/3-12-ofp_flow_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-12-ofp_flow_stats_reply.packet.json
index 4d73e0b5..4d73e0b5 100644
--- a/tests/unit/lib/ofctl_json/of12/3-12-ofp_flow_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/3-12-ofp_flow_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/3-16-ofp_experimenter.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-16-ofp_experimenter.packet.json
index c655f8f0..c655f8f0 100644
--- a/tests/unit/lib/ofctl_json/of12/3-16-ofp_experimenter.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/3-16-ofp_experimenter.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/3-2-ofp_flow_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-2-ofp_flow_mod.packet.json
index f6a0f26a..f6a0f26a 100644
--- a/tests/unit/lib/ofctl_json/of12/3-2-ofp_flow_mod.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/3-2-ofp_flow_mod.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/3-21-ofp_group_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-21-ofp_group_mod.packet.json
index 9509e191..9509e191 100644
--- a/tests/unit/lib/ofctl_json/of12/3-21-ofp_group_mod.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/3-21-ofp_group_mod.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/3-22-ofp_port_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-22-ofp_port_mod.packet.json
index 3c3ccf89..3c3ccf89 100644
--- a/tests/unit/lib/ofctl_json/of12/3-22-ofp_port_mod.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/3-22-ofp_port_mod.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/3-25-ofp_aggregate_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-25-ofp_aggregate_stats_request.packet.json
index 845af65b..845af65b 100644
--- a/tests/unit/lib/ofctl_json/of12/3-25-ofp_aggregate_stats_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/3-25-ofp_aggregate_stats_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/3-26-ofp_aggregate_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-26-ofp_aggregate_stats_reply.packet.json
index a4b23d12..a4b23d12 100644
--- a/tests/unit/lib/ofctl_json/of12/3-26-ofp_aggregate_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/3-26-ofp_aggregate_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/3-28-ofp_table_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-28-ofp_table_stats_reply.packet.json
index 7444a29a..7444a29a 100644
--- a/tests/unit/lib/ofctl_json/of12/3-28-ofp_table_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/3-28-ofp_table_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/3-30-ofp_port_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-30-ofp_port_stats_reply.packet.json
index 43414b65..43414b65 100644
--- a/tests/unit/lib/ofctl_json/of12/3-30-ofp_port_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/3-30-ofp_port_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/3-32-ofp_group_features_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-32-ofp_group_features_stats_reply.packet.json
index b277969e..b277969e 100644
--- a/tests/unit/lib/ofctl_json/of12/3-32-ofp_group_features_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/3-32-ofp_group_features_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/3-34-ofp_group_desc_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-34-ofp_group_desc_stats_reply.packet.json
index c23a9bbe..c23a9bbe 100644
--- a/tests/unit/lib/ofctl_json/of12/3-34-ofp_group_desc_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/3-34-ofp_group_desc_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/3-35-ofp_queue_get_config_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-35-ofp_queue_get_config_request.packet.json
index fc49ec2c..fc49ec2c 100644
--- a/tests/unit/lib/ofctl_json/of12/3-35-ofp_queue_get_config_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/3-35-ofp_queue_get_config_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/3-36-ofp_queue_get_config_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-36-ofp_queue_get_config_reply.packet.json
index 8e922a9a..8e922a9a 100644
--- a/tests/unit/lib/ofctl_json/of12/3-36-ofp_queue_get_config_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/3-36-ofp_queue_get_config_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/3-38-ofp_queue_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-38-ofp_queue_stats_reply.packet.json
index db50c1e5..db50c1e5 100644
--- a/tests/unit/lib/ofctl_json/of12/3-38-ofp_queue_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/3-38-ofp_queue_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/3-6-ofp_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-6-ofp_features_reply.packet.json
index be040f79..be040f79 100644
--- a/tests/unit/lib/ofctl_json/of12/3-6-ofp_features_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/3-6-ofp_features_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/3-62-ofp_group_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-62-ofp_group_stats_reply.packet.json
index f2f1a6ce..f2f1a6ce 100644
--- a/tests/unit/lib/ofctl_json/of12/3-62-ofp_group_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/3-62-ofp_group_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_group_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_group_stats_request.packet.json
index 7646a77a..7646a77a 100644
--- a/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_group_stats_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_group_stats_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_port_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_port_stats_request.packet.json
index 7d56f29d..7d56f29d 100644
--- a/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_port_stats_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_port_stats_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_get_config_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_get_config_request.packet.json
index e116fdc1..e116fdc1 100644
--- a/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_get_config_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_get_config_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet1.json b/ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet1.json
index 7d56f29d..7d56f29d 100644
--- a/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet1.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet1.json
diff --git a/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet2.json b/ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet2.json
index 78077510..78077510 100644
--- a/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet2.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet2.json
diff --git a/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet3.json b/ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet3.json
index ee465693..ee465693 100644
--- a/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet3.json
+++ b/ryu/tests/unit/lib/ofctl_json/of12/lib-ofctl-ofp_queue_stats_request.packet3.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-0-ofp_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-0-ofp_desc_reply.packet.json
index 8fc54b74..8fc54b74 100644
--- a/tests/unit/lib/ofctl_json/of13/4-0-ofp_desc_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-0-ofp_desc_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-11-ofp_flow_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-11-ofp_flow_stats_request.packet.json
index a42dfef0..a42dfef0 100644
--- a/tests/unit/lib/ofctl_json/of13/4-11-ofp_flow_stats_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-11-ofp_flow_stats_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-12-ofp_flow_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-12-ofp_flow_stats_reply.packet.json
index f9b8e68f..f9b8e68f 100644
--- a/tests/unit/lib/ofctl_json/of13/4-12-ofp_flow_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-12-ofp_flow_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-16-ofp_experimenter.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-16-ofp_experimenter.packet.json
index c655f8f0..c655f8f0 100644
--- a/tests/unit/lib/ofctl_json/of13/4-16-ofp_experimenter.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-16-ofp_experimenter.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-2-ofp_flow_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-2-ofp_flow_mod.packet.json
index fbd5c214..fbd5c214 100644
--- a/tests/unit/lib/ofctl_json/of13/4-2-ofp_flow_mod.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-2-ofp_flow_mod.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-21-ofp_group_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-21-ofp_group_mod.packet.json
index fa48425a..fa48425a 100644
--- a/tests/unit/lib/ofctl_json/of13/4-21-ofp_group_mod.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-21-ofp_group_mod.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-22-ofp_port_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-22-ofp_port_mod.packet.json
index 73339730..73339730 100644
--- a/tests/unit/lib/ofctl_json/of13/4-22-ofp_port_mod.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-22-ofp_port_mod.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-25-ofp_aggregate_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-25-ofp_aggregate_stats_request.packet.json
index 845af65b..845af65b 100644
--- a/tests/unit/lib/ofctl_json/of13/4-25-ofp_aggregate_stats_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-25-ofp_aggregate_stats_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-26-ofp_aggregate_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-26-ofp_aggregate_stats_reply.packet.json
index a4b23d12..a4b23d12 100644
--- a/tests/unit/lib/ofctl_json/of13/4-26-ofp_aggregate_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-26-ofp_aggregate_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-28-ofp_table_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-28-ofp_table_stats_reply.packet.json
index 95b2c495..95b2c495 100644
--- a/tests/unit/lib/ofctl_json/of13/4-28-ofp_table_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-28-ofp_table_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-30-ofp_port_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-30-ofp_port_stats_reply.packet.json
index a81e6825..a81e6825 100644
--- a/tests/unit/lib/ofctl_json/of13/4-30-ofp_port_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-30-ofp_port_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-32-ofp_group_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-32-ofp_group_features_reply.packet.json
index 2a29ac2d..2a29ac2d 100644
--- a/tests/unit/lib/ofctl_json/of13/4-32-ofp_group_features_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-32-ofp_group_features_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-34-ofp_group_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-34-ofp_group_desc_reply.packet.json
index c23a9bbe..c23a9bbe 100644
--- a/tests/unit/lib/ofctl_json/of13/4-34-ofp_group_desc_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-34-ofp_group_desc_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-35-ofp_queue_get_config_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-35-ofp_queue_get_config_request.packet.json
index fc49ec2c..fc49ec2c 100644
--- a/tests/unit/lib/ofctl_json/of13/4-35-ofp_queue_get_config_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-35-ofp_queue_get_config_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-36-ofp_queue_get_config_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-36-ofp_queue_get_config_reply.packet.json
index 9d529400..9d529400 100644
--- a/tests/unit/lib/ofctl_json/of13/4-36-ofp_queue_get_config_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-36-ofp_queue_get_config_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-38-ofp_queue_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-38-ofp_queue_stats_reply.packet.json
index b19fe300..b19fe300 100644
--- a/tests/unit/lib/ofctl_json/of13/4-38-ofp_queue_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-38-ofp_queue_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-45-ofp_meter_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-45-ofp_meter_mod.packet.json
index b78ea6be..b78ea6be 100644
--- a/tests/unit/lib/ofctl_json/of13/4-45-ofp_meter_mod.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-45-ofp_meter_mod.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-48-ofp_meter_config_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-48-ofp_meter_config_reply.packet.json
index d5efcd97..d5efcd97 100644
--- a/tests/unit/lib/ofctl_json/of13/4-48-ofp_meter_config_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-48-ofp_meter_config_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-50-ofp_meter_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-50-ofp_meter_stats_reply.packet.json
index f21ec519..f21ec519 100644
--- a/tests/unit/lib/ofctl_json/of13/4-50-ofp_meter_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-50-ofp_meter_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-52-ofp_meter_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-52-ofp_meter_features_reply.packet.json
index 24dac7d4..24dac7d4 100644
--- a/tests/unit/lib/ofctl_json/of13/4-52-ofp_meter_features_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-52-ofp_meter_features_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-54-ofp_port_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-54-ofp_port_desc_reply.packet.json
index 72ff2ec3..72ff2ec3 100644
--- a/tests/unit/lib/ofctl_json/of13/4-54-ofp_port_desc_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-54-ofp_port_desc_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-56-ofp_table_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-56-ofp_table_features_reply.packet.json
index ded5a996..ded5a996 100644
--- a/tests/unit/lib/ofctl_json/of13/4-56-ofp_table_features_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-56-ofp_table_features_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/4-58-ofp_group_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-58-ofp_group_stats_reply.packet.json
index 1c6f9039..1c6f9039 100644
--- a/tests/unit/lib/ofctl_json/of13/4-58-ofp_group_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/4-58-ofp_group_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_group_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_group_stats_request.packet.json
index 7646a77a..7646a77a 100644
--- a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_group_stats_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_group_stats_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_meter_config_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_meter_config_request.packet.json
index 3ad622e0..3ad622e0 100644
--- a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_meter_config_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_meter_config_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_meter_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_meter_stats_request.packet.json
index 3ad622e0..3ad622e0 100644
--- a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_meter_stats_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_meter_stats_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_port_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_port_stats_request.packet.json
index 7d56f29d..7d56f29d 100644
--- a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_port_stats_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_port_stats_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_get_config_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_get_config_request.packet.json
index e116fdc1..e116fdc1 100644
--- a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_get_config_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_get_config_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet1.json b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet1.json
index 7d56f29d..7d56f29d 100644
--- a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet1.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet1.json
diff --git a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet2.json b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet2.json
index 78077510..78077510 100644
--- a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet2.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet2.json
diff --git a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet3.json b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet3.json
index ee465693..ee465693 100644
--- a/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet3.json
+++ b/ryu/tests/unit/lib/ofctl_json/of13/lib-ofctl-ofp_queue_stats_request.packet3.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-0-ofp_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-0-ofp_desc_reply.packet.json
index 8fc54b74..8fc54b74 100644
--- a/tests/unit/lib/ofctl_json/of14/5-0-ofp_desc_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-0-ofp_desc_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-11-ofp_flow_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-11-ofp_flow_stats_request.packet.json
index a42dfef0..a42dfef0 100644
--- a/tests/unit/lib/ofctl_json/of14/5-11-ofp_flow_stats_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-11-ofp_flow_stats_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-12-ofp_flow_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-12-ofp_flow_stats_reply.packet.json
index 134c3f12..134c3f12 100644
--- a/tests/unit/lib/ofctl_json/of14/5-12-ofp_flow_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-12-ofp_flow_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-16-ofp_experimenter.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-16-ofp_experimenter.packet.json
index c655f8f0..c655f8f0 100644
--- a/tests/unit/lib/ofctl_json/of14/5-16-ofp_experimenter.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-16-ofp_experimenter.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-2-ofp_flow_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-2-ofp_flow_mod.packet.json
index 72054e33..72054e33 100644
--- a/tests/unit/lib/ofctl_json/of14/5-2-ofp_flow_mod.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-2-ofp_flow_mod.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-21-ofp_group_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-21-ofp_group_mod.packet.json
index fa48425a..fa48425a 100644
--- a/tests/unit/lib/ofctl_json/of14/5-21-ofp_group_mod.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-21-ofp_group_mod.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-22-ofp_port_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-22-ofp_port_mod.packet.json
index 980456eb..980456eb 100644
--- a/tests/unit/lib/ofctl_json/of14/5-22-ofp_port_mod.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-22-ofp_port_mod.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-25-ofp_aggregate_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-25-ofp_aggregate_stats_request.packet.json
index 845af65b..845af65b 100644
--- a/tests/unit/lib/ofctl_json/of14/5-25-ofp_aggregate_stats_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-25-ofp_aggregate_stats_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-26-ofp_aggregate_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-26-ofp_aggregate_stats_reply.packet.json
index a4b23d12..a4b23d12 100644
--- a/tests/unit/lib/ofctl_json/of14/5-26-ofp_aggregate_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-26-ofp_aggregate_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-28-ofp_table_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-28-ofp_table_stats_reply.packet.json
index 95b2c495..95b2c495 100644
--- a/tests/unit/lib/ofctl_json/of14/5-28-ofp_table_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-28-ofp_table_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-30-ofp_port_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-30-ofp_port_stats_reply.packet.json
index f9f1d86f..f9f1d86f 100644
--- a/tests/unit/lib/ofctl_json/of14/5-30-ofp_port_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-30-ofp_port_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-32-ofp_group_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-32-ofp_group_features_reply.packet.json
index 2a29ac2d..2a29ac2d 100644
--- a/tests/unit/lib/ofctl_json/of14/5-32-ofp_group_features_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-32-ofp_group_features_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-34-ofp_group_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-34-ofp_group_desc_reply.packet.json
index df0ef359..df0ef359 100644
--- a/tests/unit/lib/ofctl_json/of14/5-34-ofp_group_desc_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-34-ofp_group_desc_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-36-ofp_queue_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-36-ofp_queue_stats_reply.packet.json
index a6d246d0..a6d246d0 100644
--- a/tests/unit/lib/ofctl_json/of14/5-36-ofp_queue_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-36-ofp_queue_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-43-ofp_meter_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-43-ofp_meter_mod.packet.json
index b78ea6be..b78ea6be 100644
--- a/tests/unit/lib/ofctl_json/of14/5-43-ofp_meter_mod.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-43-ofp_meter_mod.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-46-ofp_meter_config_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-46-ofp_meter_config_reply.packet.json
index d5efcd97..d5efcd97 100644
--- a/tests/unit/lib/ofctl_json/of14/5-46-ofp_meter_config_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-46-ofp_meter_config_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-48-ofp_meter_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-48-ofp_meter_stats_reply.packet.json
index f21ec519..f21ec519 100644
--- a/tests/unit/lib/ofctl_json/of14/5-48-ofp_meter_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-48-ofp_meter_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-50-ofp_meter_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-50-ofp_meter_features_reply.packet.json
index 24dac7d4..24dac7d4 100644
--- a/tests/unit/lib/ofctl_json/of14/5-50-ofp_meter_features_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-50-ofp_meter_features_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-52-ofp_port_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-52-ofp_port_desc_reply.packet.json
index c2f748a8..c2f748a8 100644
--- a/tests/unit/lib/ofctl_json/of14/5-52-ofp_port_desc_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-52-ofp_port_desc_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-54-ofp_table_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-54-ofp_table_features_reply.packet.json
index ded5a996..ded5a996 100644
--- a/tests/unit/lib/ofctl_json/of14/5-54-ofp_table_features_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-54-ofp_table_features_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-56-ofp_group_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-56-ofp_group_stats_reply.packet.json
index 1c6f9039..1c6f9039 100644
--- a/tests/unit/lib/ofctl_json/of14/5-56-ofp_group_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-56-ofp_group_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-63-ofp_queue_desc_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-63-ofp_queue_desc_request.packet.json
index fc863813..fc863813 100644
--- a/tests/unit/lib/ofctl_json/of14/5-63-ofp_queue_desc_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-63-ofp_queue_desc_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of14/5-64-ofp_queue_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of14/5-64-ofp_queue_desc_reply.packet.json
index ca6e87f2..ca6e87f2 100644
--- a/tests/unit/lib/ofctl_json/of14/5-64-ofp_queue_desc_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of14/5-64-ofp_queue_desc_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_desc_reply.packet.json
index 0b5e04be..0b5e04be 100644
--- a/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_desc_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_desc_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_desc_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_desc_request.packet.json
index f59aa0b2..f59aa0b2 100644
--- a/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_desc_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_desc_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_mod.packet.json
index cc3ba488..cc3ba488 100644
--- a/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_mod.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/lib-ofctl-OFP15-flow_mod.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json
index ac4f93c4..ac4f93c4 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-aggregate_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-aggregate_stats_request.packet.json
index 845af65b..845af65b 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-aggregate_stats_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-aggregate_stats_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-desc_reply.packet.json
index 8fc54b74..8fc54b74 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-desc_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-desc_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-experimenter.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-experimenter.packet.json
index c655f8f0..c655f8f0 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-experimenter.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-experimenter.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_desc_reply.packet.json
index 4e12f857..4e12f857 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_desc_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_desc_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_desc_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_desc_request.packet.json
index f59aa0b2..f59aa0b2 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_desc_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_desc_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_mod_no_nx.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_mod_no_nx.packet.json
index 72054e33..72054e33 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_mod_no_nx.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_mod_no_nx.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_stats_reply.packet.json
index 385f256b..385f256b 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_stats_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_stats_request.packet.json
index a42dfef0..a42dfef0 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_stats_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-flow_stats_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_desc_reply.packet.json
index b6b75020..b6b75020 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_desc_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_desc_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_desc_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_desc_request.packet.json
index f25aaff4..f25aaff4 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_desc_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_desc_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_features_reply.packet.json
index 2a29ac2d..2a29ac2d 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_features_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_features_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_mod.packet.json
index eca861ea..eca861ea 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_mod.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_mod.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_stats_reply.packet.json
index 1c6f9039..1c6f9039 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-group_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_desc_reply.packet.json
index d5efcd97..d5efcd97 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_desc_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_desc_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_features_reply.packet.json
index 24dac7d4..24dac7d4 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_features_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_features_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_mod.packet.json
index 1d881209..1d881209 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_mod.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_mod.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_stats_reply.packet.json
index e7f9722b..e7f9722b 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-meter_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_desc_reply.packet.json
index c2f748a8..c2f748a8 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_desc_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_desc_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_desc_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_desc_request.packet.json
index d0519e83..d0519e83 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_desc_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_desc_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_mod.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_mod.packet.json
index be9de69d..be9de69d 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_mod.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_mod.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_stats_reply.packet.json
index 821c9b72..821c9b72 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-port_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_desc_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_desc_reply.packet.json
index 71ca0b71..71ca0b71 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_desc_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_desc_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_desc_request.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_desc_request.packet.json
index 9765cf31..9765cf31 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_desc_request.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_desc_request.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_stats_reply.packet.json
index a6d246d0..a6d246d0 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-queue_stats_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-table_features_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-table_features_reply.packet.json
index e16efb76..e16efb76 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-table_features_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-table_features_reply.packet.json
diff --git a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-table_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-table_stats_reply.packet.json
index 95b2c495..95b2c495 100644
--- a/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-table_stats_reply.packet.json
+++ b/ryu/tests/unit/lib/ofctl_json/of15/libofproto-OFP15-table_stats_reply.packet.json
diff --git a/tests/unit/lib/__init__.py b/ryu/tests/unit/lib/ovs/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/unit/lib/__init__.py
+++ b/ryu/tests/unit/lib/ovs/__init__.py
diff --git a/tests/unit/lib/ovs/test_vsctl.py b/ryu/tests/unit/lib/ovs/test_vsctl.py
index 28edf6e9..28edf6e9 100644
--- a/tests/unit/lib/ovs/test_vsctl.py
+++ b/ryu/tests/unit/lib/ovs/test_vsctl.py
diff --git a/tests/unit/lib/test_addrconv.py b/ryu/tests/unit/lib/test_addrconv.py
index 77877038..77877038 100644
--- a/tests/unit/lib/test_addrconv.py
+++ b/ryu/tests/unit/lib/test_addrconv.py
diff --git a/tests/unit/lib/test_hub.py b/ryu/tests/unit/lib/test_hub.py
index d8b75996..d8b75996 100644
--- a/tests/unit/lib/test_hub.py
+++ b/ryu/tests/unit/lib/test_hub.py
diff --git a/tests/unit/lib/test_import_module.py b/ryu/tests/unit/lib/test_import_module.py
index 852ee21b..b8561d20 100644
--- a/tests/unit/lib/test_import_module.py
+++ b/ryu/tests/unit/lib/test_import_module.py
@@ -34,9 +34,9 @@ class Test_import_module(unittest.TestCase):
         return mod
 
     def test_import_module_with_same_basename(self):
-        aaa = import_module('tests.unit.lib.test_mod.aaa.mod')
+        aaa = import_module('ryu.tests.unit.lib.test_mod.aaa.mod')
         eq_("this is aaa", aaa.name)
-        bbb = import_module('tests.unit.lib.test_mod.bbb.mod')
+        bbb = import_module('ryu.tests.unit.lib.test_mod.bbb.mod')
         eq_("this is bbb", bbb.name)
 
     def test_import_module_by_filename(self):
@@ -48,7 +48,7 @@ class Test_import_module(unittest.TestCase):
         eq_("this is ddd", ddd.name)
 
     def test_import_same_module1(self):
-        from tests.unit.lib.test_mod import eee as eee1
+        from ryu.tests.unit.lib.test_mod import eee as eee1
         eq_("this is eee", eee1.name)
         eee2 = import_module('./lib/test_mod/eee.py')
         eq_("this is eee", eee2.name)
@@ -56,11 +56,11 @@ class Test_import_module(unittest.TestCase):
     def test_import_same_module2(self):
         fff1 = import_module('./lib/test_mod/fff.py')
         eq_("this is fff", fff1.name)
-        fff2 = import_module('tests.unit.lib.test_mod.fff')
+        fff2 = import_module('ryu.tests.unit.lib.test_mod.fff')
         eq_("this is fff", fff2.name)
 
     def test_import_same_module3(self):
         ggg1 = import_module('./lib/test_mod/ggg.py')
         eq_("this is ggg", ggg1.name)
-        ggg2 = self._my_import('tests.unit.lib.test_mod.ggg')
+        ggg2 = self._my_import('ryu.tests.unit.lib.test_mod.ggg')
         eq_("this is ggg", ggg2.name)
diff --git a/tests/unit/lib/test_ip.py b/ryu/tests/unit/lib/test_ip.py
index 66d8f0c2..66d8f0c2 100644
--- a/tests/unit/lib/test_ip.py
+++ b/ryu/tests/unit/lib/test_ip.py
diff --git a/tests/unit/lib/test_mac.py b/ryu/tests/unit/lib/test_mac.py
index 91839ead..91839ead 100644
--- a/tests/unit/lib/test_mac.py
+++ b/ryu/tests/unit/lib/test_mac.py
diff --git a/tests/unit/lib/test_mod/__init__.py b/ryu/tests/unit/lib/test_mod/__init__.py
index ca8ef539..ca8ef539 100644
--- a/tests/unit/lib/test_mod/__init__.py
+++ b/ryu/tests/unit/lib/test_mod/__init__.py
diff --git a/tests/unit/lib/test_mod/aaa/__init__.py b/ryu/tests/unit/lib/test_mod/aaa/__init__.py
index ca8ef539..ca8ef539 100644
--- a/tests/unit/lib/test_mod/aaa/__init__.py
+++ b/ryu/tests/unit/lib/test_mod/aaa/__init__.py
diff --git a/tests/unit/lib/test_mod/aaa/mod.py b/ryu/tests/unit/lib/test_mod/aaa/mod.py
index a5eff136..a5eff136 100644
--- a/tests/unit/lib/test_mod/aaa/mod.py
+++ b/ryu/tests/unit/lib/test_mod/aaa/mod.py
diff --git a/tests/unit/lib/test_mod/bbb/__init__.py b/ryu/tests/unit/lib/test_mod/bbb/__init__.py
index ca8ef539..ca8ef539 100644
--- a/tests/unit/lib/test_mod/bbb/__init__.py
+++ b/ryu/tests/unit/lib/test_mod/bbb/__init__.py
diff --git a/tests/unit/lib/test_mod/bbb/mod.py b/ryu/tests/unit/lib/test_mod/bbb/mod.py
index 397c8554..397c8554 100644
--- a/tests/unit/lib/test_mod/bbb/mod.py
+++ b/ryu/tests/unit/lib/test_mod/bbb/mod.py
diff --git a/tests/unit/lib/test_mod/ccc/__init__.py b/ryu/tests/unit/lib/test_mod/ccc/__init__.py
index ce07156d..ce07156d 100644
--- a/tests/unit/lib/test_mod/ccc/__init__.py
+++ b/ryu/tests/unit/lib/test_mod/ccc/__init__.py
diff --git a/tests/unit/lib/test_mod/ccc/mod.py b/ryu/tests/unit/lib/test_mod/ccc/mod.py
index 5be826cf..5be826cf 100644
--- a/tests/unit/lib/test_mod/ccc/mod.py
+++ b/ryu/tests/unit/lib/test_mod/ccc/mod.py
diff --git a/tests/unit/lib/test_mod/ddd/__init__.py b/ryu/tests/unit/lib/test_mod/ddd/__init__.py
index ce07156d..ce07156d 100644
--- a/tests/unit/lib/test_mod/ddd/__init__.py
+++ b/ryu/tests/unit/lib/test_mod/ddd/__init__.py
diff --git a/tests/unit/lib/test_mod/ddd/mod.py b/ryu/tests/unit/lib/test_mod/ddd/mod.py
index 31d31d53..31d31d53 100644
--- a/tests/unit/lib/test_mod/ddd/mod.py
+++ b/ryu/tests/unit/lib/test_mod/ddd/mod.py
diff --git a/tests/unit/lib/test_mod/eee.py b/ryu/tests/unit/lib/test_mod/eee.py
index ed21a8aa..ed21a8aa 100644
--- a/tests/unit/lib/test_mod/eee.py
+++ b/ryu/tests/unit/lib/test_mod/eee.py
diff --git a/tests/unit/lib/test_mod/fff.py b/ryu/tests/unit/lib/test_mod/fff.py
index 5a565e38..5a565e38 100644
--- a/tests/unit/lib/test_mod/fff.py
+++ b/ryu/tests/unit/lib/test_mod/fff.py
diff --git a/tests/unit/lib/test_mod/ggg.py b/ryu/tests/unit/lib/test_mod/ggg.py
index 29555e56..29555e56 100644
--- a/tests/unit/lib/test_mod/ggg.py
+++ b/ryu/tests/unit/lib/test_mod/ggg.py
diff --git a/tests/unit/lib/test_mrtlib.py b/ryu/tests/unit/lib/test_mrtlib.py
index e870f401..e870f401 100644
--- a/tests/unit/lib/test_mrtlib.py
+++ b/ryu/tests/unit/lib/test_mrtlib.py
diff --git a/tests/unit/lib/test_of_config_classes.py b/ryu/tests/unit/lib/test_of_config_classes.py
index 5b0dd6d3..5b0dd6d3 100644
--- a/tests/unit/lib/test_of_config_classes.py
+++ b/ryu/tests/unit/lib/test_of_config_classes.py
diff --git a/tests/unit/lib/test_ofctl.py b/ryu/tests/unit/lib/test_ofctl.py
index 57fa8355..862ce1d3 100644
--- a/tests/unit/lib/test_ofctl.py
+++ b/ryu/tests/unit/lib/test_ofctl.py
@@ -28,8 +28,7 @@ from ryu.lib import ofctl_v1_4
 from ryu.lib import ofctl_v1_5
 from ryu.ofproto import ofproto_parser
 from ryu.ofproto.ofproto_protocol import ProtocolDesc
-
-from tests import test_lib
+from ryu.tests import test_lib
 
 LOG = logging.getLogger(__name__)
 
diff --git a/tests/unit/lib/test_ofctl_action_match.py b/ryu/tests/unit/lib/test_ofctl_action_match.py
index 2b8707cf..11e27f78 100644
--- a/tests/unit/lib/test_ofctl_action_match.py
+++ b/ryu/tests/unit/lib/test_ofctl_action_match.py
@@ -32,8 +32,7 @@ from ryu.lib import ofctl_v1_3
 from ryu.ofproto import ofproto_v1_3, ofproto_v1_3_parser
 from ryu.ofproto import ofproto_protocol
 from ryu.ofproto import inet
-
-from tests import test_lib
+from ryu.tests import test_lib
 
 LOG = logging.getLogger('test_ofctl_v1_2, v1_3')
 
diff --git a/tests/unit/lib/test_ofctl_string.py b/ryu/tests/unit/lib/test_ofctl_string.py
index fb491e39..fb491e39 100644
--- a/tests/unit/lib/test_ofctl_string.py
+++ b/ryu/tests/unit/lib/test_ofctl_string.py
diff --git a/tests/unit/lib/test_ofctl_utils.py b/ryu/tests/unit/lib/test_ofctl_utils.py
index 2f02f43b..2f02f43b 100644
--- a/tests/unit/lib/test_ofctl_utils.py
+++ b/ryu/tests/unit/lib/test_ofctl_utils.py
diff --git a/tests/unit/lib/test_ofctl_v1_3.py b/ryu/tests/unit/lib/test_ofctl_v1_3.py
index 81cfacbf..81cfacbf 100644
--- a/tests/unit/lib/test_ofctl_v1_3.py
+++ b/ryu/tests/unit/lib/test_ofctl_v1_3.py
diff --git a/tests/unit/lib/test_ofp_pktinfilter.py b/ryu/tests/unit/lib/test_ofp_pktinfilter.py
index 2c037737..2c037737 100644
--- a/tests/unit/lib/test_ofp_pktinfilter.py
+++ b/ryu/tests/unit/lib/test_ofp_pktinfilter.py
diff --git a/tests/unit/lib/test_pack_utils.py b/ryu/tests/unit/lib/test_pack_utils.py
index 5bc99513..5bc99513 100644
--- a/tests/unit/lib/test_pack_utils.py
+++ b/ryu/tests/unit/lib/test_pack_utils.py
diff --git a/tests/unit/lib/test_pcaplib.py b/ryu/tests/unit/lib/test_pcaplib.py
index ac86904e..ac86904e 100644
--- a/tests/unit/lib/test_pcaplib.py
+++ b/ryu/tests/unit/lib/test_pcaplib.py
diff --git a/tests/unit/lib/test_rpc.py b/ryu/tests/unit/lib/test_rpc.py
index 2df123ee..2df123ee 100644
--- a/tests/unit/lib/test_rpc.py
+++ b/ryu/tests/unit/lib/test_rpc.py
diff --git a/tests/unit/lib/test_stringify.py b/ryu/tests/unit/lib/test_stringify.py
index 46fb21f0..46fb21f0 100644
--- a/tests/unit/lib/test_stringify.py
+++ b/ryu/tests/unit/lib/test_stringify.py
diff --git a/tests/unit/lib/ovs/__init__.py b/ryu/tests/unit/ofproto/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/unit/lib/ovs/__init__.py
+++ b/ryu/tests/unit/ofproto/__init__.py
diff --git a/tests/unit/ofproto/json/of10/1-1-ofp_packet_out.packet.json b/ryu/tests/unit/ofproto/json/of10/1-1-ofp_packet_out.packet.json
index 0dc98f49..0dc98f49 100644
--- a/tests/unit/ofproto/json/of10/1-1-ofp_packet_out.packet.json
+++ b/ryu/tests/unit/ofproto/json/of10/1-1-ofp_packet_out.packet.json
diff --git a/tests/unit/ofproto/json/of10/1-2-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of10/1-2-ofp_flow_mod.packet.json
index 4a63685e..4a63685e 100644
--- a/tests/unit/ofproto/json/of10/1-2-ofp_flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of10/1-2-ofp_flow_mod.packet.json
diff --git a/tests/unit/ofproto/json/of10/1-4-ofp_packet_in.packet.json b/ryu/tests/unit/ofproto/json/of10/1-4-ofp_packet_in.packet.json
index 6ccd2fb8..6ccd2fb8 100644
--- a/tests/unit/ofproto/json/of10/1-4-ofp_packet_in.packet.json
+++ b/ryu/tests/unit/ofproto/json/of10/1-4-ofp_packet_in.packet.json
diff --git a/tests/unit/ofproto/json/of10/1-5-features_request.packet.json b/ryu/tests/unit/ofproto/json/of10/1-5-features_request.packet.json
index 8f48ad5a..8f48ad5a 100644
--- a/tests/unit/ofproto/json/of10/1-5-features_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of10/1-5-features_request.packet.json
diff --git a/tests/unit/ofproto/json/of10/1-6-ofp_switch_features.packet.json b/ryu/tests/unit/ofproto/json/of10/1-6-ofp_switch_features.packet.json
index 208431f7..208431f7 100644
--- a/tests/unit/ofproto/json/of10/1-6-ofp_switch_features.packet.json
+++ b/ryu/tests/unit/ofproto/json/of10/1-6-ofp_switch_features.packet.json
diff --git a/tests/unit/ofproto/json/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet.json b/ryu/tests/unit/ofproto/json/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet.json
index f8e38d71..f8e38d71 100644
--- a/tests/unit/ofproto/json/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet.json
+++ b/ryu/tests/unit/ofproto/json/of10/libofproto-OFP10-ofp_packet_out_packet_library.packet.json
diff --git a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet.json b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet.json
index a41c2b64..a41c2b64 100644
--- a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet.json
+++ b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_dec_mpls_ttl.packet.json
diff --git a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet.json b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet.json
index 3f6806c8..3f6806c8 100644
--- a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet.json
+++ b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_dec_nw_ttl.packet.json
diff --git a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_pop_mpls.packet.json b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_pop_mpls.packet.json
index 69c0d70b..69c0d70b 100644
--- a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_pop_mpls.packet.json
+++ b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_pop_mpls.packet.json
diff --git a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_push_mpls.packet.json b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_push_mpls.packet.json
index 9e7853cb..9e7853cb 100644
--- a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_push_mpls.packet.json
+++ b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_push_mpls.packet.json
diff --git a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_label.packet.json b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_label.packet.json
index 4cc001b2..4cc001b2 100644
--- a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_label.packet.json
+++ b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_label.packet.json
diff --git a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_tc.packet.json b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_tc.packet.json
index 864fd7e7..864fd7e7 100644
--- a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_tc.packet.json
+++ b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_tc.packet.json
diff --git a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet.json b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet.json
index da6e86f9..da6e86f9 100644
--- a/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet.json
+++ b/ryu/tests/unit/ofproto/json/of10/ovs-ofctl-of10-action_set_mpls_ttl.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-0-ofp_desc_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-0-ofp_desc_stats_reply.packet.json
index 4d5181ca..4d5181ca 100644
--- a/tests/unit/ofproto/json/of12/3-0-ofp_desc_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-0-ofp_desc_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json b/ryu/tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json
index efb39e2d..efb39e2d 100644
--- a/tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-10-ofp_hello.packet.json b/ryu/tests/unit/ofproto/json/of12/3-10-ofp_hello.packet.json
index ce07cebd..ce07cebd 100644
--- a/tests/unit/ofproto/json/of12/3-10-ofp_hello.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-10-ofp_hello.packet.json
diff --git a/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 d12cac71..d12cac71 100644
--- a/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
diff --git a/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 5f802b45..5f802b45 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of12/3-13-ofp_echo_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-13-ofp_echo_request.packet.json
index e1f2af42..e1f2af42 100644
--- a/tests/unit/ofproto/json/of12/3-13-ofp_echo_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-13-ofp_echo_request.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-14-ofp_echo_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-14-ofp_echo_reply.packet.json
index 2a573634..2a573634 100644
--- a/tests/unit/ofproto/json/of12/3-14-ofp_echo_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-14-ofp_echo_reply.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-15-ofp_error_msg.packet.json b/ryu/tests/unit/ofproto/json/of12/3-15-ofp_error_msg.packet.json
index e9ab2b5e..e9ab2b5e 100644
--- a/tests/unit/ofproto/json/of12/3-15-ofp_error_msg.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-15-ofp_error_msg.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-16-ofp_experimenter.packet.json b/ryu/tests/unit/ofproto/json/of12/3-16-ofp_experimenter.packet.json
index 4ad13c73..4ad13c73 100644
--- a/tests/unit/ofproto/json/of12/3-16-ofp_experimenter.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-16-ofp_experimenter.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-17-ofp_barrier_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-17-ofp_barrier_request.packet.json
index 2aae9ec3..2aae9ec3 100644
--- a/tests/unit/ofproto/json/of12/3-17-ofp_barrier_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-17-ofp_barrier_request.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-18-ofp_barrier_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-18-ofp_barrier_reply.packet.json
index 11f8cfcc..11f8cfcc 100644
--- a/tests/unit/ofproto/json/of12/3-18-ofp_barrier_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-18-ofp_barrier_reply.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-19-ofp_role_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-19-ofp_role_request.packet.json
index 5cdbc2f1..5cdbc2f1 100644
--- a/tests/unit/ofproto/json/of12/3-19-ofp_role_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-19-ofp_role_request.packet.json
diff --git a/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 43e0e3c9..43e0e3c9 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of12/3-20-ofp_role_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-20-ofp_role_reply.packet.json
index 3fd9a13f..3fd9a13f 100644
--- a/tests/unit/ofproto/json/of12/3-20-ofp_role_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-20-ofp_role_reply.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json b/ryu/tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json
index 1a3767da..1a3767da 100644
--- a/tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-22-ofp_port_mod.packet.json b/ryu/tests/unit/ofproto/json/of12/3-22-ofp_port_mod.packet.json
index e334f5d8..e334f5d8 100644
--- a/tests/unit/ofproto/json/of12/3-22-ofp_port_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-22-ofp_port_mod.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-23-ofp_table_mod.packet.json b/ryu/tests/unit/ofproto/json/of12/3-23-ofp_table_mod.packet.json
index 5019c29b..5019c29b 100644
--- a/tests/unit/ofproto/json/of12/3-23-ofp_table_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-23-ofp_table_mod.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-24-ofp_desc_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-24-ofp_desc_stats_request.packet.json
index 6129d409..6129d409 100644
--- a/tests/unit/ofproto/json/of12/3-24-ofp_desc_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-24-ofp_desc_stats_request.packet.json
diff --git a/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 cc3d76fd..cc3d76fd 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of12/3-26-ofp_aggregate_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-26-ofp_aggregate_stats_reply.packet.json
index ed1473aa..ed1473aa 100644
--- a/tests/unit/ofproto/json/of12/3-26-ofp_aggregate_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-26-ofp_aggregate_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-27-ofp_table_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-27-ofp_table_stats_request.packet.json
index 03adedd1..03adedd1 100644
--- a/tests/unit/ofproto/json/of12/3-27-ofp_table_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-27-ofp_table_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-28-ofp_table_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-28-ofp_table_stats_reply.packet.json
index 7480fde4..7480fde4 100644
--- a/tests/unit/ofproto/json/of12/3-28-ofp_table_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-28-ofp_table_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-29-ofp_port_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-29-ofp_port_stats_request.packet.json
index 9a94ed8b..9a94ed8b 100644
--- a/tests/unit/ofproto/json/of12/3-29-ofp_port_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-29-ofp_port_stats_request.packet.json
diff --git a/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 cd68b51f..cd68b51f 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of12/3-30-ofp_port_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-30-ofp_port_stats_reply.packet.json
index 9afd8cd4..9afd8cd4 100644
--- a/tests/unit/ofproto/json/of12/3-30-ofp_port_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-30-ofp_port_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-31-ofp_group_features_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-31-ofp_group_features_stats_request.packet.json
index 03974d3e..03974d3e 100644
--- a/tests/unit/ofproto/json/of12/3-31-ofp_group_features_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-31-ofp_group_features_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-32-ofp_group_features_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-32-ofp_group_features_stats_reply.packet.json
index 7e867868..7e867868 100644
--- a/tests/unit/ofproto/json/of12/3-32-ofp_group_features_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-32-ofp_group_features_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-33-ofp_group_desc_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-33-ofp_group_desc_stats_request.packet.json
index e62fe9a0..e62fe9a0 100644
--- a/tests/unit/ofproto/json/of12/3-33-ofp_group_desc_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-33-ofp_group_desc_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json
index 5166d1ce..5166d1ce 100644
--- a/tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-35-ofp_queue_get_config_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-35-ofp_queue_get_config_request.packet.json
index a50308c0..a50308c0 100644
--- a/tests/unit/ofproto/json/of12/3-35-ofp_queue_get_config_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-35-ofp_queue_get_config_request.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json
index 7d0a7bbe..7d0a7bbe 100644
--- a/tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-37-ofp_queue_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-37-ofp_queue_stats_request.packet.json
index 5c7479d3..5c7479d3 100644
--- a/tests/unit/ofproto/json/of12/3-37-ofp_queue_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-37-ofp_queue_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-38-ofp_queue_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-38-ofp_queue_stats_reply.packet.json
index fb21c96a..fb21c96a 100644
--- a/tests/unit/ofproto/json/of12/3-38-ofp_queue_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-38-ofp_queue_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-39-ofp_port_status.packet.json b/ryu/tests/unit/ofproto/json/of12/3-39-ofp_port_status.packet.json
index a842932e..a842932e 100644
--- a/tests/unit/ofproto/json/of12/3-39-ofp_port_status.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-39-ofp_port_status.packet.json
diff --git a/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 b211934e..b211934e 100644
--- a/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
diff --git a/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 994953e6..994953e6 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of12/3-41-ofp_error_msg_experimenter.packet.json b/ryu/tests/unit/ofproto/json/of12/3-41-ofp_error_msg_experimenter.packet.json
index 37bfb6a9..37bfb6a9 100644
--- a/tests/unit/ofproto/json/of12/3-41-ofp_error_msg_experimenter.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-41-ofp_error_msg_experimenter.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-5-ofp_features_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-5-ofp_features_request.packet.json
index 8f48ad5a..8f48ad5a 100644
--- a/tests/unit/ofproto/json/of12/3-5-ofp_features_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-5-ofp_features_request.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-59-ofp_packet_in.packet.json b/ryu/tests/unit/ofproto/json/of12/3-59-ofp_packet_in.packet.json
index 5b365a22..5b365a22 100644
--- a/tests/unit/ofproto/json/of12/3-59-ofp_packet_in.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-59-ofp_packet_in.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-6-ofp_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-6-ofp_features_reply.packet.json
index 7b9233ac..7b9233ac 100644
--- a/tests/unit/ofproto/json/of12/3-6-ofp_features_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-6-ofp_features_reply.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-60-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of12/3-60-ofp_flow_mod.packet.json
index f5de7cef..f5de7cef 100644
--- a/tests/unit/ofproto/json/of12/3-60-ofp_flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-60-ofp_flow_mod.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-61-ofp_group_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-61-ofp_group_stats_request.packet.json
index 2d1afdc0..2d1afdc0 100644
--- a/tests/unit/ofproto/json/of12/3-61-ofp_group_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-61-ofp_group_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-62-ofp_group_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-62-ofp_group_stats_reply.packet.json
index 8cb8f8ce..8cb8f8ce 100644
--- a/tests/unit/ofproto/json/of12/3-62-ofp_group_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-62-ofp_group_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-7-ofp_set_config.packet.json b/ryu/tests/unit/ofproto/json/of12/3-7-ofp_set_config.packet.json
index cd5398b7..cd5398b7 100644
--- a/tests/unit/ofproto/json/of12/3-7-ofp_set_config.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-7-ofp_set_config.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-8-ofp_get_config_request.packet.json b/ryu/tests/unit/ofproto/json/of12/3-8-ofp_get_config_request.packet.json
index 06fe51f4..06fe51f4 100644
--- a/tests/unit/ofproto/json/of12/3-8-ofp_get_config_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-8-ofp_get_config_request.packet.json
diff --git a/tests/unit/ofproto/json/of12/3-9-ofp_get_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-9-ofp_get_config_reply.packet.json
index 62b37b4d..62b37b4d 100644
--- a/tests/unit/ofproto/json/of12/3-9-ofp_get_config_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/3-9-ofp_get_config_reply.packet.json
diff --git a/tests/unit/ofproto/json/of12/lib-ofctl-ofp_group_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_group_stats_request.packet.json
index 542ae726..542ae726 100644
--- a/tests/unit/ofproto/json/of12/lib-ofctl-ofp_group_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_group_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of12/lib-ofctl-ofp_port_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_port_stats_request.packet.json
index 884c5fd2..884c5fd2 100644
--- a/tests/unit/ofproto/json/of12/lib-ofctl-ofp_port_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_port_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_get_config_request.packet.json b/ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_get_config_request.packet.json
index a50308c0..a50308c0 100644
--- a/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_get_config_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_get_config_request.packet.json
diff --git a/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet1.json b/ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet1.json
index 77535806..77535806 100644
--- a/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet1.json
+++ b/ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet1.json
diff --git a/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet2.json b/ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet2.json
index 66127d31..66127d31 100644
--- a/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet2.json
+++ b/ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet2.json
diff --git a/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet3.json b/ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet3.json
index 1a798837..1a798837 100644
--- a/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet3.json
+++ b/ryu/tests/unit/ofproto/json/of12/lib-ofctl-ofp_queue_stats_request.packet3.json
diff --git a/tests/unit/ofproto/json/of12/libofproto-OFP12-ofp_packet_out_packet_library.packet.json b/ryu/tests/unit/ofproto/json/of12/libofproto-OFP12-ofp_packet_out_packet_library.packet.json
index b859650d..b859650d 100644
--- a/tests/unit/ofproto/json/of12/libofproto-OFP12-ofp_packet_out_packet_library.packet.json
+++ b/ryu/tests/unit/ofproto/json/of12/libofproto-OFP12-ofp_packet_out_packet_library.packet.json
diff --git a/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 26e5dc2d..26e5dc2d 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of13/4-1-ofp_packet_out.packet.json b/ryu/tests/unit/ofproto/json/of13/4-1-ofp_packet_out.packet.json
index efb39e2d..efb39e2d 100644
--- a/tests/unit/ofproto/json/of13/4-1-ofp_packet_out.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-1-ofp_packet_out.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-10-ofp_hello.packet.json b/ryu/tests/unit/ofproto/json/of13/4-10-ofp_hello.packet.json
index d03ff84b..d03ff84b 100644
--- a/tests/unit/ofproto/json/of13/4-10-ofp_hello.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-10-ofp_hello.packet.json
diff --git a/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 2baccad4..2baccad4 100644
--- a/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
diff --git a/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 04339dc3..04339dc3 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of13/4-13-ofp_echo_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-13-ofp_echo_request.packet.json
index e1f2af42..e1f2af42 100644
--- a/tests/unit/ofproto/json/of13/4-13-ofp_echo_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-13-ofp_echo_request.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-14-ofp_echo_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-14-ofp_echo_reply.packet.json
index 2a573634..2a573634 100644
--- a/tests/unit/ofproto/json/of13/4-14-ofp_echo_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-14-ofp_echo_reply.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-15-ofp_error_msg.packet.json b/ryu/tests/unit/ofproto/json/of13/4-15-ofp_error_msg.packet.json
index e9ab2b5e..e9ab2b5e 100644
--- a/tests/unit/ofproto/json/of13/4-15-ofp_error_msg.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-15-ofp_error_msg.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-16-ofp_experimenter.packet.json b/ryu/tests/unit/ofproto/json/of13/4-16-ofp_experimenter.packet.json
index 4ad13c73..4ad13c73 100644
--- a/tests/unit/ofproto/json/of13/4-16-ofp_experimenter.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-16-ofp_experimenter.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-17-ofp_barrier_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-17-ofp_barrier_request.packet.json
index 2aae9ec3..2aae9ec3 100644
--- a/tests/unit/ofproto/json/of13/4-17-ofp_barrier_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-17-ofp_barrier_request.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-18-ofp_barrier_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-18-ofp_barrier_reply.packet.json
index 11f8cfcc..11f8cfcc 100644
--- a/tests/unit/ofproto/json/of13/4-18-ofp_barrier_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-18-ofp_barrier_reply.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-19-ofp_role_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-19-ofp_role_request.packet.json
index 5cdbc2f1..5cdbc2f1 100644
--- a/tests/unit/ofproto/json/of13/4-19-ofp_role_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-19-ofp_role_request.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json
index 0e3a2cc3..0e3a2cc3 100644
--- a/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-20-ofp_role_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-20-ofp_role_reply.packet.json
index 3fd9a13f..3fd9a13f 100644
--- a/tests/unit/ofproto/json/of13/4-20-ofp_role_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-20-ofp_role_reply.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-21-ofp_group_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-21-ofp_group_mod.packet.json
index 1a3767da..1a3767da 100644
--- a/tests/unit/ofproto/json/of13/4-21-ofp_group_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-21-ofp_group_mod.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-22-ofp_port_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-22-ofp_port_mod.packet.json
index ecb8d66f..ecb8d66f 100644
--- a/tests/unit/ofproto/json/of13/4-22-ofp_port_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-22-ofp_port_mod.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-23-ofp_table_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-23-ofp_table_mod.packet.json
index 5019c29b..5019c29b 100644
--- a/tests/unit/ofproto/json/of13/4-23-ofp_table_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-23-ofp_table_mod.packet.json
diff --git a/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 5b23f8bc..5b23f8bc 100644
--- a/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
diff --git a/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 248131fd..248131fd 100644
--- a/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
diff --git a/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 153ad4f0..153ad4f0 100644
--- a/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
diff --git a/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 1f965d77..1f965d77 100644
--- a/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
diff --git a/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 94801adb..94801adb 100644
--- a/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
diff --git a/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 5228710d..5228710d 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of13/4-3-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-3-ofp_flow_mod.packet.json
index cd68b51f..cd68b51f 100644
--- a/tests/unit/ofproto/json/of13/4-3-ofp_flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-3-ofp_flow_mod.packet.json
diff --git a/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 01157449..01157449 100644
--- a/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
diff --git a/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 edba5dc5..edba5dc5 100644
--- a/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
diff --git a/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 f059f994..f059f994 100644
--- a/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
diff --git a/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 bea140c2..bea140c2 100644
--- a/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
diff --git a/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 c30d7da6..c30d7da6 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of13/4-35-ofp_queue_get_config_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-35-ofp_queue_get_config_request.packet.json
index a50308c0..a50308c0 100644
--- a/tests/unit/ofproto/json/of13/4-35-ofp_queue_get_config_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-35-ofp_queue_get_config_request.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-36-ofp_queue_get_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-36-ofp_queue_get_config_reply.packet.json
index ce1f4123..ce1f4123 100644
--- a/tests/unit/ofproto/json/of13/4-36-ofp_queue_get_config_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-36-ofp_queue_get_config_reply.packet.json
diff --git a/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 7a12acc3..7a12acc3 100644
--- a/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
diff --git a/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 80b59cf2..80b59cf2 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of13/4-39-ofp_port_status.packet.json b/ryu/tests/unit/ofproto/json/of13/4-39-ofp_port_status.packet.json
index a842932e..a842932e 100644
--- a/tests/unit/ofproto/json/of13/4-39-ofp_port_status.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-39-ofp_port_status.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-4-ofp_packet_in.packet.json b/ryu/tests/unit/ofproto/json/of13/4-4-ofp_packet_in.packet.json
index b3051d1c..b3051d1c 100644
--- a/tests/unit/ofproto/json/of13/4-4-ofp_packet_in.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-4-ofp_packet_in.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-40-ofp_flow_removed.packet.json b/ryu/tests/unit/ofproto/json/of13/4-40-ofp_flow_removed.packet.json
index 994953e6..994953e6 100644
--- a/tests/unit/ofproto/json/of13/4-40-ofp_flow_removed.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-40-ofp_flow_removed.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-41-ofp_error_msg_experimenter.packet.json b/ryu/tests/unit/ofproto/json/of13/4-41-ofp_error_msg_experimenter.packet.json
index 37bfb6a9..37bfb6a9 100644
--- a/tests/unit/ofproto/json/of13/4-41-ofp_error_msg_experimenter.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-41-ofp_error_msg_experimenter.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-42-ofp_get_async_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-42-ofp_get_async_request.packet.json
index 7daa5a0f..7daa5a0f 100644
--- a/tests/unit/ofproto/json/of13/4-42-ofp_get_async_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-42-ofp_get_async_request.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-43-ofp_get_async_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-43-ofp_get_async_reply.packet.json
index abccf043..abccf043 100644
--- a/tests/unit/ofproto/json/of13/4-43-ofp_get_async_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-43-ofp_get_async_reply.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-44-ofp_set_async.packet.json b/ryu/tests/unit/ofproto/json/of13/4-44-ofp_set_async.packet.json
index da85b880..da85b880 100644
--- a/tests/unit/ofproto/json/of13/4-44-ofp_set_async.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-44-ofp_set_async.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-45-ofp_meter_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-45-ofp_meter_mod.packet.json
index eba4540a..eba4540a 100644
--- a/tests/unit/ofproto/json/of13/4-45-ofp_meter_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-45-ofp_meter_mod.packet.json
diff --git a/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 f4e59c76..f4e59c76 100644
--- a/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
diff --git a/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 4703588e..4703588e 100644
--- a/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
diff --git a/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 08cc97e6..08cc97e6 100644
--- a/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
diff --git a/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 8d45799b..8d45799b 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of13/4-5-ofp_features_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-5-ofp_features_request.packet.json
index 8f48ad5a..8f48ad5a 100644
--- a/tests/unit/ofproto/json/of13/4-5-ofp_features_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-5-ofp_features_request.packet.json
diff --git a/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 b4fd8226..b4fd8226 100644
--- a/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
diff --git a/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 7363a342..7363a342 100644
--- a/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
diff --git a/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 e3f6918f..e3f6918f 100644
--- a/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
diff --git a/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 f166c34a..f166c34a 100644
--- a/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
diff --git a/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 5da460a0..5da460a0 100644
--- a/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
diff --git a/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 2a1a4308..2a1a4308 100644
--- a/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
diff --git a/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 ea056e8f..ea056e8f 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of13/4-57-ofp_group_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-57-ofp_group_stats_request.packet.json
index b200a81c..b200a81c 100644
--- a/tests/unit/ofproto/json/of13/4-57-ofp_group_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-57-ofp_group_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-58-ofp_group_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-58-ofp_group_stats_reply.packet.json
index cb979e54..cb979e54 100644
--- a/tests/unit/ofproto/json/of13/4-58-ofp_group_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-58-ofp_group_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-59-ofp_packet_in.packet.json b/ryu/tests/unit/ofproto/json/of13/4-59-ofp_packet_in.packet.json
index c5837d26..c5837d26 100644
--- a/tests/unit/ofproto/json/of13/4-59-ofp_packet_in.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-59-ofp_packet_in.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-6-ofp_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-6-ofp_features_reply.packet.json
index 12e8744a..12e8744a 100644
--- a/tests/unit/ofproto/json/of13/4-6-ofp_features_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-6-ofp_features_reply.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-60-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-60-ofp_flow_mod.packet.json
index 1c594e8f..1c594e8f 100644
--- a/tests/unit/ofproto/json/of13/4-60-ofp_flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-60-ofp_flow_mod.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-61-ofp_experimenter_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-61-ofp_experimenter_request.packet.json
index 93af3039..93af3039 100644
--- a/tests/unit/ofproto/json/of13/4-61-ofp_experimenter_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-61-ofp_experimenter_request.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-62-ofp_experimenter_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-62-ofp_experimenter_reply.packet.json
index 1eb06b84..1eb06b84 100644
--- a/tests/unit/ofproto/json/of13/4-62-ofp_experimenter_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-62-ofp_experimenter_reply.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-63-onf_flow_monitor_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-63-onf_flow_monitor_request.packet.json
index c5e166d8..c5e166d8 100644
--- a/tests/unit/ofproto/json/of13/4-63-onf_flow_monitor_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-63-onf_flow_monitor_request.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-7-ofp_set_config.packet.json b/ryu/tests/unit/ofproto/json/of13/4-7-ofp_set_config.packet.json
index cd5398b7..cd5398b7 100644
--- a/tests/unit/ofproto/json/of13/4-7-ofp_set_config.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-7-ofp_set_config.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-8-ofp_get_config_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-8-ofp_get_config_request.packet.json
index 06fe51f4..06fe51f4 100644
--- a/tests/unit/ofproto/json/of13/4-8-ofp_get_config_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-8-ofp_get_config_request.packet.json
diff --git a/tests/unit/ofproto/json/of13/4-9-ofp_get_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-9-ofp_get_config_reply.packet.json
index 62b37b4d..62b37b4d 100644
--- a/tests/unit/ofproto/json/of13/4-9-ofp_get_config_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-9-ofp_get_config_reply.packet.json
diff --git a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_group_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_group_stats_request.packet.json
index 311b0381..311b0381 100644
--- a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_group_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_group_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_meter_config_request.packet.json b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_meter_config_request.packet.json
index 9967bd29..9967bd29 100644
--- a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_meter_config_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_meter_config_request.packet.json
diff --git a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_meter_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_meter_stats_request.packet.json
index 570c2b6d..570c2b6d 100644
--- a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_meter_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_meter_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_port_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_port_stats_request.packet.json
index f1258076..f1258076 100644
--- a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_port_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_port_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_get_config_request.packet.json b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_get_config_request.packet.json
index a50308c0..a50308c0 100644
--- a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_get_config_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_get_config_request.packet.json
diff --git a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet1.json b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet1.json
index b216fe97..b216fe97 100644
--- a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet1.json
+++ b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet1.json
diff --git a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet2.json b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet2.json
index cc00e1ea..cc00e1ea 100644
--- a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet2.json
+++ b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet2.json
diff --git a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet3.json b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet3.json
index 5f6579be..5f6579be 100644
--- a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet3.json
+++ b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_queue_stats_request.packet3.json
diff --git a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_table_features_request.packet.json b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_table_features_request.packet.json
index 6501de15..6501de15 100644
--- a/tests/unit/ofproto/json/of13/lib-ofctl-ofp_table_features_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/lib-ofctl-ofp_table_features_request.packet.json
diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_reply.packet.json
index 011bd6de..011bd6de 100644
--- a/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_reply.packet.json
diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_request.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_request.packet.json
index 501a8479..501a8479 100644
--- a/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-echo_request.packet.json
diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-error_msg.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-error_msg.packet.json
index b12d0d9a..b12d0d9a 100644
--- a/tests/unit/ofproto/json/of13/libofproto-OFP13-error_msg.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-error_msg.packet.json
diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-features_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-features_reply.packet.json
index 3d828093..3d828093 100644
--- a/tests/unit/ofproto/json/of13/libofproto-OFP13-features_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-features_reply.packet.json
diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.json
index 7de40ef3..7de40ef3 100644
--- a/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.json
diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.truncated64.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.truncated64.json
index 707e3096..707e3096 100644
--- a/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.truncated64.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.truncated64.json
diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_conjunction.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_conjunction.packet.json
index 209067e8..209067e8 100644
--- a/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_conjunction.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_conjunction.packet.json
diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_match_conj.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_match_conj.packet.json
index 4fd8c4d4..4fd8c4d4 100644
--- a/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_match_conj.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_match_conj.packet.json
diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_removed.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_removed.packet.json
index 63ec9424..63ec9424 100644
--- a/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_removed.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_removed.packet.json
diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-get_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-get_config_reply.packet.json
index 62b37b4d..62b37b4d 100644
--- a/tests/unit/ofproto/json/of13/libofproto-OFP13-get_config_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-get_config_reply.packet.json
diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-hello.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-hello.packet.json
index 5a116313..5a116313 100644
--- a/tests/unit/ofproto/json/of13/libofproto-OFP13-hello.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-hello.packet.json
diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-meter_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-meter_mod.packet.json
index 5bb43719..5bb43719 100644
--- a/tests/unit/ofproto/json/of13/libofproto-OFP13-meter_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-meter_mod.packet.json
diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-ofp_packet_out_packet_library.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-ofp_packet_out_packet_library.packet.json
index 4e8ad336..4e8ad336 100644
--- a/tests/unit/ofproto/json/of13/libofproto-OFP13-ofp_packet_out_packet_library.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-ofp_packet_out_packet_library.packet.json
diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-packet_in.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-packet_in.packet.json
index e5fd0bd9..e5fd0bd9 100644
--- a/tests/unit/ofproto/json/of13/libofproto-OFP13-packet_in.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-packet_in.packet.json
diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-port_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-port_mod.packet.json
index 5c6c29a0..5c6c29a0 100644
--- a/tests/unit/ofproto/json/of13/libofproto-OFP13-port_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-port_mod.packet.json
diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-port_status.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-port_status.packet.json
index b82d10ee..b82d10ee 100644
--- a/tests/unit/ofproto/json/of13/libofproto-OFP13-port_status.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-port_status.packet.json
diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-set_config.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-set_config.packet.json
index cd5398b7..cd5398b7 100644
--- a/tests/unit/ofproto/json/of13/libofproto-OFP13-set_config.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-set_config.packet.json
diff --git a/tests/unit/ofproto/json/of13/libofproto-OFP13-table_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-table_mod.packet.json
index 5019c29b..5019c29b 100644
--- a/tests/unit/ofproto/json/of13/libofproto-OFP13-table_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-table_mod.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_conjunction.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_conjunction.packet.json
index edc10939..edc10939 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_conjunction.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_conjunction.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller.packet.json
index 95bc3f51..95bc3f51 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller2.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller2.packet.json
index f5e57f3d..f5e57f3d 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller2.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller2.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct.packet.json
index b1157e9a..b1157e9a 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_exec.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_exec.packet.json
index e3fcd3bc..e3fcd3bc 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_exec.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_exec.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_nat.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_nat.packet.json
index 5a38d8f7..5a38d8f7 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_nat.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_nat.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_nat_v6.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_nat_v6.packet.json
index 5c1c8c07..5c1c8c07 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_nat_v6.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_nat_v6.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_dec_ttl_cnt_ids.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_dec_ttl_cnt_ids.packet.json
index c5e44d07..c5e44d07 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_dec_ttl_cnt_ids.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_dec_ttl_cnt_ids.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_fintimeout.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_fintimeout.packet.json
index c0e02de9..c0e02de9 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_fintimeout.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_fintimeout.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_learn.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_learn.packet.json
index c874c2e9..c874c2e9 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_learn.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_learn.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_note.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_note.packet.json
index 330000da..330000da 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_note.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_note.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_output_trunc.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_output_trunc.packet.json
index 84657335..84657335 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_output_trunc.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_output_trunc.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_resubmit.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_resubmit.packet.json
index 1fdedc55..1fdedc55 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_resubmit.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_resubmit.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_sample.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_sample.packet.json
index a5a374ad..a5a374ad 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_sample.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_sample.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_sample2.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_sample2.packet.json
index c767bff3..c767bff3 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_sample2.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_sample2.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_stack_pop.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_stack_pop.packet.json
index 0322a36a..0322a36a 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_stack_pop.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_stack_pop.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_stack_push.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_stack_push.packet.json
index 86d29e74..86d29e74 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_stack_push.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_stack_push.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_conj.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_conj.packet.json
index 6b1c2864..6b1c2864 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_conj.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_conj.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_load_nx_register.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_load_nx_register.packet.json
index c60851a0..c60851a0 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_load_nx_register.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_load_nx_register.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_move_nx_register.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_move_nx_register.packet.json
index 7457278b..7457278b 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_move_nx_register.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_move_nx_register.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark.packet.json
index 61aee954..61aee954 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark.packet.json
diff --git a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet.json b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet.json
index a7bd2367..a7bd2367 100644
--- a/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-match_pkt_mark_masked.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-0-ofp_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-0-ofp_desc_reply.packet.json
index 26e5dc2d..26e5dc2d 100644
--- a/tests/unit/ofproto/json/of14/5-0-ofp_desc_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-0-ofp_desc_reply.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-1-ofp_packet_out.packet.json b/ryu/tests/unit/ofproto/json/of14/5-1-ofp_packet_out.packet.json
index efb39e2d..efb39e2d 100644
--- a/tests/unit/ofproto/json/of14/5-1-ofp_packet_out.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-1-ofp_packet_out.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-10-ofp_hello.packet.json b/ryu/tests/unit/ofproto/json/of14/5-10-ofp_hello.packet.json
index d03ff84b..d03ff84b 100644
--- a/tests/unit/ofproto/json/of14/5-10-ofp_hello.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-10-ofp_hello.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-11-ofp_flow_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-11-ofp_flow_stats_request.packet.json
index 2baccad4..2baccad4 100644
--- a/tests/unit/ofproto/json/of14/5-11-ofp_flow_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-11-ofp_flow_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-12-ofp_flow_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-12-ofp_flow_stats_reply.packet.json
index 42eacf37..42eacf37 100644
--- a/tests/unit/ofproto/json/of14/5-12-ofp_flow_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-12-ofp_flow_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-13-ofp_echo_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-13-ofp_echo_request.packet.json
index e1f2af42..e1f2af42 100644
--- a/tests/unit/ofproto/json/of14/5-13-ofp_echo_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-13-ofp_echo_request.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-14-ofp_echo_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-14-ofp_echo_reply.packet.json
index 2a573634..2a573634 100644
--- a/tests/unit/ofproto/json/of14/5-14-ofp_echo_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-14-ofp_echo_reply.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-15-ofp_error_msg.packet.json b/ryu/tests/unit/ofproto/json/of14/5-15-ofp_error_msg.packet.json
index e9ab2b5e..e9ab2b5e 100644
--- a/tests/unit/ofproto/json/of14/5-15-ofp_error_msg.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-15-ofp_error_msg.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-16-ofp_experimenter.packet.json b/ryu/tests/unit/ofproto/json/of14/5-16-ofp_experimenter.packet.json
index 4ad13c73..4ad13c73 100644
--- a/tests/unit/ofproto/json/of14/5-16-ofp_experimenter.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-16-ofp_experimenter.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-17-ofp_barrier_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-17-ofp_barrier_request.packet.json
index 2aae9ec3..2aae9ec3 100644
--- a/tests/unit/ofproto/json/of14/5-17-ofp_barrier_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-17-ofp_barrier_request.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-18-ofp_barrier_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-18-ofp_barrier_reply.packet.json
index 11f8cfcc..11f8cfcc 100644
--- a/tests/unit/ofproto/json/of14/5-18-ofp_barrier_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-18-ofp_barrier_reply.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-19-ofp_role_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-19-ofp_role_request.packet.json
index 5cdbc2f1..5cdbc2f1 100644
--- a/tests/unit/ofproto/json/of14/5-19-ofp_role_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-19-ofp_role_request.packet.json
diff --git a/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 5f789d52..5f789d52 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of14/5-20-ofp_role_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-20-ofp_role_reply.packet.json
index 3fd9a13f..3fd9a13f 100644
--- a/tests/unit/ofproto/json/of14/5-20-ofp_role_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-20-ofp_role_reply.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-21-ofp_group_mod.packet.json b/ryu/tests/unit/ofproto/json/of14/5-21-ofp_group_mod.packet.json
index 1a3767da..1a3767da 100644
--- a/tests/unit/ofproto/json/of14/5-21-ofp_group_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-21-ofp_group_mod.packet.json
diff --git a/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..a255b9dd 100644
--- a/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
diff --git a/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..97acd144 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of14/5-24-ofp_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-24-ofp_desc_request.packet.json
index 5b23f8bc..5b23f8bc 100644
--- a/tests/unit/ofproto/json/of14/5-24-ofp_desc_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-24-ofp_desc_request.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-25-ofp_aggregate_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-25-ofp_aggregate_stats_request.packet.json
index 248131fd..248131fd 100644
--- a/tests/unit/ofproto/json/of14/5-25-ofp_aggregate_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-25-ofp_aggregate_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-26-ofp_aggregate_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-26-ofp_aggregate_stats_reply.packet.json
index 153ad4f0..153ad4f0 100644
--- a/tests/unit/ofproto/json/of14/5-26-ofp_aggregate_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-26-ofp_aggregate_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-27-ofp_table_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-27-ofp_table_stats_request.packet.json
index 1f965d77..1f965d77 100644
--- a/tests/unit/ofproto/json/of14/5-27-ofp_table_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-27-ofp_table_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-28-ofp_table_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-28-ofp_table_stats_reply.packet.json
index 94801adb..94801adb 100644
--- a/tests/unit/ofproto/json/of14/5-28-ofp_table_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-28-ofp_table_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-29-ofp_port_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-29-ofp_port_stats_request.packet.json
index 5228710d..5228710d 100644
--- a/tests/unit/ofproto/json/of14/5-29-ofp_port_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-29-ofp_port_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-3-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of14/5-3-ofp_flow_mod.packet.json
index 061e3cd0..061e3cd0 100644
--- a/tests/unit/ofproto/json/of14/5-3-ofp_flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-3-ofp_flow_mod.packet.json
diff --git a/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..4ea41742 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of14/5-31-ofp_group_features_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-31-ofp_group_features_request.packet.json
index edba5dc5..edba5dc5 100644
--- a/tests/unit/ofproto/json/of14/5-31-ofp_group_features_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-31-ofp_group_features_request.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-32-ofp_group_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-32-ofp_group_features_reply.packet.json
index f059f994..f059f994 100644
--- a/tests/unit/ofproto/json/of14/5-32-ofp_group_features_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-32-ofp_group_features_reply.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-33-ofp_group_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-33-ofp_group_desc_request.packet.json
index bea140c2..bea140c2 100644
--- a/tests/unit/ofproto/json/of14/5-33-ofp_group_desc_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-33-ofp_group_desc_request.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-34-ofp_group_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-34-ofp_group_desc_reply.packet.json
index c30d7da6..c30d7da6 100644
--- a/tests/unit/ofproto/json/of14/5-34-ofp_group_desc_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-34-ofp_group_desc_reply.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-35-ofp_queue_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-35-ofp_queue_stats_request.packet.json
index 7a12acc3..7a12acc3 100644
--- a/tests/unit/ofproto/json/of14/5-35-ofp_queue_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-35-ofp_queue_stats_request.packet.json
diff --git a/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..2c190977 100644
--- a/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
diff --git a/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..b273ac22 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of14/5-38-ofp_flow_removed.packet.json b/ryu/tests/unit/ofproto/json/of14/5-38-ofp_flow_removed.packet.json
index 994953e6..994953e6 100644
--- a/tests/unit/ofproto/json/of14/5-38-ofp_flow_removed.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-38-ofp_flow_removed.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-39-ofp_error_msg_experimenter.packet.json b/ryu/tests/unit/ofproto/json/of14/5-39-ofp_error_msg_experimenter.packet.json
index 37bfb6a9..37bfb6a9 100644
--- a/tests/unit/ofproto/json/of14/5-39-ofp_error_msg_experimenter.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-39-ofp_error_msg_experimenter.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-4-ofp_packet_in.packet.json b/ryu/tests/unit/ofproto/json/of14/5-4-ofp_packet_in.packet.json
index b281edd7..b281edd7 100644
--- a/tests/unit/ofproto/json/of14/5-4-ofp_packet_in.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-4-ofp_packet_in.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-40-ofp_get_async_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-40-ofp_get_async_request.packet.json
index 7daa5a0f..7daa5a0f 100644
--- a/tests/unit/ofproto/json/of14/5-40-ofp_get_async_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-40-ofp_get_async_request.packet.json
diff --git a/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 82c9e794..82c9e794 100644
--- a/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
diff --git a/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 0802c14e..0802c14e 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of14/5-43-ofp_meter_mod.packet.json b/ryu/tests/unit/ofproto/json/of14/5-43-ofp_meter_mod.packet.json
index eba4540a..eba4540a 100644
--- a/tests/unit/ofproto/json/of14/5-43-ofp_meter_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-43-ofp_meter_mod.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-44-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of14/5-44-ofp_flow_mod.packet.json
index b8c28362..b8c28362 100644
--- a/tests/unit/ofproto/json/of14/5-44-ofp_flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-44-ofp_flow_mod.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-45-ofp_meter_config_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-45-ofp_meter_config_request.packet.json
index 4703588e..4703588e 100644
--- a/tests/unit/ofproto/json/of14/5-45-ofp_meter_config_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-45-ofp_meter_config_request.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-46-ofp_meter_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-46-ofp_meter_config_reply.packet.json
index 08cc97e6..08cc97e6 100644
--- a/tests/unit/ofproto/json/of14/5-46-ofp_meter_config_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-46-ofp_meter_config_reply.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-47-ofp_meter_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-47-ofp_meter_stats_request.packet.json
index 8d45799b..8d45799b 100644
--- a/tests/unit/ofproto/json/of14/5-47-ofp_meter_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-47-ofp_meter_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-48-ofp_meter_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-48-ofp_meter_stats_reply.packet.json
index b4fd8226..b4fd8226 100644
--- a/tests/unit/ofproto/json/of14/5-48-ofp_meter_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-48-ofp_meter_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-49-ofp_meter_features_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-49-ofp_meter_features_request.packet.json
index 7363a342..7363a342 100644
--- a/tests/unit/ofproto/json/of14/5-49-ofp_meter_features_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-49-ofp_meter_features_request.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-5-ofp_features_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-5-ofp_features_request.packet.json
index 8f48ad5a..8f48ad5a 100644
--- a/tests/unit/ofproto/json/of14/5-5-ofp_features_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-5-ofp_features_request.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-50-ofp_meter_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-50-ofp_meter_features_reply.packet.json
index e3f6918f..e3f6918f 100644
--- a/tests/unit/ofproto/json/of14/5-50-ofp_meter_features_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-50-ofp_meter_features_reply.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-51-ofp_port_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-51-ofp_port_desc_request.packet.json
index f166c34a..f166c34a 100644
--- a/tests/unit/ofproto/json/of14/5-51-ofp_port_desc_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-51-ofp_port_desc_request.packet.json
diff --git a/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..c281c0f8 100644
--- a/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
diff --git a/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..2a1a4308 100644
--- a/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
diff --git a/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..ea056e8f 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of14/5-55-ofp_group_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-55-ofp_group_stats_request.packet.json
index b200a81c..b200a81c 100644
--- a/tests/unit/ofproto/json/of14/5-55-ofp_group_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-55-ofp_group_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-56-ofp_group_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-56-ofp_group_stats_reply.packet.json
index cb979e54..cb979e54 100644
--- a/tests/unit/ofproto/json/of14/5-56-ofp_group_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-56-ofp_group_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-57-ofp_packet_in.packet.json b/ryu/tests/unit/ofproto/json/of14/5-57-ofp_packet_in.packet.json
index d326b907..d326b907 100644
--- a/tests/unit/ofproto/json/of14/5-57-ofp_packet_in.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-57-ofp_packet_in.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-58-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of14/5-58-ofp_flow_mod.packet.json
index 7095f751..7095f751 100644
--- a/tests/unit/ofproto/json/of14/5-58-ofp_flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-58-ofp_flow_mod.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-59-ofp_experimenter_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-59-ofp_experimenter_request.packet.json
index 93af3039..93af3039 100644
--- a/tests/unit/ofproto/json/of14/5-59-ofp_experimenter_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-59-ofp_experimenter_request.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-6-ofp_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-6-ofp_features_reply.packet.json
index 12e8744a..12e8744a 100644
--- a/tests/unit/ofproto/json/of14/5-6-ofp_features_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-6-ofp_features_reply.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-60-ofp_experimenter_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-60-ofp_experimenter_reply.packet.json
index 1eb06b84..1eb06b84 100644
--- a/tests/unit/ofproto/json/of14/5-60-ofp_experimenter_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-60-ofp_experimenter_reply.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-61-ofp_table_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-61-ofp_table_desc_request.packet.json
index f5a4cde0..f5a4cde0 100644
--- a/tests/unit/ofproto/json/of14/5-61-ofp_table_desc_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-61-ofp_table_desc_request.packet.json
diff --git a/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..1f3d7142 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of14/5-63-ofp_queue_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-63-ofp_queue_desc_request.packet.json
index d58a2b05..d58a2b05 100644
--- a/tests/unit/ofproto/json/of14/5-63-ofp_queue_desc_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-63-ofp_queue_desc_request.packet.json
diff --git a/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..26c8f7d5 100644
--- a/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
diff --git a/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..08e46df3 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of14/5-66-ofp_flow_monitor_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-66-ofp_flow_monitor_request.packet.json
index aed7ddaa..aed7ddaa 100644
--- a/tests/unit/ofproto/json/of14/5-66-ofp_flow_monitor_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-66-ofp_flow_monitor_request.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-67-ofp_flow_monitor_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-67-ofp_flow_monitor_reply.packet.json
index 8c028877..8c028877 100644
--- a/tests/unit/ofproto/json/of14/5-67-ofp_flow_monitor_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-67-ofp_flow_monitor_reply.packet.json
diff --git a/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 fde5fb77..fde5fb77 100644
--- a/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
diff --git a/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 3e996eb5..3e996eb5 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of14/5-7-ofp_set_config.packet.json b/ryu/tests/unit/ofproto/json/of14/5-7-ofp_set_config.packet.json
index cd5398b7..cd5398b7 100644
--- a/tests/unit/ofproto/json/of14/5-7-ofp_set_config.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-7-ofp_set_config.packet.json
diff --git a/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 53e9f7ea..53e9f7ea 100644
--- a/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
diff --git a/tests/unit/ofproto/json/of14/5-71-ofp_requestforward.packet.json b/ryu/tests/unit/ofproto/json/of14/5-71-ofp_requestforward.packet.json
index e2def4fc..e2def4fc 100644
--- a/tests/unit/ofproto/json/of14/5-71-ofp_requestforward.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-71-ofp_requestforward.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-8-ofp_get_config_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-8-ofp_get_config_request.packet.json
index 06fe51f4..06fe51f4 100644
--- a/tests/unit/ofproto/json/of14/5-8-ofp_get_config_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-8-ofp_get_config_request.packet.json
diff --git a/tests/unit/ofproto/json/of14/5-9-ofp_get_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-9-ofp_get_config_reply.packet.json
index 62b37b4d..62b37b4d 100644
--- a/tests/unit/ofproto/json/of14/5-9-ofp_get_config_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-9-ofp_get_config_reply.packet.json
diff --git a/tests/unit/ofproto/json/of14/lib-ofctl-ofp_table_features_request.packet.json b/ryu/tests/unit/ofproto/json/of14/lib-ofctl-ofp_table_features_request.packet.json
index 6501de15..6501de15 100644
--- a/tests/unit/ofproto/json/of14/lib-ofctl-ofp_table_features_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/lib-ofctl-ofp_table_features_request.packet.json
diff --git a/tests/unit/ofproto/json/of14/libofproto-OFP14-ofp_packet_out_packet_library.packet.json b/ryu/tests/unit/ofproto/json/of14/libofproto-OFP14-ofp_packet_out_packet_library.packet.json
index b859650d..b859650d 100644
--- a/tests/unit/ofproto/json/of14/libofproto-OFP14-ofp_packet_out_packet_library.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/libofproto-OFP14-ofp_packet_out_packet_library.packet.json
diff --git a/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_desc_reply.packet.json
index 9626ceea..9626ceea 100644
--- a/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_desc_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_desc_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_desc_request.packet.json
index 62e46c65..62e46c65 100644
--- a/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_desc_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_desc_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_mod.packet.json
index 7fc12ed3..7fc12ed3 100644
--- a/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/lib-ofctl-OFP15-flow_mod.packet.json
diff --git a/tests/unit/ofproto/json/of15/lib-ofctl-ofp_queue_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of15/lib-ofctl-ofp_queue_stats_request.packet.json
index 41d30f70..41d30f70 100644
--- a/tests/unit/ofproto/json/of15/lib-ofctl-ofp_queue_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/lib-ofctl-ofp_queue_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/lib-ofctl-ofp_table_features_request.packet.json b/ryu/tests/unit/ofproto/json/of15/lib-ofctl-ofp_table_features_request.packet.json
index 6501de15..6501de15 100644
--- a/tests/unit/ofproto/json/of15/lib-ofctl-ofp_table_features_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/lib-ofctl-ofp_table_features_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json
index 07cb6c2f..07cb6c2f 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_request.packet.json
index 248131fd..248131fd 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-aggregate_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_reply.packet.json
index 11f8cfcc..11f8cfcc 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_request.packet.json
index 2aae9ec3..2aae9ec3 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-barrier_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json
index 5a1ddb19..5a1ddb19 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_ctrl.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_ctrl.packet.json
index d7e858fd..d7e858fd 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_ctrl.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_ctrl.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_reply.packet.json
index 943d7857..943d7857 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_request.packet.json
index 325181c1..325181c1 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_features_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status.packet.json
index d9a74bfe..d9a74bfe 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_reply.packet.json
index 002f0f1d..002f0f1d 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_request.packet.json
index d9a8ef8b..d9a8ef8b 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-controller_status_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-desc_reply.packet.json
index 26e5dc2d..26e5dc2d 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-desc_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-desc_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-desc_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-desc_request.packet.json
index 5b23f8bc..5b23f8bc 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-desc_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-desc_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_reply.packet.json
index 011bd6de..011bd6de 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_request.packet.json
index 501a8479..501a8479 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-echo_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg.packet.json
index b76f05c7..b76f05c7 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg_experimenter.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg_experimenter.packet.json
index 37bfb6a9..37bfb6a9 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg_experimenter.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-error_msg_experimenter.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter.packet.json
index 0e749179..0e749179 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_reply.packet.json
index 1eb06b84..1eb06b84 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_request.packet.json
index 93af3039..93af3039 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-experimenter_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-features_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-features_reply.packet.json
index 3d828093..3d828093 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-features_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-features_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-features_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-features_request.packet.json
index 8f48ad5a..8f48ad5a 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-features_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-features_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_reply.packet.json
index 3caab6f9..3caab6f9 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_request.packet.json
index 62e46c65..62e46c65 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_desc_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json
index ac6dce7e..ac6dce7e 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_conjunction.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_conjunction.packet.json
index 6ca74d51..6ca74d51 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_conjunction.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_conjunction.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json
index 2d0b9ad4..2d0b9ad4 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_no_nx.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_no_nx.packet.json
index 5f789d52..5f789d52 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_no_nx.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_no_nx.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_reply.packet.json
index 8c028877..8c028877 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_request.packet.json
index aed7ddaa..aed7ddaa 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_monitor_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_removed.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_removed.packet.json
index daf05248..daf05248 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_removed.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_removed.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_reply.packet.json
index e2713569..e2713569 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_request.packet.json
index cc9de0a6..cc9de0a6 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_reply.packet.json
index 82c9e794..82c9e794 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_request.packet.json
index 7daa5a0f..7daa5a0f 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_async_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_reply.packet.json
index 62b37b4d..62b37b4d 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_request.packet.json
index 06fe51f4..06fe51f4 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-get_config_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_reply.packet.json
index 03c136d7..03c136d7 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_request.packet.json
index 1589ed61..1589ed61 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_reply.packet.json
index f059f994..f059f994 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_request.packet.json
index edba5dc5..edba5dc5 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_features_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_mod.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_mod.packet.json
index d168fefd..d168fefd 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_mod.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_reply.packet.json
index cb979e54..cb979e54 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_request.packet.json
index b200a81c..b200a81c 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-hello.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-hello.packet.json
index 3c01f80b..3c01f80b 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-hello.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-hello.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_reply.packet.json
index 4ea5bfcf..4ea5bfcf 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_request.packet.json
index fdc1adc9..fdc1adc9 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_desc_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_reply.packet.json
index f9fb7848..f9fb7848 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_request.packet.json
index 7363a342..7363a342 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_mod.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_mod.packet.json
index 5bb43719..5bb43719 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_mod.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_reply.packet.json
index 1bb4b39e..1bb4b39e 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_request.packet.json
index 8d45799b..8d45799b 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-packet_in.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-packet_in.packet.json
index e5fd0bd9..e5fd0bd9 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-packet_in.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-packet_in.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-packet_out.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-packet_out.packet.json
index d8287cce..d8287cce 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-packet_out.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-packet_out.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_reply.packet.json
index c281c0f8..c281c0f8 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_request.packet.json
index 478f1327..478f1327 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_desc_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-port_mod.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_mod.packet.json
index a255b9dd..a255b9dd 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-port_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_mod.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_reply.packet.json
index 4ea41742..4ea41742 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_request.packet.json
index 5228710d..5228710d 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-port_status.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_status.packet.json
index b273ac22..b273ac22 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-port_status.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-port_status.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_reply.packet.json
index 26c8f7d5..26c8f7d5 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_request.packet.json
index db1f85d5..db1f85d5 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_desc_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_reply.packet.json
index 2c190977..2c190977 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_request.packet.json
index 99d8505d..99d8505d 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-queue_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-requestforward.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-requestforward.packet.json
index 66368c20..66368c20 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-requestforward.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-requestforward.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-role_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_reply.packet.json
index e8be5895..e8be5895 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-role_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-role_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_request.packet.json
index c0c120f6..c0c120f6 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-role_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-role_status.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_status.packet.json
index c88d3bfa..c88d3bfa 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-role_status.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-role_status.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-set_async.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-set_async.packet.json
index 0802c14e..0802c14e 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-set_async.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-set_async.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-set_config.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-set_config.packet.json
index cd5398b7..cd5398b7 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-set_config.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-set_config.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_reply.packet.json
index 1f3d7142..1f3d7142 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_request.packet.json
index f5a4cde0..f5a4cde0 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_desc_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_reply.packet.json
index 864a85fd..864a85fd 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_request.packet.json
index 986e1439..986e1439 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_features_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_mod.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_mod.packet.json
index 5adf812f..5adf812f 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_mod.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_reply.packet.json
index 94801adb..94801adb 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_reply.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_reply.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_request.packet.json
index 1f965d77..1f965d77 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_stats_request.packet.json
diff --git a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_status.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_status.packet.json
index fde5fb77..fde5fb77 100644
--- a/tests/unit/ofproto/json/of15/libofproto-OFP15-table_status.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-table_status.packet.json
diff --git a/tests/unit/ofproto/test_ether.py b/ryu/tests/unit/ofproto/test_ether.py
index dead1a43..dead1a43 100644
--- a/tests/unit/ofproto/test_ether.py
+++ b/ryu/tests/unit/ofproto/test_ether.py
diff --git a/tests/unit/ofproto/test_inet.py b/ryu/tests/unit/ofproto/test_inet.py
index 92a82ac4..92a82ac4 100644
--- a/tests/unit/ofproto/test_inet.py
+++ b/ryu/tests/unit/ofproto/test_inet.py
diff --git a/tests/unit/ofproto/test_nx_flow_spec.py b/ryu/tests/unit/ofproto/test_nx_flow_spec.py
index e0bf6b4e..e0bf6b4e 100644
--- a/tests/unit/ofproto/test_nx_flow_spec.py
+++ b/ryu/tests/unit/ofproto/test_nx_flow_spec.py
diff --git a/tests/unit/ofproto/test_ofproto.py b/ryu/tests/unit/ofproto/test_ofproto.py
index 47f1e544..47f1e544 100644
--- a/tests/unit/ofproto/test_ofproto.py
+++ b/ryu/tests/unit/ofproto/test_ofproto.py
diff --git a/tests/unit/ofproto/test_ofproto_common.py b/ryu/tests/unit/ofproto/test_ofproto_common.py
index 6a63236e..6a63236e 100644
--- a/tests/unit/ofproto/test_ofproto_common.py
+++ b/ryu/tests/unit/ofproto/test_ofproto_common.py
diff --git a/tests/unit/ofproto/test_ofproto_parser.py b/ryu/tests/unit/ofproto/test_ofproto_parser.py
index bc3c1fd1..bc3c1fd1 100644
--- a/tests/unit/ofproto/test_ofproto_parser.py
+++ b/ryu/tests/unit/ofproto/test_ofproto_parser.py
diff --git a/tests/unit/ofproto/test_ofproto_v12.py b/ryu/tests/unit/ofproto/test_ofproto_v12.py
index c1228a05..c1228a05 100644
--- a/tests/unit/ofproto/test_ofproto_v12.py
+++ b/ryu/tests/unit/ofproto/test_ofproto_v12.py
diff --git a/tests/unit/ofproto/test_oxm.py b/ryu/tests/unit/ofproto/test_oxm.py
index ffb762fc..ffb762fc 100644
--- a/tests/unit/ofproto/test_oxm.py
+++ b/ryu/tests/unit/ofproto/test_oxm.py
diff --git a/tests/unit/ofproto/test_oxs.py b/ryu/tests/unit/ofproto/test_oxs.py
index 289731f0..289731f0 100644
--- a/tests/unit/ofproto/test_oxs.py
+++ b/ryu/tests/unit/ofproto/test_oxs.py
diff --git a/tests/unit/ofproto/test_parser.py b/ryu/tests/unit/ofproto/test_parser.py
index 9e19fd8f..2f9061cc 100644
--- a/tests/unit/ofproto/test_parser.py
+++ b/ryu/tests/unit/ofproto/test_parser.py
@@ -16,14 +16,11 @@
 
 from __future__ import print_function
 
-import json
+import six
 import sys
 import unittest
-
-import six
 from nose.tools import eq_
 
-from ryu import exception
 from ryu.ofproto import ofproto_parser
 from ryu.ofproto import ofproto_protocol
 from ryu.ofproto import ofproto_v1_0
@@ -31,8 +28,9 @@ from ryu.ofproto import ofproto_v1_2
 from ryu.ofproto import ofproto_v1_3
 from ryu.ofproto import ofproto_v1_4
 from ryu.ofproto import ofproto_v1_5
-
-from tests import test_lib
+from ryu.tests import test_lib
+from ryu import exception
+import json
 
 
 # (has_parser, has_serializer)
diff --git a/tests/unit/ofproto/test_parser_compat.py b/ryu/tests/unit/ofproto/test_parser_compat.py
index 8b98e27c..dcca56bd 100644
--- a/tests/unit/ofproto/test_parser_compat.py
+++ b/ryu/tests/unit/ofproto/test_parser_compat.py
@@ -16,19 +16,20 @@
 
 from __future__ import print_function
 
-from struct import unpack
-import unittest
-
 import six
+import sys
+import unittest
 from nose.tools import eq_
+from nose.tools import ok_
 
-from ryu.lib import addrconv
 from ryu.ofproto import ofproto_v1_2
 from ryu.ofproto import ofproto_v1_3
 from ryu.ofproto import ofproto_v1_2_parser
 from ryu.ofproto import ofproto_v1_3_parser
 
-from tests import test_lib
+from ryu.lib import addrconv
+from ryu.tests import test_lib
+from struct import unpack
 
 
 class Test_Parser_Compat(unittest.TestCase):
diff --git a/tests/unit/ofproto/test_parser_ofpmatch.py b/ryu/tests/unit/ofproto/test_parser_ofpmatch.py
index 91da3d3d..d4dba9ea 100644
--- a/tests/unit/ofproto/test_parser_ofpmatch.py
+++ b/ryu/tests/unit/ofproto/test_parser_ofpmatch.py
@@ -23,9 +23,8 @@ except ImportError:
     # Python 2
     pass
 
-import unittest
-
 import six
+import unittest
 from nose.tools import eq_
 from nose.tools import ok_
 
@@ -37,8 +36,7 @@ from ryu.ofproto import ofproto_v1_2_parser
 from ryu.ofproto import ofproto_v1_3_parser
 from ryu.ofproto import ofproto_v1_4_parser
 from ryu.ofproto import ofproto_v1_5_parser
-
-from tests import test_lib
+from ryu.tests import test_lib
 
 
 class Test_Parser_OFPMatch(unittest.TestCase):
diff --git a/tests/unit/ofproto/test_parser_ofpstats.py b/ryu/tests/unit/ofproto/test_parser_ofpstats.py
index 3f413a42..0ce428ab 100644
--- a/tests/unit/ofproto/test_parser_ofpstats.py
+++ b/ryu/tests/unit/ofproto/test_parser_ofpstats.py
@@ -20,16 +20,15 @@ except ImportError:
     # Python 2
     pass
 
-import unittest
-
 import six
+import sys
+import unittest
 from nose.tools import eq_
 from nose.tools import ok_
 
 from ryu.ofproto import ofproto_v1_5
 from ryu.ofproto import ofproto_v1_5_parser
-
-from tests import test_lib
+from ryu.tests import test_lib
 
 
 class Test_Parser_OFPStats(unittest.TestCase):
diff --git a/tests/unit/ofproto/test_parser_v10.py b/ryu/tests/unit/ofproto/test_parser_v10.py
index eefb65f2..eefb65f2 100644
--- a/tests/unit/ofproto/test_parser_v10.py
+++ b/ryu/tests/unit/ofproto/test_parser_v10.py
diff --git a/tests/unit/ofproto/test_parser_v12.py b/ryu/tests/unit/ofproto/test_parser_v12.py
index cf04803d..cf04803d 100644
--- a/tests/unit/ofproto/test_parser_v12.py
+++ b/ryu/tests/unit/ofproto/test_parser_v12.py
diff --git a/tests/unit/ofproto/test_parser_v13.py b/ryu/tests/unit/ofproto/test_parser_v13.py
index 265b28e4..265b28e4 100644
--- a/tests/unit/ofproto/test_parser_v13.py
+++ b/ryu/tests/unit/ofproto/test_parser_v13.py
diff --git a/tests/unit/ofproto/__init__.py b/ryu/tests/unit/packet/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/unit/ofproto/__init__.py
+++ b/ryu/tests/unit/packet/__init__.py
diff --git a/tests/unit/packet/test_arp.py b/ryu/tests/unit/packet/test_arp.py
index 40e28131..40e28131 100644
--- a/tests/unit/packet/test_arp.py
+++ b/ryu/tests/unit/packet/test_arp.py
diff --git a/tests/unit/packet/test_bfd.py b/ryu/tests/unit/packet/test_bfd.py
index d33949cc..d33949cc 100644
--- a/tests/unit/packet/test_bfd.py
+++ b/ryu/tests/unit/packet/test_bfd.py
diff --git a/tests/unit/packet/test_bgp.py b/ryu/tests/unit/packet/test_bgp.py
index 2211fc4c..2211fc4c 100644
--- a/tests/unit/packet/test_bgp.py
+++ b/ryu/tests/unit/packet/test_bgp.py
diff --git a/tests/unit/packet/test_bmp.py b/ryu/tests/unit/packet/test_bmp.py
index f93b8014..f93b8014 100644
--- a/tests/unit/packet/test_bmp.py
+++ b/ryu/tests/unit/packet/test_bmp.py
diff --git a/tests/unit/packet/test_bpdu.py b/ryu/tests/unit/packet/test_bpdu.py
index 1ef8cf58..1ef8cf58 100644
--- a/tests/unit/packet/test_bpdu.py
+++ b/ryu/tests/unit/packet/test_bpdu.py
diff --git a/tests/unit/packet/test_cfm.py b/ryu/tests/unit/packet/test_cfm.py
index fb0749d7..fb0749d7 100644
--- a/tests/unit/packet/test_cfm.py
+++ b/ryu/tests/unit/packet/test_cfm.py
diff --git a/tests/unit/packet/test_dhcp.py b/ryu/tests/unit/packet/test_dhcp.py
index cc96804b..cc96804b 100644
--- a/tests/unit/packet/test_dhcp.py
+++ b/ryu/tests/unit/packet/test_dhcp.py
diff --git a/tests/unit/packet/test_ethernet.py b/ryu/tests/unit/packet/test_ethernet.py
index 6fd767bd..6fd767bd 100644
--- a/tests/unit/packet/test_ethernet.py
+++ b/ryu/tests/unit/packet/test_ethernet.py
diff --git a/tests/unit/packet/test_geneve.py b/ryu/tests/unit/packet/test_geneve.py
index 919d05f8..919d05f8 100644
--- a/tests/unit/packet/test_geneve.py
+++ b/ryu/tests/unit/packet/test_geneve.py
diff --git a/tests/unit/packet/test_gre.py b/ryu/tests/unit/packet/test_gre.py
index c955ec70..c955ec70 100644
--- a/tests/unit/packet/test_gre.py
+++ b/ryu/tests/unit/packet/test_gre.py
diff --git a/tests/unit/packet/test_icmp.py b/ryu/tests/unit/packet/test_icmp.py
index f9438893..f9438893 100644
--- a/tests/unit/packet/test_icmp.py
+++ b/ryu/tests/unit/packet/test_icmp.py
diff --git a/tests/unit/packet/test_icmpv6.py b/ryu/tests/unit/packet/test_icmpv6.py
index c6438171..c6438171 100644
--- a/tests/unit/packet/test_icmpv6.py
+++ b/ryu/tests/unit/packet/test_icmpv6.py
diff --git a/tests/unit/packet/test_igmp.py b/ryu/tests/unit/packet/test_igmp.py
index 9813450d..9813450d 100644
--- a/tests/unit/packet/test_igmp.py
+++ b/ryu/tests/unit/packet/test_igmp.py
diff --git a/tests/unit/packet/test_ipv4.py b/ryu/tests/unit/packet/test_ipv4.py
index 69186f3f..69186f3f 100644
--- a/tests/unit/packet/test_ipv4.py
+++ b/ryu/tests/unit/packet/test_ipv4.py
diff --git a/tests/unit/packet/test_ipv6.py b/ryu/tests/unit/packet/test_ipv6.py
index 455dc8c3..455dc8c3 100644
--- a/tests/unit/packet/test_ipv6.py
+++ b/ryu/tests/unit/packet/test_ipv6.py
diff --git a/tests/unit/packet/test_llc.py b/ryu/tests/unit/packet/test_llc.py
index 05894ab7..05894ab7 100644
--- a/tests/unit/packet/test_llc.py
+++ b/ryu/tests/unit/packet/test_llc.py
diff --git a/tests/unit/packet/test_lldp.py b/ryu/tests/unit/packet/test_lldp.py
index d8d261c2..d8d261c2 100644
--- a/tests/unit/packet/test_lldp.py
+++ b/ryu/tests/unit/packet/test_lldp.py
diff --git a/tests/unit/packet/test_mpls.py b/ryu/tests/unit/packet/test_mpls.py
index e3f9bccf..e3f9bccf 100644
--- a/tests/unit/packet/test_mpls.py
+++ b/ryu/tests/unit/packet/test_mpls.py
diff --git a/tests/unit/packet/test_openflow.py b/ryu/tests/unit/packet/test_openflow.py
index b0dca25f..b0dca25f 100644
--- a/tests/unit/packet/test_openflow.py
+++ b/ryu/tests/unit/packet/test_openflow.py
diff --git a/tests/unit/packet/test_ospf.py b/ryu/tests/unit/packet/test_ospf.py
index df57b8de..df57b8de 100644
--- a/tests/unit/packet/test_ospf.py
+++ b/ryu/tests/unit/packet/test_ospf.py
diff --git a/tests/unit/packet/test_packet.py b/ryu/tests/unit/packet/test_packet.py
index 1b4c704b..1b4c704b 100644
--- a/tests/unit/packet/test_packet.py
+++ b/ryu/tests/unit/packet/test_packet.py
diff --git a/tests/unit/packet/test_pbb.py b/ryu/tests/unit/packet/test_pbb.py
index dd7778cd..dd7778cd 100644
--- a/tests/unit/packet/test_pbb.py
+++ b/ryu/tests/unit/packet/test_pbb.py
diff --git a/tests/unit/packet/test_sctp.py b/ryu/tests/unit/packet/test_sctp.py
index d7afb7cc..d7afb7cc 100644
--- a/tests/unit/packet/test_sctp.py
+++ b/ryu/tests/unit/packet/test_sctp.py
diff --git a/tests/unit/packet/test_slow.py b/ryu/tests/unit/packet/test_slow.py
index 9e077fd2..9e077fd2 100644
--- a/tests/unit/packet/test_slow.py
+++ b/ryu/tests/unit/packet/test_slow.py
diff --git a/tests/unit/packet/test_tcp.py b/ryu/tests/unit/packet/test_tcp.py
index 7224df0e..7224df0e 100644
--- a/tests/unit/packet/test_tcp.py
+++ b/ryu/tests/unit/packet/test_tcp.py
diff --git a/tests/unit/packet/test_udp.py b/ryu/tests/unit/packet/test_udp.py
index 0d7d0aa9..0d7d0aa9 100644
--- a/tests/unit/packet/test_udp.py
+++ b/ryu/tests/unit/packet/test_udp.py
diff --git a/tests/unit/packet/test_vlan.py b/ryu/tests/unit/packet/test_vlan.py
index b8e3a048..b8e3a048 100644
--- a/tests/unit/packet/test_vlan.py
+++ b/ryu/tests/unit/packet/test_vlan.py
diff --git a/tests/unit/packet/test_vrrp.py b/ryu/tests/unit/packet/test_vrrp.py
index 71c52500..71c52500 100644
--- a/tests/unit/packet/test_vrrp.py
+++ b/ryu/tests/unit/packet/test_vrrp.py
diff --git a/tests/unit/packet/test_vxlan.py b/ryu/tests/unit/packet/test_vxlan.py
index 8cace581..8cace581 100644
--- a/tests/unit/packet/test_vxlan.py
+++ b/ryu/tests/unit/packet/test_vxlan.py
diff --git a/tests/unit/packet/test_zebra.py b/ryu/tests/unit/packet/test_zebra.py
index 19ff88de..19ff88de 100644
--- a/tests/unit/packet/test_zebra.py
+++ b/ryu/tests/unit/packet/test_zebra.py
diff --git a/tests/unit/packet/__init__.py b/ryu/tests/unit/sample/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/unit/packet/__init__.py
+++ b/ryu/tests/unit/sample/__init__.py
diff --git a/tests/unit/sample/test_sample1.py b/ryu/tests/unit/sample/test_sample1.py
index b4963556..34f8f69a 100644
--- a/tests/unit/sample/test_sample1.py
+++ b/ryu/tests/unit/sample/test_sample1.py
@@ -7,7 +7,7 @@ from nose.tools import ok_, eq_
 import logging
 
 
-LOG = logging.getLogger('tests.test_sample1')
+LOG = logging.getLogger('ryu.tests.test_sample1')
 
 
 class TestSample1(unittest.TestCase):
diff --git a/tests/unit/sample/test_sample2.py b/ryu/tests/unit/sample/test_sample2.py
index 9c21a42a..9c21a42a 100644
--- a/tests/unit/sample/test_sample2.py
+++ b/ryu/tests/unit/sample/test_sample2.py
diff --git a/tests/unit/sample/__init__.py b/ryu/tests/unit/services/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/unit/sample/__init__.py
+++ b/ryu/tests/unit/services/__init__.py
diff --git a/tests/unit/services/__init__.py b/ryu/tests/unit/services/protocols/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/unit/services/__init__.py
+++ b/ryu/tests/unit/services/protocols/__init__.py
diff --git a/tests/unit/services/protocols/__init__.py b/ryu/tests/unit/services/protocols/bgp/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/unit/services/protocols/__init__.py
+++ b/ryu/tests/unit/services/protocols/bgp/__init__.py
diff --git a/tests/unit/services/protocols/bgp/__init__.py b/ryu/tests/unit/services/protocols/bgp/core_managers/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/unit/services/protocols/bgp/__init__.py
+++ b/ryu/tests/unit/services/protocols/bgp/core_managers/__init__.py
diff --git a/tests/unit/services/protocols/bgp/core_managers/test_table_manager.py b/ryu/tests/unit/services/protocols/bgp/core_managers/test_table_manager.py
index c9c9f55e..c9c9f55e 100644
--- a/tests/unit/services/protocols/bgp/core_managers/test_table_manager.py
+++ b/ryu/tests/unit/services/protocols/bgp/core_managers/test_table_manager.py
diff --git a/tests/unit/services/protocols/bgp/test_bgpspeaker.py b/ryu/tests/unit/services/protocols/bgp/test_bgpspeaker.py
index 81a8bb3b..81a8bb3b 100644
--- a/tests/unit/services/protocols/bgp/test_bgpspeaker.py
+++ b/ryu/tests/unit/services/protocols/bgp/test_bgpspeaker.py
diff --git a/tests/unit/services/protocols/bgp/test_peer.py b/ryu/tests/unit/services/protocols/bgp/test_peer.py
index 1597efdb..1597efdb 100644
--- a/tests/unit/services/protocols/bgp/test_peer.py
+++ b/ryu/tests/unit/services/protocols/bgp/test_peer.py
diff --git a/tests/unit/services/protocols/bgp/core_managers/__init__.py b/ryu/tests/unit/services/protocols/bgp/utils/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/unit/services/protocols/bgp/core_managers/__init__.py
+++ b/ryu/tests/unit/services/protocols/bgp/utils/__init__.py
diff --git a/tests/unit/services/protocols/bgp/utils/test_bgp.py b/ryu/tests/unit/services/protocols/bgp/utils/test_bgp.py
index 6933a28b..6933a28b 100644
--- a/tests/unit/services/protocols/bgp/utils/test_bgp.py
+++ b/ryu/tests/unit/services/protocols/bgp/utils/test_bgp.py
diff --git a/tests/unit/services/protocols/bgp/utils/test_validation.py b/ryu/tests/unit/services/protocols/bgp/utils/test_validation.py
index 6d5f6ac3..6d5f6ac3 100644
--- a/tests/unit/services/protocols/bgp/utils/test_validation.py
+++ b/ryu/tests/unit/services/protocols/bgp/utils/test_validation.py
diff --git a/tests/unit/test_requirements.py b/ryu/tests/unit/test_requirements.py
index b31110b4..7bfbd3f4 100644
--- a/tests/unit/test_requirements.py
+++ b/ryu/tests/unit/test_requirements.py
@@ -30,8 +30,8 @@ LOG = logging.getLogger(__name__)
 
 MOD_DIR = os.path.dirname(sys.modules[__name__].__file__)
 _RYU_REQUIREMENTS_FILES = [
-    '../../tools/pip-requires',
-    '../../tools/optional-requires',
+    '../../../tools/pip-requires',
+    '../../../tools/optional-requires',
 ]
 RYU_REQUIREMENTS_FILES = [
     os.path.join(MOD_DIR, f) for f in _RYU_REQUIREMENTS_FILES]
diff --git a/tests/unit/test_utils.py b/ryu/tests/unit/test_utils.py
index 165f8acc..165f8acc 100644
--- a/tests/unit/test_utils.py
+++ b/ryu/tests/unit/test_utils.py
diff --git a/tests/unit/services/protocols/bgp/utils/__init__.py b/tests/unit/services/protocols/bgp/utils/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/tests/unit/services/protocols/bgp/utils/__init__.py
+++ /dev/null
diff --git a/tools/normalize_json.py b/tools/normalize_json.py
index 7d7fddc9..48243584 100755
--- a/tools/normalize_json.py
+++ b/tools/normalize_json.py
@@ -17,7 +17,7 @@
 # limitations under the License.
 
 # usage example:
-# for x in ../tests/unit/ofproto/json/**/*.json;do echo $x;./normalize_json.py < $x > xx&& mv xx $x;done
+# for x in ../ryu/tests/unit/ofproto/json/**/*.json;do echo $x;./normalize_json.py < $x > xx&& mv xx $x;done
 
 import json
 import sys
diff --git a/tox.ini b/tox.ini
index 5ffbc675..cb6df7f7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,13 +12,13 @@ passenv= NOSE_VERBOSE
 # for running Ryu, the following runs ryu-manager berfore installing
 # the addtional requirements.
 commands =
-  ryu-manager tests/unit/cmd/dummy_openflow_app.py
+  ryu-manager ryu/tests/unit/cmd/dummy_openflow_app.py
   pip install -r{toxinidir}/tools/optional-requires -r{toxinidir}/tools/test-requires
-  coverage run --source=ryu tests/run_tests.py '{posargs}'
+  coverage run --source=ryu ryu/tests/run_tests.py '{posargs}'
 
 [testenv:scenario]
 commands =
-  python tests/integrated/run_test.py
+  python ryu/tests/integrated/run_test.py
 
 [testenv:py27]
 commands =
author	FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>	2017-06-30 14:23:03 +0900
committer	FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>	2017-06-30 14:23:03 +0900
commit	a991fed7e4faa485dc67daf50ba64fe01f83415d (patch)
tree	a600daa350a36c1fdc7776c111575bef56f78627
parent	a67ed2858417b9d795460f05126c01fb0cd344f9 (diff)